合同变更：流程变量参数改正

房远帅
1 parent c57660c2
Showing 1 changed file with 14 additions and 7 deletions
xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/contract/ContractChangeApplicationServiceImpl.java
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/contract/ContractChangeApplicationServiceImpl.java
View file @99976f1
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/contract/ContractChangeApplicationServiceImpl.java
View file @99976f1
@@ -180,7 +180,7 @@ public class ContractChangeApplicationServiceImpl extends BaseMpServiceImpl<Cont
         data.setAfterDataJson(JsonUtil.toJsonString(afterData));
         data.setApprovalStatus(CustomerDevelopStatus.AUDIT.name());
-        fillFlowVariables(data, contract);
+        fillFlowVariables(data, contract, afterData);
         getBaseMapper().insert(data);
         OpLogUtil.setVariable("id", data.getId());
@@ -204,18 +204,16 @@ public class ContractChangeApplicationServiceImpl extends BaseMpServiceImpl<Cont
         }
         ContractDistributorStandard contract = getContractOrThrow(data.getContractId());
-        UpdateContractDistributorStandardVo beforeData = buildContractData(contract);
         UpdateContractDistributorStandardVo afterData = normalizeContractData(contract, vo.getContractData(), vo.getChangeReason());
         Wrapper<ContractChangeApplication> wrapper = Wrappers.lambdaUpdate(ContractChangeApplication.class)
                 .set(ContractChangeApplication::getChangeReason, StringUtils.defaultIfBlank(vo.getChangeReason(), afterData.getChangeReason()))
-                .set(ContractChangeApplication::getBeforeDataJson, JsonUtil.toJsonString(beforeData))
                 .set(ContractChangeApplication::getAfterDataJson, JsonUtil.toJsonString(afterData))
                 .set(ContractChangeApplication::getApprovalStatus, CustomerDevelopStatus.AUDIT.name())
                 .eq(ContractChangeApplication::getId, vo.getId());
         update(wrapper);
-        fillFlowVariables(data, contract);
+        fillFlowVariables(data, contract, afterData);
         data.setAfterDataJson(JsonUtil.toJsonString(afterData));
         data.setChangeReason(StringUtils.defaultIfBlank(vo.getChangeReason(), afterData.getChangeReason()));
         flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);
@@ -577,15 +575,24 @@ public class ContractChangeApplicationServiceImpl extends BaseMpServiceImpl<Cont
      *
      * @param data 申请单
      * @param contract 合同
+     * @param afterData 变更后数据
      */
-    private void fillFlowVariables(ContractChangeApplication data, ContractDistributorStandard contract) {
+    private void fillFlowVariables(ContractChangeApplication data, ContractDistributorStandard contract,
+                                   UpdateContractDistributorStandardVo afterData) {
         if (data == null || contract == null) {
             return;
         }
-        Workshop workshop = workshopService.findById(contract.getWorkshopId());
+        String workshopId = afterData == null || StringUtils.isBlank(afterData.getWorkshopId())
+                ? contract.getWorkshopId()
+                : afterData.getWorkshopId();
+        String deptId = afterData == null || StringUtils.isBlank(afterData.getDeptId())
+                ? contract.getDeptId()
+                : afterData.getDeptId();
+
+        Workshop workshop = workshopService.findById(workshopId);
         data.setWorkshopCode(workshop == null ? "" : workshop.getCode());
-        SysDept sysDept = sysDeptService.findById(contract.getDeptId());
+        SysDept sysDept = sysDeptService.findById(deptId);
         data.setDeptCode(sysDept == null ? "" : sysDept.getCode());
     }