工作流增加条件

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 regionalCompanyName = new JSONObject();
+		totalValue.put("name", "regionalCompanyName");
+		totalValue.put("key", "regionalCompanyName");
+		totalValue.put("type", "String");
+		
 		array.put(arg1);
 		array.put(arg2);
 		array.put(arg3);
@@ -604,6 +609,7 @@ public class WorkflowGenerator {
 		array.put(value);
 		array.put(totalValue);
 		array.put(equipCount);
+		array.put(regionalCompanyName);
 		return array;
 	}
 

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

@@ -2,6 +2,8 @@ package com.xyst.dinas.contract.entity;
 
 import java.io.Serializable;
 
+import org.json.JSONObject;
+
 public class BaseEntity implements Serializable{
 
 	private static final long serialVersionUID = 1L;
@@ -10,6 +12,8 @@ public class BaseEntity implements Serializable{
 	
 	private Long version;
 	
+	private JSONObject approvalParams;
+	
 	
 
 	public String getId() {
@@ -27,6 +31,16 @@ 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,10 +119,10 @@ public class ContractServiceImpl implements ContractService {
 
 	@Transactional
 	@Override
-	public void submitFlowForInsert(UUID id) {
+	public void submitFlowForInsert(UUID id, Map<String,Object> params) {
 		KObject kobject = contractDao.load(id);
 		if (needSubmitFlow(ContractConstant.BIZ_TYPE,kobject,"SUBMIT")) {
-			inzWorkflowService.startWorkflow("SUBMIT", ContractConstant.BIZ_TYPE, kobject.getString(ContractConstant.CONTRACT_NAME),kobject);
+			inzWorkflowService.startWorkflow("SUBMIT", ContractConstant.BIZ_TYPE, kobject.getString(ContractConstant.CONTRACT_NAME),kobject, params);
 		}
 //		else{
 //			afterApprovedForInsert(kobject);
@@ -131,10 +131,10 @@ public class ContractServiceImpl implements ContractService {
 	
 	@Override
 	@Transactional
-	public void submitFlowForUpdate(UUID id) {
+	public void submitFlowForUpdate(UUID id, Map<String,Object> params) {
 		KObject kobject = contractDao.load(id);
 		if (needSubmitFlow(ContractConstant.BIZ_TYPE,kobject,"CHANGE")) {
-			inzWorkflowService.startWorkflow("SUBMIT", ContractConstant.BIZ_TYPE_UPDATE, kobject.getString(ContractConstant.CONTRACT_NAME),kobject);
+			inzWorkflowService.startWorkflow("SUBMIT", ContractConstant.BIZ_TYPE_UPDATE, kobject.getString(ContractConstant.CONTRACT_NAME),kobject, params);
 		}
 //		else{
 //			afterApprovedForUpdate(kobject);

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

@@ -2,6 +2,7 @@ package com.xyst.dinas.contract.service;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 
 import org.json.JSONArray;
@@ -70,14 +71,15 @@ public interface ContractService {
 	/**
 	 * 新增合同-提交工作流
 	 * @param id
+	 * @param params 
 	 */
-	void submitFlowForInsert(UUID id);
+	void submitFlowForInsert(UUID id, Map<String, Object> params);
 	
 	/**
 	 * 变更合同-提交工作流
 	 * @param id
 	 */
-	void submitFlowForUpdate(UUID id);
+	void submitFlowForUpdate(UUID id, Map<String, Object> params);
 	
 	/**
 	 * 新增合同- 审批通过后的回调

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

@@ -2,7 +2,9 @@ package com.xyst.dinas.contract.web;
 
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 
 import org.json.JSONArray;
@@ -138,8 +140,13 @@ 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);
+			contractService.submitFlowForInsert(id,params);
 		}catch (Exception e){
 			e.printStackTrace();
 			return ResponseObj.error("提交审核失败", e.getMessage());
@@ -150,8 +157,13 @@ 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);
+			contractService.submitFlowForUpdate(id, params);
 		}catch (Exception e){
 			e.printStackTrace();
 			return ResponseObj.error("变更审核失败", e.getMessage());