bug: 政策课题参会流程修改

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/InspectorApprovalAfter.java

@@ -90,16 +90,18 @@ public class InspectorApprovalAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
-        for (String nextUser : nextUserList) {
+        if (!nextUserList.isEmpty() && delegateTask.getVariable("nrOfCompletedInstances", Integer.class) == 0) {
-            BusProcessNew busProcessNewNext = new BusProcessNew();
+            for (String nextUser : nextUserList) {
-            busProcessNewNext.setMsgType("clause");
+                BusProcessNew busProcessNewNext = new BusProcessNew();
-            busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+                busProcessNewNext.setMsgType("clause");
-            busProcessNewNext.setMesg(object.toJSONString());
+                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
-            busProcessNewNext.setFinishFlag("0");
+                busProcessNewNext.setMesg(object.toJSONString());
-            busProcessNewNext.setTaskInfo(taskInfo);
+                busProcessNewNext.setFinishFlag("0");
-            busProcessNewNext.setUserId(nextUser);
+                busProcessNewNext.setTaskInfo(taskInfo);
-            busProcessNewNext.setPrcName(prcName);
+                busProcessNewNext.setUserId(nextUser);
-            busBean.save(busProcessNewNext);
+                busProcessNewNext.setPrcName(prcName);
+                busBean.save(busProcessNewNext);
+            }
         }
     }
 }

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/InspectorApprovalBefore.java

@@ -26,12 +26,13 @@ public class InspectorApprovalBefore implements TaskListener {
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);
             one1.setTaskId(delegateTask.getId());
+            one1.setTaskInfo(delegateTask.getName());
             busBean.saveOrUpdate(one1);
 
             CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
             one1.setLink("policyTopicParticipation/step3?prcType=31");
-            one1.setTaskInfo(delegateTask.getName());
+
             oaService.sendTodoMq(one1);
         }
     }

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalAfter.java

@@ -42,8 +42,7 @@ public class MinisterApprovalAfter implements TaskListener {
         String user = delegateTask.getVariable("applyUserId", String.class);
         String username = delegateTask.getVariable("applyUserName", String.class);
         String topicName = object.getString("topicName");
-        String prcName = topicName + "-政策课题组参会流程";
+        String prcName = topicName + "-政策课题参会流程";
-        String taskInfo = "";
         List<String> nextUserList = new ArrayList<>();
 
         if (object.getInteger("approvalOpinion") == 0) {
@@ -53,7 +52,6 @@ public class MinisterApprovalAfter implements TaskListener {
                 List<String> inspectorIdList = Arrays.asList(object.getString("inspectorId").split(","));
                 delegateTask.setVariable("inspectorIdList", inspectorIdList);
                 nextUserList.addAll(inspectorIdList);
-                taskInfo = "审定";
             } else {
                 throw new ActivitiException("1#2法规认证部副总监不存在,请配置相关人员");
             }
@@ -63,7 +61,6 @@ public class MinisterApprovalAfter implements TaskListener {
             if (StringUtils.isNotBlank(object.getString("applyUserId"))) {
                 delegateTask.setVariable("applyUserId", object.getString("applyUserId"));
                 nextUserList.add(object.getString("applyUserId"));
-                taskInfo = "重新起草";
             } else {
                 throw new ActivitiException("1#2起草人不存在,请配置相关人员");
             }
@@ -93,14 +90,13 @@ public class MinisterApprovalAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
-        if (!nextUserList.isEmpty()) {
+        if (!nextUserList.isEmpty() && delegateTask.getVariable("nrOfCompletedInstances", Integer.class) == 0) {
             for (String nextUser : nextUserList) {
                 BusProcessNew busProcessNewNext = new BusProcessNew();
                 busProcessNewNext.setMsgType("clause");
                 busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
                 busProcessNewNext.setMesg(object.toJSONString());
                 busProcessNewNext.setFinishFlag("0");
-                busProcessNewNext.setTaskInfo(taskInfo);
                 busProcessNewNext.setUserId(nextUser);
                 busProcessNewNext.setPrcName(prcName);
                 busBean.save(busProcessNewNext);

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalBefore.java

@@ -25,12 +25,12 @@ public class MinisterApprovalBefore implements TaskListener {
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);
             one1.setTaskId(delegateTask.getId());
+            one1.setTaskInfo(delegateTask.getName());
             busBean.saveOrUpdate(one1);
 
             CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
             one1.setLink("policyTopicParticipation/step2?prcType=31");
-            one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
         }
     }

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PRGAMStartAfter.java

@@ -85,8 +85,6 @@ public class PRGAMStartAfter implements TaskListener {
                 busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
                 busProcessNewNext.setMesg(object.toJSONString());
                 busProcessNewNext.setFinishFlag("0");
-//                busProcessNewNext.setTaskInfo(delegateTask.getName());
-                busProcessNewNext.setTaskInfo("审核");
                 busProcessNewNext.setUserId(nextUser);
                 busProcessNewNext.setPrcName(prcName);
                 busBean.save(busProcessNewNext);

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalBefore.java

@@ -25,12 +25,12 @@ public class PresidentApprovalBefore implements TaskListener {
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);
             one1.setTaskId(delegateTask.getId());
+            one1.setTaskInfo(delegateTask.getName());
             busBean.saveOrUpdate(one1);
 
             CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
             one1.setLink("policyTopicParticipation/step4?prcType=31");
-            one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
         }
     }

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationBefore.java

@@ -25,12 +25,12 @@ public class RevisionInformationBefore implements TaskListener {
         if(!list.isEmpty()){
             BusProcessNew one1 = list.get(0);
             one1.setTaskId(delegateTask.getId());
+            one1.setTaskInfo(delegateTask.getName());
             busBean.saveOrUpdate(one1);
 
             CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
             one1.setLink("policyTopicParticipation/step1_1?prcType=31");
-            one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
         }
     }