危险作业人流程修改

@@ -10,6 +10,8 @@ import com.skua.core.util.ConvertUtils;
 import com.skua.modules.emergency.entity.DangerousOperation;
 import com.skua.modules.emergency.entity.DangerousOperation;
 import com.skua.modules.emergency.service.IDangerousOperationService;
 import com.skua.modules.emergency.service.IDangerousOperationService;
 import com.skua.modules.flow.business.service.FlowBusinessService;
 import com.skua.modules.flow.business.service.FlowBusinessService;
+import com.skua.modules.flow.business.service.IFlowService;
+import com.skua.modules.flow.core.constant.ProcessConstant;
 import com.skua.modules.flow.core.entity.FlowAssemblyEntity;
 import com.skua.modules.flow.core.entity.FlowAssemblyEntity;
 import com.skua.modules.system.vo.UserCertificate;
 import com.skua.modules.system.vo.UserCertificate;
 import com.skua.tool.util.BeanExtUtils;
 import com.skua.tool.util.BeanExtUtils;
@@ -34,7 +36,8 @@ import java.util.stream.Collectors;
 public class DangerousOperationController {
 public class DangerousOperationController {
 	@Autowired
 	@Autowired
 	private IDangerousOperationService dangerousOperationService;
 	private IDangerousOperationService dangerousOperationService;
-
+	@Autowired
+	private IFlowService flowService;
     @Autowired
     @Autowired
     private FlowBusinessService flowBusinessService;
     private FlowBusinessService flowBusinessService;
 	/**
 	/**
@@ -222,24 +225,21 @@ public class DangerousOperationController {
 		return Result.ok("删除成功!");
 		return Result.ok("删除成功!");
 	}
 	}
 
 
+	//
 	@PostMapping(value = "/complete-task-choose-user-pass")
 	@PostMapping(value = "/complete-task-choose-user-pass")
 	public Result<?> completeTaskChooseUserPass(@RequestBody DangerousOperation dangerousOperation) throws Exception {
 	public Result<?> completeTaskChooseUserPass(@RequestBody DangerousOperation dangerousOperation) throws Exception {
 		Result<?> result = new Result();
 		Result<?> result = new Result();
-		FlowAssemblyEntity flowAssemblyEntity = BeanExtUtils.bean2Bean(dangerousOperation, FlowAssemblyEntity.class);
-		if (org.apache.commons.lang.StringUtils.isEmpty(flowAssemblyEntity.getAssemblyKey())) {
-			//AssemblyKey对应参数用户id
-			flowAssemblyEntity.setAssemblyKey("");
-		}
-		String activeResult = this.flowBusinessService.completeTaskChooseUserPass(flowAssemblyEntity);
-		if ("noChooseUser".equals(activeResult)) {
-			result.error500("未指定下一节点用户！");
-		} else if ("fail".equals(activeResult)) {
-			result.error500("程序异常，流程审批失败！");
-		} else {
+		//流程执行id
+		String executionId = dangerousOperation.getFlow().getExecutionId();
 		DangerousOperation dangerOperation = BeanExtUtils.bean2Bean(dangerousOperation, DangerousOperation.class);
 		DangerousOperation dangerOperation = BeanExtUtils.bean2Bean(dangerousOperation, DangerousOperation.class);
 		dangerousOperationService.updateById(dangerOperation);
 		dangerousOperationService.updateById(dangerOperation);
+		//流程进入下一节点，并行网关设置判定条件
+		Map<String, Object> mapVariable = new HashMap<String,Object>();
+		mapVariable.put("dangerDeal", "taskUser_"+dangerousOperation.getOperationUser());
+		flowService.configureVariables(executionId, mapVariable);
+		//动态设置流程接修人
+		flowBusinessService.completeTask(ProcessConstant.PASS_KEY, dangerousOperation.getFlow());
 		result.success("成功");
 		result.success("成功");
-		}
 		return result;
 		return result;
 	}
 	}