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

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalAfter.java

@@ -46,9 +46,10 @@ public class PGREPresidentApprovalAfter implements TaskListener {
 
         List<String> nextUserList = new ArrayList<>();
 
-        if (object.getInteger("approvalOpinion") == 0) {
+        if (delegateTask.getVariable("approvalStatus",Boolean.class)) {
             // 批准通过
-            delegateTask.setVariable("approvalOpinion", 0);
+//            delegateTask.setVariable("approvalOpinion", 0);
+            delegateTask.setVariable("approvalStatus", true);
             LambdaQueryWrapper<BusProcessName> queryWrapper2 = new LambdaQueryWrapper<>();
             queryWrapper2.eq(BusProcessName::getPrcId, delegateTask.getProcessInstanceId());
             BusProcessName one2 = busProcessNameService.getOne(queryWrapper2);
@@ -59,7 +60,8 @@ public class PGREPresidentApprovalAfter implements TaskListener {
             }
         } else {
             // 批准驳回
-            delegateTask.setVariable("approvalOpinion", 1);
+//            delegateTask.setVariable("approvalOpinion", 1);
+            delegateTask.setVariable("approvalStatus", false);
             if (StringUtils.isNotBlank(object.getString("applyUserId"))) {
                 delegateTask.setVariable("applyUserId", object.getString("applyUserId"));
                 nextUserList.add(object.getString("applyUserId"));

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalBefore.java

@@ -25,12 +25,12 @@ public class PGREPresidentApprovalBefore 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("policyTopicEnrollment/step4?prcType=30");
-            one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
         }
     }

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalAfter.java

@@ -44,9 +44,10 @@ public class PRGEInspectorApprovalAfter implements TaskListener {
         String taskInfo = "";
         List<String> nextUserList = new ArrayList<>();
 
-        if (object.getInteger("approvalOpinion") == 0) {
+        if (delegateTask.getVariable("approvalStatus",Boolean.class)) {
             // 审定通过
-            delegateTask.setVariable("approvalOpinion", 0);
+//            delegateTask.setVariable("approvalOpinion", 0);
+            delegateTask.setVariable("approvalStatus", true);
             if (StringUtils.isNotBlank(object.getString("presidentId"))) {
                 delegateTask.setVariable("presidentId", object.getString("presidentId"));
                 nextUserList.add(object.getString("presidentId"));
@@ -57,6 +58,7 @@ public class PRGEInspectorApprovalAfter implements TaskListener {
         } else {
             // 审定驳回
             delegateTask.setVariable("approvalOpinion", 1);
+//            delegateTask.setVariable("approvalStatus", false);
             if (StringUtils.isNotBlank(object.getString("applyUserId"))){
                 delegateTask.setVariable("applyUserId", object.getString("applyUserId"));
                 nextUserList.add(object.getString("applyUserId"));
@@ -91,16 +93,13 @@ public class PRGEInspectorApprovalAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
-        if (!nextUserList.isEmpty()) {
+        if (!nextUserList.isEmpty() && delegateTask.getVariable("nrOfCompletedInstances", Integer.class) <= 1) {
             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.setTaskInfo(taskInfo);
                 busProcessNewNext.setUserId(nextUser);
                 busProcessNewNext.setPrcName(prcName);
                 busBean.save(busProcessNewNext);

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalBefore.java

@@ -26,12 +26,12 @@ public class PRGEInspectorApprovalBefore 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=30");
-            one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
         }
     }

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmAfter.java

@@ -43,14 +43,15 @@ public class PRGEMinisterConfirmAfter 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){
+        if(delegateTask.getVariable("approvalStatus",Boolean.class)){
             // 审核通过
-            delegateTask.setVariable("approvalOpinion", 0);
+//            delegateTask.setVariable("approvalOpinion", 0);
+            delegateTask.setVariable("approvalStatus",true);
             if (StringUtils.isNotBlank(object.getString("inspectorId"))){
                 List<String> inspectorIdList = Arrays.asList(object.getString("inspectorId").split(","));
                 delegateTask.setVariable("inspectorIdList",inspectorIdList);
@@ -61,7 +62,8 @@ public class PRGEMinisterConfirmAfter implements TaskListener {
             }
         }else{
             // 审核驳回
-            delegateTask.setVariable("approvalOpinion",1);
+//            delegateTask.setVariable("approvalOpinion",1);
+            delegateTask.setVariable("approvalOpinion",false);
             if (StringUtils.isNotBlank(object.getString("applyUserId"))){
                 delegateTask.setVariable("applyUserId", object.getString("applyUserId"));
                 nextUserList.add(object.getString("applyUserId"));
@@ -97,16 +99,13 @@ public class PRGEMinisterConfirmAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
-        if (!nextUserList.isEmpty()) {
+        if (!nextUserList.isEmpty() && delegateTask.getVariable("nrOfCompletedInstances", Integer.class) <= 1) {
             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.setTaskInfo(taskInfo);
                 busProcessNewNext.setUserId(nextUser);
                 busProcessNewNext.setPrcName(prcName);
                 busBean.save(busProcessNewNext);

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmBefore.java

@@ -26,12 +26,12 @@ public class PRGEMinisterConfirmBefore 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("policyTopicEnrollment/step2?prcType=30");
-            one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
         }
     }

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java

@@ -1,6 +1,7 @@
 package com.ydw.bat.wkflow.listener.policyResearchGroupEnrollment;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
@@ -44,6 +45,7 @@ public class PRGEStartAfter implements TaskListener {
             List<String> ministerIdList = Arrays.asList(object.getString("ministerId").split(","));
             delegateTask.setVariable("ministerIdList",ministerIdList);
             nextUserList.addAll(ministerIdList);
+            delegateTask.setVariable("approvalStatus",true);
         } else {
             throw new ActivitiException("1#2法规认证部部长不存在,请配置相关人员");
         }
@@ -65,21 +67,20 @@ public class PRGEStartAfter implements TaskListener {
             busProcessNameService.saveOrUpdate(one1);
         }
 
-        if (null != object.getString("commentText")) {
+        // 存储当前节点意见
-            BusProcessNew busProcessNews = new BusProcessNew();
+        BusProcessNew busProcessNews = new BusProcessNew();
-            busProcessNews.setMsgType("clause");
+        busProcessNews.setMsgType("clause");
-            busProcessNews.setPId(delegateTask.getProcessInstanceId());
+        busProcessNews.setPId(delegateTask.getProcessInstanceId());
-            busProcessNews.setMesg(object.toJSONString());
+        busProcessNews.setMesg(object.toJSONString());
 //            busProcessNews.setTaskInfo(delegateTask.getTaskDefinitionKey());
-            busProcessNews.setFinishFlag("0");
+        busProcessNews.setFinishFlag("0");
-            busProcessNews.setTaskInfo(delegateTask.getName());
+        busProcessNews.setTaskInfo(delegateTask.getName());
-            busProcessNews.setTaskId(delegateTask.getId());
+        busProcessNews.setTaskId(delegateTask.getId());
 //            busProcessNews.setUserId("start");
-            busProcessNews.setUserId(user);
+        busProcessNews.setUserId(user);
-            busProcessNews.setPrcName(prcName);
+        busProcessNews.setPrcName(prcName);
-            busProcessNews.setCommitText(object.getString("commentText"));
+        busProcessNews.setCommitText(object.getString("commentText"));
-            busBean.save(busProcessNews);
+        busBean.save(busProcessNews);
-        }
 
         if (!nextUserList.isEmpty()) {
             for (String nextUser : nextUserList) {
@@ -87,10 +88,7 @@ public class PRGEStartAfter implements TaskListener {
                 busProcessNewNext.setMsgType("clause");
                 busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
                 busProcessNewNext.setMesg(object.toJSONString());
-//                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
                 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/policyResearchGroupEnrollment/RevisionInformationAfter.java

@@ -41,6 +41,7 @@ public class RevisionInformationAfter implements TaskListener {
         List<String> nextUserList = new ArrayList<>();
 
         if (StringUtils.isNotBlank(object.getString("ministerId"))) {
+            delegateTask.setVariable("approvalStatus", true);
             List<String> ministerIdList = Arrays.asList(object.getString("ministerId").split(","));
             delegateTask.setVariable("ministerIdList",ministerIdList);
             nextUserList.addAll(ministerIdList);
@@ -83,10 +84,7 @@ public class RevisionInformationAfter implements TaskListener {
                 busProcessNewNext.setMsgType("clause");
                 busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
                 busProcessNewNext.setMesg(object.toJSONString());
-//                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
                 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/policyResearchGroupEnrollment/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("policyTopicEnrollment/step1_1?prcType=30");
-            one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
         }
     }