|
|
|
@ -80,7 +80,7 @@ public class HazardTaskServiceImpl extends ServiceImpl<HazardTaskMapper, HazardT
|
|
|
|
|
//保存业务表单
|
|
|
|
|
String saved = saveEntity(JSONObject.toJSONString(process)); |
|
|
|
|
//开启动作流
|
|
|
|
|
R r = this.startProcess(JSON.toJSONString(saved), HazardRiskConstants.HAZARD_RISK_KEY,null); |
|
|
|
|
R r = this.startProcess(saved, HazardRiskConstants.HAZARD_RISK_KEY,null); |
|
|
|
|
return r ; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -223,8 +223,14 @@ public class HazardTaskServiceImpl extends ServiceImpl<HazardTaskMapper, HazardT
|
|
|
|
|
entity.setProcessSteps(processWorkFlowResponse.getTaskName()); |
|
|
|
|
// 流程阶段执行人员名称
|
|
|
|
|
entity.setNextStepOperator(processWorkFlowResponse.getNextStepOperator()); |
|
|
|
|
Boolean examine = (Boolean) variables.get(HazardRiskConstants.EXAMINE); |
|
|
|
|
Boolean review = (Boolean) variables.get(HazardRiskConstants.REVIEW); |
|
|
|
|
Boolean examine = false; |
|
|
|
|
Boolean review=false; |
|
|
|
|
if (ObjectUtil.isNotEmpty(variables.get(HazardRiskConstants.EXAMINE))){ |
|
|
|
|
examine = (Boolean) variables.get(HazardRiskConstants.EXAMINE); |
|
|
|
|
} |
|
|
|
|
if (ObjectUtil.isNotEmpty(variables.get(HazardRiskConstants.EXAMINE))){ |
|
|
|
|
review = (Boolean) variables.get(HazardRiskConstants.REVIEW); |
|
|
|
|
} |
|
|
|
|
if(examine || review){ |
|
|
|
|
// 当前流程名称
|
|
|
|
|
entity.setProcessSteps("流程结束"); |
|
|
|
|