结清申请优化流程2

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/SettleApplyAppVo.java

@@ -136,4 +136,8 @@ public class SettleApplyAppVo {
     private String bankAccount;
     @ApiModelProperty("资方收款账户")
     private String accountName;
+    @ApiModelProperty("公司未到期利息减免")
+    private String notDuePriceRelief;
+    @ApiModelProperty("减免依据")
+    private String reliefBasis;
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java

@@ -871,7 +871,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                 fundJm = reduction2.getFundPenalty();
             }
         }
-        jmRate = (fund.subtract(fundJm)).divide(fund,2,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("0.36"));
+        jmRate = (fund.subtract(fundJm)).divide(fund,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("0.36"));
         boolean isTure = false;
         boolean isTure2 = false;
         if (jmRate.compareTo(rate1) < 0) {
@@ -2394,7 +2394,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                 fundJm = reduction.getFundPenalty();
             }
         }
-        jmRate = (fund.subtract(fundJm)).divide(fund,2,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("0.36"));
+        jmRate = (fund.subtract(fundJm)).divide(fund,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("0.36"));
         boolean isTure = false;
         boolean isTure2 = false;
         if (jmRate.compareTo(rate1) < 0) {
@@ -2438,7 +2438,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                 fundJm = reduction.getFundPenalty();
             }
         }
-        jmRate = (fund.subtract(fundJm)).divide(fund,2,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("0.36"));
+        jmRate = (fund.subtract(fundJm)).divide(fund,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("0.36"));
         boolean isTure = false;
         boolean isTure2 = false;
         if (jmRate.compareTo(rate1) < 0) {
@@ -2495,7 +2495,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                         fundJm = reduction.getFundPenalty();
                     }
                 }
-                jmRate = (fund.subtract(fundJm)).divide(fund,2,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("0.36"));
+                jmRate = (fund.subtract(fundJm)).divide(fund,4,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("0.36"));
                 boolean isTure = false;
                 boolean isTure2 = false;
                 if (jmRate.compareTo(rate1) < 0) {
@@ -2767,6 +2767,12 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                 if (null != loanSettleCompanyReduction.getProfit()) {
                     settleApplyAppVo.setProfit(loanSettleCompanyReduction.getProfit().toString());
                 }
+                if (null != loanSettleCompanyReduction.getReliefBasis()) {
+                    settleApplyAppVo.setReliefBasis(loanSettleCompanyReduction.getReliefBasis().toString());
+                }
+                if (null != loanSettleCompanyReduction.getNotDuePriceRelief()) {
+                    settleApplyAppVo.setNotDuePriceRelief(loanSettleCompanyReduction.getNotDuePriceRelief().toString());
+                }
                 settleApplyAppVo.setTrueReduction(true);
             }
         }
@@ -3043,6 +3049,12 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
             if (StringUtils.isNotBlank(data.getProfit())) {
                 dataMap.put("profit", data.getProfit());
             }
+            if (StringUtils.isNotBlank(data.getReliefBasis())) {
+                dataMap.put("reliefBasis", data.getReliefBasis());
+            }
+            if (StringUtils.isNotBlank(data.getNotDuePriceRelief())) {
+                dataMap.put("notDuePriceRelief", data.getNotDuePriceRelief());
+            }
         }
         //获取审批记录
         List<PCHistTaskListAndCommentList> flowRecordVo = flowableFeignPro.flowRecordAndComment(loanSettleApply.getProcInstId(), "1").getData();
@@ -3146,7 +3158,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         String targetPath = docPdfComponent.getUploadTemplateUrl();
         try {
             //获取模板
-            InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/jqsq3.ftl");
+            InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/settleApply.ftl");
             //生成word文件名
             String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
             long seconds = System.currentTimeMillis();