款项结转模块优化

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/AppFinFundsCarriedForwardYXYSKXDto.java

@@ -61,7 +61,7 @@ public class AppFinFundsCarriedForwardYXYSKXDto implements Dto {
     @ApiModelProperty("应收金额")
     private String receivable;
     @ApiModelProperty("认款金额")
-    private Integer confirmMoney;
+    private String confirmMoney;
     private Boolean checked;
     @ApiModelProperty("车架号")
     private String vin;

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/AppFinFundsCarriedForwardYXYSKXVo.java

@@ -64,7 +64,7 @@ public class AppFinFundsCarriedForwardYXYSKXVo implements Dto {
     @ApiModelProperty("应收金额")
     private String receivable;
     @ApiModelProperty("认款金额")
-    private Integer confirmMoney;
+    private String confirmMoney;
     private Boolean checked;
     @ApiModelProperty("车架号")
     private String vin;

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyDetailsVo.java

@@ -96,7 +96,7 @@ public class FinFundsCarriedForwardApplyDetailsVo implements Vo {
     private String procInsId;
     private String taskId;
     @ApiModelProperty("结转金额合计")
-    private Integer jzjehj;
+    private String jzjehj;
     @ApiModelProperty("pdf路径")
     private String pdfPath;
     @ApiModelProperty("款项确认书附件")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehDto.java

@@ -68,5 +68,5 @@ public class FinFundsCarriedForwardVehDto implements Dto {
 	@ApiModelProperty("剩余金额")
     private String balance; // 剩余金额
 	@ApiModelProperty("本次使用金额")
-    private Integer thisUseMoney; // 本次使用金额
+    private String thisUseMoney; // 本次使用金额
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java

@@ -263,7 +263,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
             appFinFundsCarriedForwardYXYSKXVo.setProjectName(finSelectedReceivablesDetailedVo.getReceivablesName());
             appFinFundsCarriedForwardYXYSKXVo.setMobile(finSelectedReceivablesDetailedVo.getCustomerPhone());
             appFinFundsCarriedForwardYXYSKXVo.setReceivable(finSelectedReceivablesDetailedVo.getCurrentReceivableMoney());
-            appFinFundsCarriedForwardYXYSKXVo.setConfirmMoney(Integer.valueOf(finSelectedReceivablesDetailedVo.getSubscriptionMoney()));
+            appFinFundsCarriedForwardYXYSKXVo.setConfirmMoney(finSelectedReceivablesDetailedVo.getSubscriptionMoney());
             appFinFundsCarriedForwardYXYSKXVo.setVin(finSelectedReceivablesDetailedVo.getVIN());
             appFinFundsCarriedForwardYXYSKXVo.setConfirmDate(finSelectedReceivablesDetailedVo.getSubscriptionDate());
             appFinFundsCarriedForwardYXYSKXVo.setReceivablesSid(finSelectedReceivablesDetailedVo.getReceivablesSid());
@@ -405,7 +405,11 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
             }else {
                 finFundsCarriedForwardApply.setNodeState("待提交");
             }
-            Long jzjehj = finFundsCarriedForwardVehDetailsVos.stream().collect(Collectors.summingLong(FinFundsCarriedForwardVehDto::getThisUseMoney));
+            BigDecimal jzjehj = new BigDecimal("0");
+            for (FinFundsCarriedForwardVehDto finFundsCarriedForwardVehDto : finFundsCarriedForwardVehDetailsVos) {
+                String thisUseMoney = finFundsCarriedForwardVehDto.getThisUseMoney();
+                jzjehj = jzjehj.add(new BigDecimal(thisUseMoney));
+            }
             finFundsCarriedForwardApply.setJzjehj(String.valueOf(jzjehj));
             save(finFundsCarriedForwardApply);
             for (String filePath : kxqrsImages) {
@@ -508,10 +512,19 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
         //用户的组织全路径
         FinFundsCarriedForwardApply finFundsCarriedForwardApply = fetchBySid(dto.getSid());
         List<FinFundsCarriedForwardVehDto> finFundsCarriedForwardVehDetailsVos = dto.getFinFundsCarriedForwardVehDetailsVos();
-        Long jzjehj = finFundsCarriedForwardVehDetailsVos.stream().collect(Collectors.summingLong(FinFundsCarriedForwardVehDto::getThisUseMoney));
+        BigDecimal jzjehj = new BigDecimal("0");
+        for (FinFundsCarriedForwardVehDto finFundsCarriedForwardVehDto : finFundsCarriedForwardVehDetailsVos) {
+            String thisUseMoney = finFundsCarriedForwardVehDto.getThisUseMoney();
+            jzjehj = jzjehj.add(new BigDecimal(thisUseMoney));
+        }
         List<AppFinFundsCarriedForwardYXYSKXDto> yxysFinFundsCarriedForwardYXYSKXVos = dto.getYxysFinFundsCarriedForwardYXYSKXVos();
-        Long rkje = yxysFinFundsCarriedForwardYXYSKXVos.stream().collect(Collectors.summingLong(AppFinFundsCarriedForwardYXYSKXDto::getConfirmMoney));
-        if (rkje != jzjehj) {
+        BigDecimal rkje = new BigDecimal("0");
+        for (AppFinFundsCarriedForwardYXYSKXDto yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
+            String confirmMoney = yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney();
+            rkje = rkje.add(new BigDecimal(confirmMoney));
+        }
+        int i = rkje.compareTo(jzjehj);
+        if (i != 0) {
             return rb.setMsg("认款金额与结转金额不符");
         }
         if ("已认款".equals(dto.getSource())) {