工作流传值增加区域公司code

backend/inz.workflow/src/main/java/com/beecode/inz/workflow/util/WorkflowGenerator.java

@@ -589,6 +589,11 @@ public class WorkflowGenerator {
 		equipCount.put("key", "equipCount");
 		equipCount.put("type", "int");
 		
+		JSONObject regionalCompanyCode = new JSONObject();
+		totalValue.put("name", "regionalCompanyCode");
+		totalValue.put("key", "regionalCompanyCode");
+		totalValue.put("type", "String");
+		
 		JSONObject regionalCompanyName = new JSONObject();
 		totalValue.put("name", "regionalCompanyName");
 		totalValue.put("key", "regionalCompanyName");
@@ -609,6 +614,7 @@ public class WorkflowGenerator {
 		array.put(value);
 		array.put(totalValue);
 		array.put(equipCount);
+		array.put(regionalCompanyCode);
 		array.put(regionalCompanyName);
 		return array;
 	}

backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/entity/BaseEntity.java

@@ -12,8 +12,6 @@ public class BaseEntity implements Serializable{
 	
 	private Long version;
 	
-	private JSONObject approvalParams;
-	
 	
 
 	public String getId() {
@@ -31,14 +29,6 @@ public class BaseEntity implements Serializable{
 	public void setVersion(Long version) {
 		this.version = version;
 	}
-
-	public JSONObject getApprovalParams() {
-		return approvalParams;
-	}
-
-	public void setApprovalParams(JSONObject approvalParams) {
-		this.approvalParams = approvalParams;
-	}
 	
 	
 	

backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/internal/service/ContractServiceImpl.java

@@ -119,8 +119,12 @@ public class ContractServiceImpl implements ContractService {
 
 	@Transactional
 	@Override
-	public void submitFlowForInsert(UUID id, Map<String,Object> params) {
+	public void submitFlowForInsert(UUID id) {
 		KObject kobject = contractDao.load(id);
+		KObject regionalCompany = kobject.get("regionalCompany");
+		Map <String,Object> params = new HashMap();
+		params.put("regionalCompanyCode", regionalCompany.getString("code"));
+		params.put("regionalCompanyName", regionalCompany.getString("name"));
 		if (needSubmitFlow(ContractConstant.BIZ_TYPE,kobject,"SUBMIT")) {
 			inzWorkflowService.startWorkflow("SUBMIT", ContractConstant.BIZ_TYPE, kobject.getString(ContractConstant.CONTRACT_NAME),kobject, params);
 		}
@@ -131,8 +135,12 @@ public class ContractServiceImpl implements ContractService {
 	
 	@Override
 	@Transactional
-	public void submitFlowForUpdate(UUID id, Map<String,Object> params) {
+	public void submitFlowForUpdate(UUID id) {
 		KObject kobject = contractDao.load(id);
+		KObject regionalCompany = kobject.get("regionalCompany");
+		Map <String,Object> params = new HashMap();
+		params.put("regionalCompanyCode", regionalCompany.getString("code"));
+		params.put("regionalCompanyName", regionalCompany.getString("name"));
 		if (needSubmitFlow(ContractConstant.BIZ_TYPE,kobject,"CHANGE")) {
 			inzWorkflowService.startWorkflow("SUBMIT", ContractConstant.BIZ_TYPE_UPDATE, kobject.getString(ContractConstant.CONTRACT_NAME),kobject, params);
 		}

backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/service/ContractService.java

@@ -73,13 +73,13 @@ public interface ContractService {
 	 * @param id
 	 * @param params 
 	 */
-	void submitFlowForInsert(UUID id, Map<String, Object> params);
+	void submitFlowForInsert(UUID id);
 	
 	/**
 	 * 变更合同-提交工作流
 	 * @param id
 	 */
-	void submitFlowForUpdate(UUID id, Map<String, Object> params);
+	void submitFlowForUpdate(UUID id);
 	
 	/**
 	 * 新增合同- 审批通过后的回调
@@ -94,4 +94,5 @@ public interface ContractService {
 	
 	public List<KObject> queryExeContractListInLife(UUID regionalCompanyId,@Nullable Date startDate,@Nullable Date endDate);
 
+
 }

backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/web/ContractController.java

@@ -140,13 +140,8 @@ public class ContractController {
 	@PostMapping("/contract/submitFlow")
 	public Object submitFlow(@RequestBody BaseEntity baseEntity) {
 		UUID id = UUID.fromString(baseEntity.getId());
-		JSONObject approvalParams = baseEntity.getApprovalParams();
-		Map<String, Object> params = new HashMap<>();
-		for(String approvalParamsName : approvalParams.keySet()) {
-			params.put(approvalParamsName, approvalParams.get(approvalParamsName));
-		}
 		try{
-			contractService.submitFlowForInsert(id,params);
+			contractService.submitFlowForInsert(id);
 		}catch (Exception e){
 			e.printStackTrace();
 			return ResponseObj.error("提交审核失败", e.getMessage());
@@ -157,13 +152,8 @@ public class ContractController {
 	@PostMapping("/contract/update/submitFlow")
 	public Object submitFlowForUpdate(@RequestBody BaseEntity baseEntity) {
 		UUID id = UUID.fromString(baseEntity.getId());
-		JSONObject approvalParams = baseEntity.getApprovalParams();
-		Map<String, Object> params = new HashMap<>();
-		for(String approvalParamsName : approvalParams.keySet()) {
-			params.put(approvalParamsName, approvalParams.get(approvalParamsName));
-		}
 		try{
-			contractService.submitFlowForUpdate(id, params);
+			contractService.submitFlowForUpdate(id);
 		}catch (Exception e){
 			e.printStackTrace();
 			return ResponseObj.error("变更审核失败", e.getMessage());