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

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalAfter.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;
@@ -14,7 +15,9 @@ import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
 import org.apache.commons.lang.StringUtils;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -43,12 +46,20 @@ public class PGREPresidentApprovalAfter implements TaskListener {
 
         List<String> nextUserList = new ArrayList<>();
 
-        if ("1".equals(object.getString("gsfz"))) {
+        if (object.getInteger("approvalOpinion") == 0) {
             // 批准通过
-            delegateTask.setVariable("gsfz", "1");
+            delegateTask.setVariable("approvalOpinion", 0);
+            LambdaQueryWrapper<BusProcessName> queryWrapper2 = new LambdaQueryWrapper<>();
+            queryWrapper2.eq(BusProcessName::getPrcId, delegateTask.getProcessInstanceId());
+            BusProcessName one2 = busProcessNameService.getOne(queryWrapper2);
+            String overTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+            if (one2 != null) {
+                one2.setOverTime(overTime);
+                busProcessNameService.saveOrUpdate(one2);
+            }
         } else {
             // 批准驳回
-            delegateTask.setVariable("gsfz", "0");
+            delegateTask.setVariable("approvalOpinion", 1);
             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/PRGEInspectorApprovalAfter.java

@@ -43,31 +43,24 @@ public class PRGEInspectorApprovalAfter implements TaskListener {
         String prcName= topicName + "-政策课题入会流程";
         List<String> nextUserList = new ArrayList<>();
 
-        if ("1".equals(object.getString("fgfzj"))) {
+        if (object.getInteger("approvalOpinion") == 0) {
             // 审定通过
-            delegateTask.setVariable("fgfzj", "1");
+            delegateTask.setVariable("approvalOpinion", 0);
             if (StringUtils.isNotBlank(object.getString("presidentId"))) {
                 delegateTask.setVariable("presidentId", object.getString("presidentId"));
                 nextUserList.add(object.getString("presidentId"));
             } else {
                 throw new ActivitiException("1#2公司副总不存在,请配置相关人员");
             }
-        } else if ("0".equals(object.getString("fgfzj"))) {
+        } else {
             // 审定驳回
-            delegateTask.setVariable("fgfzj", "0");
+            delegateTask.setVariable("approvalOpinion", 1);
             if (StringUtils.isNotBlank(object.getString("applyUserId"))){
                 delegateTask.setVariable("applyUserId", object.getString("applyUserId"));
                 nextUserList.add(object.getString("applyUserId"));
             } else {
                 throw new ActivitiException("1#2起草人不存在,请配置相关人员");
             }
-            // 删除其他该节点的代办数据
-//            LambdaQueryWrapper<BusProcessNew> wrapper = new LambdaQueryWrapper<>();
-//            wrapper.eq(BusProcessNew::getTaskId, delegateTask.getId());
-//            busBean.remove(wrapper);
-        }else{
-            delegateTask.setVariable("fgfzj", "2");
-            prcName = "政策课题组入会流程";
         }
 
         // 存储当前节点意见

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

@@ -47,9 +47,9 @@ public class PRGEMinisterConfirmAfter implements TaskListener {
 
         List<String> nextUserList = new ArrayList<>();
 
-        if("1".equals(object.getString("fgfbz"))){
+        if(object.getInteger("approvalOpinion") == 0){
             // 审核通过
-            delegateTask.setVariable("fgfbz", "1");
+            delegateTask.setVariable("approvalOpinion", 0);
             if (StringUtils.isNotBlank(object.getString("inspectorId"))){
                 List<String> inspectorIdList = Arrays.asList(object.getString("inspectorId").split(","));
                 delegateTask.setVariable("inspectorIdList",inspectorIdList);
@@ -59,7 +59,7 @@ public class PRGEMinisterConfirmAfter implements TaskListener {
             }
         }else{
             // 审核驳回
-            delegateTask.setVariable("fgfbz","0");
+            delegateTask.setVariable("approvalOpinion",1);
             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/RevisonInformationAfter.java

@@ -40,7 +40,7 @@ public class RevisonInformationAfter implements TaskListener {
 
         List<String> nextUserList = new ArrayList<>();
 
-        if (StringUtils.isNotBlank(delegateTask.getVariable("ministerId",String.class))) {
+        if (StringUtils.isNotBlank(object.getString("ministerId"))) {
             List<String> ministerIdList = Arrays.asList(object.getString("ministerId").split(","));
             delegateTask.setVariable("ministerIdList",ministerIdList);
             nextUserList.addAll(ministerIdList);