diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbzManagerApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbzManagerApproveAfter.java index 176f48d1..fd80bd7a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbzManagerApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbzManagerApproveAfter.java @@ -37,28 +37,35 @@ public class PCAbzManagerApproveAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson", object); //后续节点所需要的数据 - List nextUserList=new ArrayList<>(); + List nextUserList = new ArrayList<>(); - if ("1".equals(object.getString("BZFlag"))){ - delegateTask.setVariable("BZFlag","1"); - delegateTask.setVariable("GCUserId",String.valueOf(delegateTask.getVariable("gcjl"))); + if ("1".equals(object.getString("BZFlag"))) { + delegateTask.setVariable("BZFlag", "1"); + delegateTask.setVariable("GCUserId", String.valueOf(delegateTask.getVariable("gcjl"))); nextUserList.add(String.valueOf(delegateTask.getVariable("gcjl"))); - }else { + } else { //流程直接结束，抄送消息提示 - delegateTask.setVariable("BZFlag","2"); + delegateTask.setVariable("BZFlag", "2"); } //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - String user = delegateTask.getVariable("prcCreateUser",String.class); - String username = delegateTask.getVariable("prcCreateUserName",String.class); - String prcName = delegateTask.getVariable("stId",String.class)+"-合规评估流程-工程经理转办"; + String user = delegateTask.getVariable("prcCreateUser", String.class); + String username = delegateTask.getVariable("prcCreateUserName", String.class); + String prcName=""; + if ("1".equals(object.getString("BZFlag"))) { + prcName= delegateTask.getVariable("stId", String.class) + "-合规评估流程-工程经理转办"; + }else { + prcName= delegateTask.getVariable("stId", String.class) + "-合规评估流程-流程结束"; + } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { -// one1.setOverTime(OVERTIME); + if (!"1".equals(object.getString("BZFlag"))) { + one1.setOverTime(OVERTIME); + } one1.setPrcType("6"); one1.setPrcName(prcName); one1.setCreatUser(user); @@ -67,20 +74,20 @@ public class PCAbzManagerApproveAfter implements TaskListener { } // 存储当前节点意见1 - if (null!=object.getString("commentText")) { + if (null != object.getString("commentText")) { QueryWrapper queryWrapper3 = new QueryWrapper(); queryWrapper3.eq("TASK_ID", delegateTask.getId()); - queryWrapper3.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper3.eq("USER_ID", delegateTask.getAssignee()); List list = busBean.list(queryWrapper3); - if(!list.isEmpty()){ + if (!list.isEmpty()) { BusProcessNew busProcessNews = list.get(0); busProcessNews.setTaskId(delegateTask.getId()); busProcessNews.setCommitText(object.getString("commentText")); busBean.saveOrUpdate(busProcessNews); } } - if(nextUserList != null && !nextUserList.isEmpty()){ - for(String userId : nextUserList){ + if (nextUserList != null && !nextUserList.isEmpty()) { + for (String userId : nextUserList) { BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step8After.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step8After.java index 2d005905..c12862ed 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step8After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step8After.java @@ -14,6 +14,7 @@ import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; //新征求意见流程!!!!! @@ -46,7 +47,8 @@ public class Step8After implements TaskListener { //整备数据 if ("0".equals(object.getString("bdFlag"))) { delegateTask.setVariable("bdMark",delegateTask.getVariable("bdMark",Integer.class)); - nextUserList.add(delegateTask.getVariable("directorUser",String.class)); + List strings=new ArrayList<>(Arrays.asList(delegateTask.getVariable("directorUser",String.class).split(","))); + nextUserList.addAll(strings); delegateTask.setVariable("hqFlag", "0"); }else { delegateTask.setVariable("bdMark",delegateTask.getVariable("bdMark",Integer.class)+1); @@ -62,7 +64,7 @@ public class Step8After implements TaskListener { delegateTask.setVariable("bdFlag","1"); } } - delegateTask.setVariable("directorUser",delegateTask.getVariable("directorUser",String.class)); + delegateTask.setVariable("directorUserList",nextUserList); //截止时间 流程描述 创建人 String user = delegateTask.getVariable("user",String.class); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step9After.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step9After.java index ad3d3522..a74b9fee 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step9After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step9After.java @@ -10,6 +10,7 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; import com.ydw.bat.wkflow.util.SpringContextUtil; +import io.swagger.models.auth.In; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; @@ -21,7 +22,7 @@ public class Step9After implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); @@ -30,29 +31,38 @@ public class Step9After implements TaskListener { queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); Datas datas = datasService.getOne(queryWrapper); - JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); - delegateTask.setVariable("objectJson",object); + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson", object); List nextUserList = new ArrayList(); - String prcName=""; - if ("0".equals(object.getString("directorFlag"))){ - delegateTask.setVariable("directorFlag","0"); - prcName =delegateTask.getVariable("cid")+"-标准征求意见流程-工程研究总院院长批准"; - nextUserList.add(object.getString("presidentUser")); - delegateTask.setVariable("presidentUser",object.getString("presidentUser")); - }else { - delegateTask.setVariable("directorFlag","1"); - nextUserList.add(delegateTask.getVariable("bzfgIdSum",String.class)); - prcName =delegateTask.getVariable("cid")+"-标准征求意见流程-标准法规工程师汇总"; + String prcName = ""; + //设置一个计数器 + if (null != delegateTask.getVariable("9Counnt", Integer.class)) { + delegateTask.setVariable("9Counnt", delegateTask.getVariable("9Counnt", Integer.class) + 1); + } else { + delegateTask.setVariable("9Counnt", 1); + } + + if ("0".equals(object.getString("directorFlag"))) { + delegateTask.setVariable("directorFlag", "0"); + if (delegateTask.getVariable("9Counnt", Integer.class) == 1) { + delegateTask.setVariable("9Mark", "true"); + delegateTask.setVariable("presidentUser", object.getString("presidentUser")); + } else if ("true" == delegateTask.getVariable("7Mark", String.class)) { + delegateTask.setVariable("9Mark", "true"); + } + } else { + delegateTask.setVariable("directorFlag", "1"); + delegateTask.setVariable("9Mark", "false"); } //截止时间 流程描述 创建人 - String user = delegateTask.getVariable("user",String.class); - String username = delegateTask.getVariable("userName",String.class); + String user = delegateTask.getVariable("user", String.class); + String username = delegateTask.getVariable("userName", String.class); QueryWrapper queryWrapper2 = new QueryWrapper(); - queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); + queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); - if(one1!=null){ + if (one1 != null) { one1.setPrcType("3"); one1.setPrcName(prcName); one1.setCreatUser(user); @@ -73,19 +83,31 @@ public class Step9After implements TaskListener { busBean.saveOrUpdate(busProcessNews); } } - - if(nextUserList != null && !nextUserList.isEmpty()){ - for(String nextUser : nextUserList){ - BusProcessNew busProcessNewNext = new BusProcessNew(); - busProcessNewNext.setMsgType("clause"); - busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); - busProcessNewNext.setMesg(object.toJSONString()); - busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); - busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); - busProcessNewNext.setUserId(nextUser); - busProcessNewNext.setPrcName(prcName); - busBean.save(busProcessNewNext); + if (delegateTask.getVariable("9Counnt", Integer.class) >= delegateTask.getVariable("directorUserList",List.class).size()) { + if ("true".equals(delegateTask.getVariable("9Mark"))){ + delegateTask.setVariable("directorFlag", "0"); + prcName = delegateTask.getVariable("cid") + "-标准征求意见流程-工程研究总院院长批准"; + nextUserList.add(object.getString("presidentUser")); + delegateTask.setVariable("presidentUser", object.getString("presidentUser")); + }else { + delegateTask.setVariable("9Counnt", 0); + delegateTask.setVariable("directorFlag", "1"); + nextUserList.add(delegateTask.getVariable("bzfgIdSum", String.class)); + prcName = delegateTask.getVariable("cid") + "-标准征求意见流程-标准法规工程师汇总"; + } + if (nextUserList != null && !nextUserList.isEmpty()) { + for (String nextUser : nextUserList) { + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } } } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/ResponUserSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/ResponUserSignAfter.java index e7438949..d72604d0 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/ResponUserSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/ResponUserSignAfter.java @@ -105,6 +105,7 @@ public class ResponUserSignAfter implements TaskListener { res.add(s); } }); + delegateTask.setVariable("userList",res); for(String nextUser : res){ BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause");