优化合同加入审核人功能

java110-bean/src/main/java/com/java110/dto/contractChangePlan/ContractChangePlanDto.java

@@ -29,6 +29,7 @@ public class ContractChangePlanDto extends ContractDto implements Serializable {
     private String changePersonName;
     private String state;
     private String storeId;
+    private String nextUserId;
 
 
     private Date createTime;
@@ -134,4 +135,14 @@ public class ContractChangePlanDto extends ContractDto implements Serializable {
     public void setPlanIds(String[] planIds) {
         this.planIds = planIds;
     }
+
+    @Override
+    public String getNextUserId() {
+        return nextUserId;
+    }
+
+    @Override
+    public void setNextUserId(String nextUserId) {
+        this.nextUserId = nextUserId;
+    }
 }

java110-bean/src/main/java/com/java110/po/contractChangePlan/ContractChangePlanPo.java

@@ -14,6 +14,7 @@ public class ContractChangePlanPo implements Serializable {
     private String storeId;
 
 
+
     public String getPlanType() {
         return planType;
     }

service-common/src/main/java/com/java110/common/smo/impl/ContractChangeUserInnerServiceSMOImpl.java

@@ -66,6 +66,7 @@ public class ContractChangeUserInnerServiceSMOImpl extends BaseServiceSMO implem
         variables.put("contractChangePlanDto", contractChangePlanDto);
         variables.put("userId", contractChangePlanDto.getCurrentUserId());
         variables.put("startUserId", contractChangePlanDto.getCurrentUserId());
+        variables.put("nextUserId", contractChangePlanDto.getNextUserId());
         //开启流程
         ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(getWorkflowDto(contractChangePlanDto.getStoreId()),contractChangePlanDto.getPlanId(), variables);
         //将得到的实例流程id值赋给之前设置的变量

service-store/src/main/java/com/java110/store/api/ContractApi.java

@@ -871,7 +871,7 @@ public class ContractApi {
 
         ContractChangePlanDetailPo contractChangePlanDetailPo = BeanConvertUtil.covertBean(reqJson, ContractChangePlanDetailPo.class);
         contractChangePlanDetailPo.setStoreId(storeId);
-        return saveContractChangePlanBMOImpl.save(contractChangePlanPo, contractChangePlanDetailPo,contractChangePlanRoomPos);
+        return saveContractChangePlanBMOImpl.save(contractChangePlanPo, contractChangePlanDetailPo,contractChangePlanRoomPos,reqJson);
     }
 
     /**

service-store/src/main/java/com/java110/store/bmo/contractChangePlan/ISaveContractChangePlanBMO.java

@@ -1,5 +1,6 @@
 package com.java110.store.bmo.contractChangePlan;
 
+import com.alibaba.fastjson.JSONObject;
 import com.java110.po.contractChangePlan.ContractChangePlanPo;
 import com.java110.po.contractChangePlanDetail.ContractChangePlanDetailPo;
 import com.java110.po.contractChangePlanRoom.ContractChangePlanRoomPo;
@@ -18,7 +19,8 @@ public interface ISaveContractChangePlanBMO {
      */
     ResponseEntity<String> save(ContractChangePlanPo contractChangePlanPo,
                                 ContractChangePlanDetailPo contractChangePlanDetailPo,
-                                List<ContractChangePlanRoomPo> contractChangePlanRoomPos);
+                                List<ContractChangePlanRoomPo> contractChangePlanRoomPos,
+                                JSONObject reqJson);
 
 
 }

service-store/src/main/java/com/java110/store/bmo/contractChangePlan/impl/SaveContractChangePlanBMOImpl.java

@@ -1,5 +1,6 @@
 package com.java110.store.bmo.contractChangePlan.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.dto.RoomDto;
@@ -71,7 +72,8 @@ public class SaveContractChangePlanBMOImpl implements ISaveContractChangePlanBMO
     @Java110Transactional
     public ResponseEntity<String> save(ContractChangePlanPo contractChangePlanPo,
                                        ContractChangePlanDetailPo contractChangePlanDetailPo,
-                                       List<ContractChangePlanRoomPo> contractChangePlanRoomPos) {
+                                       List<ContractChangePlanRoomPo> contractChangePlanRoomPos,
+                                       JSONObject reqJson) {
 
         //查询老的合同信息
         ContractDto contractDto = new ContractDto();
@@ -120,6 +122,7 @@ public class SaveContractChangePlanBMOImpl implements ISaveContractChangePlanBMO
             //提交流程
             ContractChangePlanDto contractChangePlanDto = BeanConvertUtil.covertBean(contractChangePlanPo, ContractChangePlanDto.class);
             contractChangePlanDto.setCurrentUserId(contractChangePlanPo.getChangePerson());
+            contractChangePlanDto.setNextUserId(reqJson.getString("nextUserId"));
             contractChangeUserInnerServiceSMO.startProcess(contractChangePlanDto);
         } else {
             ContractChangePlanPo tmpContractChangePlanPo = new ContractChangePlanPo();