Merge remote-tracking branch 'origin/develop' into develop

src/main/java/com/ydw/bat/wkflow/listener/bussFs/BLApplicantAfter.java

@@ -44,9 +44,9 @@ public class BLApplicantAfter implements TaskListener{
         String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");
-//        object.getString("standName")
+
-        String standName = "";
+        String standName = object.getString("standName");
-        String prcName = "企标复审流程-对接人选择复审人";
+        String prcName = standName+"-企标复审流程";
 
         List<String> nextUserList = new ArrayStack<>();
         if(StringUtils.isNotBlank(object.getString("bussFsSubUser1"))){

src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs2After.java

@@ -43,7 +43,7 @@ public class BussFs2After implements TaskListener{
             delegateTask.setVariable("bussFsUser3",object.getString("bussFsUser3"));
             nextUserList.add(object.getString("bussFsUser3"));
         }else {
-            throw new ActivitiException("1#2发起人不存在,请配置相关人员");
+            throw new ActivitiException("1#2标准法规部高级经理不存在,请配置相关人员");
         }
 
 
@@ -53,8 +53,8 @@ public class BussFs2After implements TaskListener{
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
-        String standName = "";
+        String standName = object.getString("standName");
-        String prcName = "企标复审流程-标准法规部高级经理批准";
+        String prcName = standName+"-企标复审流程";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
@@ -68,16 +68,6 @@ public class BussFs2After implements TaskListener{
             busProcessNameService.saveOrUpdate(one1);
         }
 
-        /**
-         * 当子任务结束时存储
-         */
-        Integer commentCount=delegateTask.getVariable("commentCount",Integer.class);
-        if(commentCount==null)commentCount=0;
-        commentCount++;
-        delegateTask.setVariable("count",commentCount);
-
-        Collection commentUserList=delegateTask.getVariable("bussFsSubList",Collection.class);
-
         // 存储当前节点意见
         BusProcessNew busProcessNew = new BusProcessNew();
         busProcessNew.setMsgType("clause");
@@ -90,35 +80,18 @@ public class BussFs2After implements TaskListener{
         busProcessNew.setTaskInfo(delegateTask.getName());
         busBean.save(busProcessNew);
 
-        if(commentCount>=commentUserList.size()){
+        if(nextUserList != null && !nextUserList.isEmpty()){
-            if(nextUserList != null && !nextUserList.isEmpty()){
+            for(String nextUser : nextUserList){
-                for(String nextUser : nextUserList){
+                BusProcessNew busProcessNewNext = new BusProcessNew();
-                    BusProcessNew busProcessNewNext = new BusProcessNew();
+                busProcessNewNext.setMsgType("clause");
-                    busProcessNewNext.setMsgType("clause");
+                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
-                    busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+                busProcessNewNext.setMesg(object.toJSONString());
-                    busProcessNewNext.setMesg(object.toJSONString());
+                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
-                    busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
+                busProcessNewNext.setFinishFlag("0");
-                    busProcessNewNext.setFinishFlag("0");
+                busProcessNewNext.setTaskInfo(delegateTask.getName());
-                    busProcessNewNext.setTaskInfo(delegateTask.getName());
+                busProcessNewNext.setUserId(nextUser);
-                    busProcessNewNext.setUserId(nextUser);
+                busProcessNewNext.setPrcName(prcName);
-                    busProcessNewNext.setPrcName(prcName);
+                busBean.save(busProcessNewNext);
-                    busBean.save(busProcessNewNext);
-                }
-            }
-        }else {
-            QueryWrapper queryWrapper1 = new QueryWrapper();
-            queryWrapper1.eq("TASK_ID", delegateTask.getId());
-            BusProcessNew one2 = busBean.getOne(queryWrapper1);
-            if (one1 != null) {
-                one2.setMsgType("clause");
-                one2.setPId(delegateTask.getProcessInstanceId());
-                one2.setMesg(object.toJSONString());
-                one2.setFinishFlag("0");
-                one2.setTaskInfo(delegateTask.getName());
-                one2.setPrcName(prcName);
-                one2.setCommitFlag("0");
-                one2.setCommitText(object.getString("commentText"));
-                busBean.saveOrUpdate(one2);
             }
         }
 

src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs2Before.java

@@ -41,7 +41,7 @@ public class BussFs2Before implements TaskListener{
             busBean.saveOrUpdate(one1);
 
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
-            one1.setLink("BussFs2?prcType=buss3");
+            one1.setLink("bussFs2?prcType=buss3");
             one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
 

src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs3After.java

@@ -2,9 +2,11 @@ package com.ydw.bat.wkflow.listener.bussFs;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
 import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
+import com.ydw.bat.wkflow.business_main.datas.entity.EsRevisePlanDTO;
 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;
@@ -30,6 +32,7 @@ public class BussFs3After implements TaskListener{
         IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
+        LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
 
         QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
@@ -49,13 +52,14 @@ public class BussFs3After implements TaskListener{
 
 
         String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString();
+        String standSort = object.get("standSort") == null ? "" : object.get("standSort").toString();
         //截止时间 流程描述 创建人
         String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
-        String standName = "";
+        String standName = object.getString("standName");
-        String prcName = "企标复审流程-发起人汇总结果";
+        String prcName = standName+"-企标复审流程";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
@@ -72,6 +76,7 @@ public class BussFs3After implements TaskListener{
         if(StringUtils.isNotBlank(approvalOpinion)){
             if ("0".equalsIgnoreCase(approvalOpinion)) {
                 BussUtils.endFunAll(delegateTask, prcName,busBean, object, "0", busProcessNameService,"buss3");
+                delegateTask.setVariable("bussFs3Flag", 0);
             } else {
                 if(StringUtils.isNotBlank(object.getString("bussFsUserC2"))) {
                     BusProcessNew busProcessNew = new BusProcessNew();

src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs3Before.java

@@ -38,7 +38,7 @@ public class BussFs3Before implements TaskListener{
             busBean.saveOrUpdate(one1);
 
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
-            one1.setLink("BussFs3?prcType=buss3");
+            one1.setLink("bussFs3?prcType=buss3");
             one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
 

src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsC2After.java

@@ -51,8 +51,8 @@ public class BussFsC2After implements TaskListener{
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
-        String standName = "";
+        String standName = object.getString("standName");
-        String prcName = "企标复审流程-发起人汇总结果";
+        String prcName = standName+"-企标复审流程";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());

src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsC2Before.java

@@ -38,7 +38,7 @@ public class BussFsC2Before implements TaskListener{
             busBean.saveOrUpdate(one1);
 
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
-            one1.setLink("BussFsC2?prcType=buss3");
+            one1.setLink("bussFsC2?prcType=buss3");
             one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
 

src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub1After.java

@@ -52,8 +52,8 @@ public class BussFsSub1After implements TaskListener{
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
-        String standName = "";
+        String standName = object.getString("standName");
-        String prcName = "企标复审流程-复审人选择复审结果";
+        String prcName = standName+"-企标复审流程";
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());

src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub1Before.java

@@ -41,7 +41,7 @@ public class BussFsSub1Before implements TaskListener{
             busBean.saveOrUpdate(one1);
 
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
-            one1.setLink("BussFsSub1?prcType=buss3");
+            one1.setLink("bussFsSub1?prcType=buss3");
             one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
 

src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub2After.java

@@ -54,8 +54,17 @@ public class BussFsSub2After implements TaskListener{
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
-        String standName = "";
+        String standName = object.getString("standName");
-        String prcName = "企标复审流程-发起人汇总结果";
+        String prcName = standName+"-企标复审流程";
+
+
+        Integer commentCount=delegateTask.getVariable("count",Integer.class);
+        if(commentCount==null)commentCount=0;
+        commentCount++;
+        delegateTask.setVariable("count",commentCount);
+
+        Collection commentUserList=delegateTask.getVariable("bussFsSubList",Collection.class);
+
 
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
@@ -63,7 +72,9 @@ public class BussFsSub2After implements TaskListener{
         if(one1!=null){
 //            one1.setOverTime(OVERTIME);
             one1.setPrcType("buss3");
-            one1.setPrcName(prcName);
+            if(commentCount>=commentUserList.size()) {
+                one1.setPrcName(prcName);
+            }
             one1.setCreatUser(user);
             one1.setCreatUserName(username);
             busProcessNameService.saveOrUpdate(one1);
@@ -80,13 +91,6 @@ public class BussFsSub2After implements TaskListener{
         fileList.addAll(object.getJSONArray("fileModelList"));
         delegateTask.setVariable("fileModelList",fileList);
 
-        Integer commentCount=delegateTask.getVariable("count",Integer.class);
-        if(commentCount==null)commentCount=0;
-        commentCount++;
-        delegateTask.setVariable("count",commentCount);
-
-        Collection commentUserList=delegateTask.getVariable("bussFsSubList",Collection.class);
-
         // 存储当前节点意见
         BusProcessNew busProcessNew = new BusProcessNew();
         busProcessNew.setMsgType("clause");
@@ -100,6 +104,7 @@ public class BussFsSub2After implements TaskListener{
         busBean.save(busProcessNew);
 
         if(commentCount>=commentUserList.size()){
+            funEnd(delegateTask, busBean, queryWrapper, object, prcName);
             if(nextUserList != null && !nextUserList.isEmpty()){
                 for(String nextUser : nextUserList){
                     BusProcessNew busProcessNewNext = new BusProcessNew();
@@ -115,26 +120,30 @@ public class BussFsSub2After implements TaskListener{
                 }
             }
         }else {
-            QueryWrapper queryWrapper1 = new QueryWrapper();
+            funEnd(delegateTask, busBean, queryWrapper, object, prcName);
-            queryWrapper1.eq("TASK_ID", delegateTask.getId());
-            queryWrapper.isNotNull("PRC_NAME");
-            List<BusProcessNew> list = busBean.list(queryWrapper1);
-            if (!list.isEmpty()) {
-                BusProcessNew one2 = list.get(0);
-                one2.setMsgType("clause");
-                one2.setPId(delegateTask.getProcessInstanceId());
-                one2.setMesg(object.toJSONString());
-                one2.setFinishFlag("0");
-                one2.setTaskInfo(delegateTask.getName());
-                one2.setPrcName(prcName);
-                one2.setCommitFlag("0");
-                one2.setCommitText(object.getString("commentText"));
-                busBean.saveOrUpdate(one2);
-            }
         }
 
     }
 
+    private void funEnd(DelegateTask delegateTask, IBusProcessNewService busBean, QueryWrapper<Datas> queryWrapper, JSONObject object, String prcName) {
+        QueryWrapper queryWrapper1 = new QueryWrapper();
+        queryWrapper1.eq("TASK_ID", delegateTask.getId());
+        queryWrapper.isNotNull("PRC_NAME");
+        List<BusProcessNew> list = busBean.list(queryWrapper1);
+        if (!list.isEmpty()) {
+            BusProcessNew one2 = list.get(0);
+            one2.setMsgType("clause");
+            one2.setPId(delegateTask.getProcessInstanceId());
+            one2.setMesg(object.toJSONString());
+            one2.setFinishFlag("0");
+            one2.setTaskInfo(delegateTask.getName());
+            one2.setPrcName(prcName);
+            one2.setCommitFlag("0");
+            one2.setCommitText(object.getString("commentText"));
+            busBean.saveOrUpdate(one2);
+        }
+    }
+
     private String verifyObj(String str){
         return (str == null || str.equals("")) ? "" : str;
     }

src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub2Before.java

@@ -38,7 +38,7 @@ public class BussFsSub2Before implements TaskListener{
             busBean.saveOrUpdate(one1);
 
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
-            one1.setLink("BussFsSub2?prcType=buss3");
+            one1.setLink("bussFsSub2?prcType=buss3");
             one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);