wangpeng
/
integrated_traffic
forked from integrated_whb/integrated_whb
1
0
Fork 0
Code Pull Requests Activity

动火作业加入可跳过步骤

pull/4/head
fangjiakai 2024-02-05 15:53:14 +08:00
parent dfae8753cc
commit f275f5b3b2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java
View File

@ -145,9 +145,10 @@ public class HotworkServiceImpl implements HotworkService {
List<PageData> unsignedList = hotworkSignMapper.checkUnsigned(sign);//当前步骤未签名人列表 List<PageData> unsignedList = hotworkSignMapper.checkUnsigned(sign);//当前步骤未签名人列表
if((unsignedList == null || unsignedList.size() == 0) && pd.getString("APPLY_STATUS").equals("1")){//如果没有未签人 则跳转下一步 if((unsignedList == null || unsignedList.size() == 0) && pd.getString("APPLY_STATUS").equals("1")){//如果没有未签人 则跳转下一步
// PageData currentflow = getStep(work.get("TASK_ID"), work.get("STEP_ID")); // PageData currentflow = getStep(work.get("TASK_ID"), work.get("STEP_ID"));
hotworkMapper.editStep(work);
PageData currentflow = getCurrentFlow(work); PageData currentflow = getCurrentFlow(work);
work.put("STEP_ID", currentflow.get("STEP_ID"));
hotworkMapper.editStep(work);
//保存日志 //保存日志
saveLog(work,work.getString("USER_ID"),"1"); saveLog(work,work.getString("USER_ID"),"1");
@ -385,7 +386,7 @@ public class HotworkServiceImpl implements HotworkService {
flow.put("TASK_ID", work.get("TASK_ID")); flow.put("TASK_ID", work.get("TASK_ID"));
flow.put("STEP_ID", work.get("STEP_ID")); flow.put("STEP_ID", work.get("STEP_ID"));
flow = eightWorkTaskFlowMapper.getStep(flow); flow = eightWorkTaskFlowMapper.getStep(flow);
if("1".equals(flow.get("CAN_SKIP")) && (work.get(flow.get("NEXT_ACTOR_FIELD")) == null || work.get(flow.get("NEXT_ACTOR_FIELD")).equals(""))){ if("1".equals(flow.getString("CAN_SKIP")) && (work.get(flow.get("NEXT_ACTOR_FIELD")) == null || work.get(flow.get("NEXT_ACTOR_FIELD")).equals(""))){
work.put("STEP_ID", flow.get("NEXT_STEP_ID")); work.put("STEP_ID", flow.get("NEXT_STEP_ID"));
return getCurrentFlow(work); return getCurrentFlow(work);
}else{ }else{