Commit f46543c3 authored by zhangyingbin's avatar zhangyingbin

优化流程

parent d049c82d
...@@ -103,31 +103,14 @@ public class ProblemInitiationServiceImpl { ...@@ -103,31 +103,14 @@ public class ProblemInitiationServiceImpl {
} }
if(ProjectInitiationEnum.接受审查意见.getName().equals(dataObject.getString("name"))){
projectInitiation.setTaskName(dataObject.getString("name")+"(流程结束!)");
}
if (ProjectInitiationEnum.告知申请.getName().equals(dataObject.getString("name"))) {
}
if ("监检科室分配".equals(dataObject.getString("name"))) {
}
if ("监检员分配".equals(dataObject.getString("name"))) {
}
if ("监检员审核".equals(dataObject.getString("name"))) {
}
try { try {
//组装信息 //组装信息
TaskResultDTO dto = new TaskResultDTO(); TaskResultDTO dto = new TaskResultDTO();
dto.setResult(option); dto.setResult(option);
dto.setResultCode("condition"); dto.setResultCode("select");
dto.setTaskId(projectInitiation.getTaskId()); dto.setTaskId(projectInitiation.getTaskId());
HashMap<String, Object> var = new HashMap<>(); HashMap<String, Object> var = new HashMap<>();
var.put("condition", option); var.put("select", option);
dto.setVariable(var); dto.setVariable(var);
//执行流程 //执行流程
Workflow.taskClient.completeByTask(projectInitiation.getTaskId(),dto); Workflow.taskClient.completeByTask(projectInitiation.getTaskId(),dto);
...@@ -137,7 +120,7 @@ public class ProblemInitiationServiceImpl { ...@@ -137,7 +120,7 @@ public class ProblemInitiationServiceImpl {
e.printStackTrace(); e.printStackTrace();
System.out.println("任务完成失败:"+e.getMessage()); System.out.println("任务完成失败:"+e.getMessage());
} finally { } finally {
//更新project种的status字段,表示当前流程下一个执行的任务 //更新problem中的status字段,表示当前流程下一个执行的任务
updateProBlemFlowStatus(instanceId); updateProBlemFlowStatus(instanceId);
} }
} }
......
...@@ -30,6 +30,7 @@ emqx.password=123456 ...@@ -30,6 +30,7 @@ emqx.password=123456
fire-rescue=123 fire-rescue=123
params.work.flow.processDefinitionKey=xiangmulixiangliucheng params.work.flow.processDefinitionKey=xiangmulixiangliucheng
params.work.flow.problemDefinitionKey=zhiliangwentiliucheng
amos.secret.key=ugp amos.secret.key=ugp
#logging.level.com.yeejoin.amos=error #logging.level.com.yeejoin.amos=error
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment