From b457041a801992fcf7898b1c5ae831e27fe552aa Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 12 Jul 2023 11:38:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AC=BE=E9=A1=B9=E7=BB=93=E8=BD=AC=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppFinFundsCarriedForwardYXYSKXDto.java | 2 +- .../AppFinFundsCarriedForwardYXYSKXVo.java | 2 +- .../FinFundsCarriedForwardApplyDetailsVo.java | 2 +- .../FinFundsCarriedForwardVehDto.java | 2 +- .../FinFundsCarriedForwardApplyService.java | 23 +++++++++++++++---- 5 files changed, 22 insertions(+), 9 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/AppFinFundsCarriedForwardYXYSKXDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/AppFinFundsCarriedForwardYXYSKXDto.java index d684045180..472c4f4b9d 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/AppFinFundsCarriedForwardYXYSKXDto.java +++ b/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; diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/AppFinFundsCarriedForwardYXYSKXVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/AppFinFundsCarriedForwardYXYSKXVo.java index 987e985e72..93b59b4c8d 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/AppFinFundsCarriedForwardYXYSKXVo.java +++ b/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; diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyDetailsVo.java index ceb931c044..35d59037b5 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyDetailsVo.java +++ b/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("款项确认书附件") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehDto.java index 5444f0695d..fc503ddb18 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardveh/FinFundsCarriedForwardVehDto.java +++ b/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; // 本次使用金额 } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java index d59aa912a1..fae3127e3b 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java +++ b/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 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 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())) {