From f614effa3a7c193578365563c8e9ef2f3d07094e Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 02 四月 2022 12:44:03 +0800
Subject: [PATCH] 优化合同加入审核人功能
---
java110-bean/src/main/java/com/java110/po/contractChangePlan/ContractChangePlanPo.java | 1 +
java110-bean/src/main/java/com/java110/dto/contractChangePlan/ContractChangePlanDto.java | 11 +++++++++++
service-store/src/main/java/com/java110/store/bmo/contractChangePlan/impl/SaveContractChangePlanBMOImpl.java | 5 ++++-
service-store/src/main/java/com/java110/store/bmo/contractChangePlan/ISaveContractChangePlanBMO.java | 4 +++-
service-store/src/main/java/com/java110/store/api/ContractApi.java | 2 +-
service-common/src/main/java/com/java110/common/smo/impl/ContractChangeUserInnerServiceSMOImpl.java | 1 +
6 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/java110-bean/src/main/java/com/java110/dto/contractChangePlan/ContractChangePlanDto.java b/java110-bean/src/main/java/com/java110/dto/contractChangePlan/ContractChangePlanDto.java
index ee7d134..a8a54c9 100644
--- a/java110-bean/src/main/java/com/java110/dto/contractChangePlan/ContractChangePlanDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/contractChangePlan/ContractChangePlanDto.java
@@ -29,6 +29,7 @@
private String changePersonName;
private String state;
private String storeId;
+ private String nextUserId;
private Date createTime;
@@ -134,4 +135,14 @@
public void setPlanIds(String[] planIds) {
this.planIds = planIds;
}
+
+ @Override
+ public String getNextUserId() {
+ return nextUserId;
+ }
+
+ @Override
+ public void setNextUserId(String nextUserId) {
+ this.nextUserId = nextUserId;
+ }
}
diff --git a/java110-bean/src/main/java/com/java110/po/contractChangePlan/ContractChangePlanPo.java b/java110-bean/src/main/java/com/java110/po/contractChangePlan/ContractChangePlanPo.java
index b16e786..287db4f 100644
--- a/java110-bean/src/main/java/com/java110/po/contractChangePlan/ContractChangePlanPo.java
+++ b/java110-bean/src/main/java/com/java110/po/contractChangePlan/ContractChangePlanPo.java
@@ -14,6 +14,7 @@
private String storeId;
+
public String getPlanType() {
return planType;
}
diff --git a/service-common/src/main/java/com/java110/common/smo/impl/ContractChangeUserInnerServiceSMOImpl.java b/service-common/src/main/java/com/java110/common/smo/impl/ContractChangeUserInnerServiceSMOImpl.java
index 23b9e19..1bff50a 100644
--- a/service-common/src/main/java/com/java110/common/smo/impl/ContractChangeUserInnerServiceSMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/smo/impl/ContractChangeUserInnerServiceSMOImpl.java
@@ -66,6 +66,7 @@
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鍊艰祴缁欎箣鍓嶈缃殑鍙橀噺
diff --git a/service-store/src/main/java/com/java110/store/api/ContractApi.java b/service-store/src/main/java/com/java110/store/api/ContractApi.java
index 00dc478..884963c 100755
--- a/service-store/src/main/java/com/java110/store/api/ContractApi.java
+++ b/service-store/src/main/java/com/java110/store/api/ContractApi.java
@@ -871,7 +871,7 @@
ContractChangePlanDetailPo contractChangePlanDetailPo = BeanConvertUtil.covertBean(reqJson, ContractChangePlanDetailPo.class);
contractChangePlanDetailPo.setStoreId(storeId);
- return saveContractChangePlanBMOImpl.save(contractChangePlanPo, contractChangePlanDetailPo,contractChangePlanRoomPos);
+ return saveContractChangePlanBMOImpl.save(contractChangePlanPo, contractChangePlanDetailPo,contractChangePlanRoomPos,reqJson);
}
/**
diff --git a/service-store/src/main/java/com/java110/store/bmo/contractChangePlan/ISaveContractChangePlanBMO.java b/service-store/src/main/java/com/java110/store/bmo/contractChangePlan/ISaveContractChangePlanBMO.java
index 843d8a6..c9813cb 100644
--- a/service-store/src/main/java/com/java110/store/bmo/contractChangePlan/ISaveContractChangePlanBMO.java
+++ b/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 @@
*/
ResponseEntity<String> save(ContractChangePlanPo contractChangePlanPo,
ContractChangePlanDetailPo contractChangePlanDetailPo,
- List<ContractChangePlanRoomPo> contractChangePlanRoomPos);
+ List<ContractChangePlanRoomPo> contractChangePlanRoomPos,
+ JSONObject reqJson);
}
diff --git a/service-store/src/main/java/com/java110/store/bmo/contractChangePlan/impl/SaveContractChangePlanBMOImpl.java b/service-store/src/main/java/com/java110/store/bmo/contractChangePlan/impl/SaveContractChangePlanBMOImpl.java
index 36278c4..44b696a 100644
--- a/service-store/src/main/java/com/java110/store/bmo/contractChangePlan/impl/SaveContractChangePlanBMOImpl.java
+++ b/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 @@
@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 @@
//鎻愪氦娴佺▼
ContractChangePlanDto contractChangePlanDto = BeanConvertUtil.covertBean(contractChangePlanPo, ContractChangePlanDto.class);
contractChangePlanDto.setCurrentUserId(contractChangePlanPo.getChangePerson());
+ contractChangePlanDto.setNextUserId(reqJson.getString("nextUserId"));
contractChangeUserInnerServiceSMO.startProcess(contractChangePlanDto);
} else {
ContractChangePlanPo tmpContractChangePlanPo = new ContractChangePlanPo();
--
Gitblit v1.8.0