调账流程问题修改

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java

@@ -379,11 +379,11 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                     String witPinMoney1 = baseInternalPurchaseVehicle1.getWitPinMoney();
                     if (!witPinMoney.equals(witPinMoney1)) {
                         i = true;
-                        baseInternalPurchaseVehicleService.updateWitPinMoneyBySid(witPinMoney,sid);
+                        baseInternalPurchaseVehicleService.updateWitPinMoneyBySid(witPinMoney, sid);
                     }
                 }
             }
-        }else {
+        } else {
             for (String s : purchaseSids) {
                 BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(s);
                 String witPinMoney = baseInternalPurchaseVehicle.getWitPinMoney();
@@ -399,6 +399,8 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
         if (formVariables == null) {
             map.put("isAdj", i);
             bv.setFormVariables(map);
+        }else {
+            formVariables.put("isAdj", i);
         }
         if (bv.getTaskId().equals(baseAccadjApply.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
@@ -559,6 +561,25 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
         BaseAccadjApply baseAccadjApply = fetchBySid(bv.getBusinessSid());
         if (baseAccadjApply.getAccadjTypeValue().equals("调入")) {
             String callOutOrgSid = baseAccadjApply.getCallOutOrgSid();
+            List<String> purchaseSids = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid());
+            Boolean i = false;
+            for (String s : purchaseSids) {
+                BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(s);
+                String witPinMoney = baseInternalPurchaseVehicle.getWitPinMoney();
+                String initialWitPinMoney = baseInternalPurchaseVehicle.getInitialWitPinMoney();
+                if (!witPinMoney.equals(initialWitPinMoney)) {
+                    i = true;
+                    break;
+                }
+            }
+            Map<String, Object> map = new HashMap<>();
+            Map<String, Object> formVariables = bv.getFormVariables();
+            if (formVariables == null) {
+                map.put("isAdj", i);
+                bv.setFormVariables(map);
+            }else {
+                formVariables.put("isAdj", i);
+            }
             ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
             //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
             List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
@@ -678,7 +699,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                     }
                 }
             }
-        }else {
+        } else {
             List<String> stringList = baseAccadjApplyeVehService.fetchByMainSid(query.getSid());
             for (String s : stringList) {
                 BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(s);