From b7a5ad601b591410ed7213739501574949e9bdb7 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 27 Oct 2022 14:51:32 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baseaccadjapply/BaseAccadjApplyRest.java | 4 +- .../BaseAccadjApplyService.java | 54 ++++++++++++++++++- 2 files changed, 54 insertions(+), 4 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyRest.java index d286b862ec..582241fc04 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyRest.java @@ -115,7 +115,7 @@ public class BaseAccadjApplyRest implements BaseAccadjApplyFeign { BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); bv.setModelId(ProcDefEnum.BASEACCADJAPPLY.getProDefId()); - return baseAccadjApplyService.InitiatorToAnswer(bv); + return baseAccadjApplyService.InitiatorToAnswer(bv,query.getBaseInternalPurchaseVehicles()); } @Override @@ -123,7 +123,7 @@ public class BaseAccadjApplyRest implements BaseAccadjApplyFeign { BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); bv.setModelId(ProcDefEnum.BASEACCADJAPPLY.getProDefId()); - return baseAccadjApplyService.companyToFinancialCenter(bv); + return baseAccadjApplyService.companyToFinancialCenter(bv,query.getBaseInternalPurchaseVehicles()); } @Override diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java index f704ac9f3d..5988d0586b 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java @@ -675,10 +675,35 @@ public class BaseAccadjApplyService extends MybatisBaseService baseInternalPurchaseVehicles) { ResultBean rb = ResultBean.fireFail(); BaseAccadjApply baseAccadjApply = fetchBySid(bv.getBusinessSid()); + List purchaseSidss = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid()); Boolean i = false; + if (baseInternalPurchaseVehicles != null) { + if (baseInternalPurchaseVehicles.size() > 0) { + for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : baseInternalPurchaseVehicles) { + String witPinMoney = baseInternalPurchaseVehicle.getWitPinMoney(); + String sid = baseInternalPurchaseVehicle.getSid(); + BaseInternalPurchaseVehicle baseInternalPurchaseVehicle1 = baseInternalPurchaseVehicleService.fetchBySid(sid); + String witPinMoney1 = baseInternalPurchaseVehicle1.getInitialWitPinMoney(); + if (!witPinMoney.equals(witPinMoney1)) { + i = true; + baseInternalPurchaseVehicleService.updateWitPinMoneyBySid(witPinMoney, sid); + } + } + } + } else { + for (String s : purchaseSidss) { + BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(s); + String witPinMoney = baseInternalPurchaseVehicle.getWitPinMoney(); + String initialWitPinMoney = baseInternalPurchaseVehicle.getInitialWitPinMoney(); + if (!witPinMoney.equals(initialWitPinMoney)) { + i = true; + break; + } + } + } Map map = new HashMap<>(); Map formVariables = bv.getFormVariables(); if (formVariables == null) { @@ -756,10 +781,35 @@ public class BaseAccadjApplyService extends MybatisBaseService baseInternalPurchaseVehicles) { ResultBean rb = ResultBean.fireFail(); BaseAccadjApply baseAccadjApply = fetchBySid(bv.getBusinessSid()); + List purchaseSidss = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid()); Boolean i = false; + if (baseInternalPurchaseVehicles != null) { + if (baseInternalPurchaseVehicles.size() > 0) { + for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : baseInternalPurchaseVehicles) { + String witPinMoney = baseInternalPurchaseVehicle.getWitPinMoney(); + String sid = baseInternalPurchaseVehicle.getSid(); + BaseInternalPurchaseVehicle baseInternalPurchaseVehicle1 = baseInternalPurchaseVehicleService.fetchBySid(sid); + String witPinMoney1 = baseInternalPurchaseVehicle1.getInitialWitPinMoney(); + if (!witPinMoney.equals(witPinMoney1)) { + i = true; + baseInternalPurchaseVehicleService.updateWitPinMoneyBySid(witPinMoney, sid); + } + } + } + } else { + for (String s : purchaseSidss) { + BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(s); + String witPinMoney = baseInternalPurchaseVehicle.getWitPinMoney(); + String initialWitPinMoney = baseInternalPurchaseVehicle.getInitialWitPinMoney(); + if (!witPinMoney.equals(initialWitPinMoney)) { + i = true; + break; + } + } + } Map map = new HashMap<>(); Map formVariables = bv.getFormVariables(); if (formVariables == null) {