Merge branch 'develop' into 'FOTON'

Develop

See merge request foton-wkflow-group/foton-wkflow-rest!84

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

@@ -44,9 +44,12 @@ 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 prcName = "";
-        String standName = "";
+        if(StringUtils.isNotBlank(object.getString("standName"))){
-        String prcName = "企标制修订流程及企业标准库流程";
+                prcName = object.getString("standName") + "-企标制修订-技术标准";
+        }else {
+                prcName = "企标制修订-技术标准";
+        }
 
         List<String> nextUserList = new ArrayStack<>();
         if(StringUtils.isNotBlank(object.getString("qcUserId"))){

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary10After.java

@@ -39,7 +39,12 @@ public class BussLibrary10After implements TaskListener{
         String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString();
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");
-        String prcName = "企标制修订流程及企业标准库流程";
+        String prcName = "";
+        if(StringUtils.isNotBlank(object.getString("standName"))){
+            prcName = object.getString("standName") + "-企标制修订-技术标准";
+        }else {
+            prcName = "企标制修订-技术标准";
+        }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary11After.java

@@ -39,7 +39,12 @@ public class BussLibrary11After implements TaskListener{
         String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString();
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");
-        String prcName = "企标制修订流程及企业标准库流程";
+        String prcName = "";
+        if(StringUtils.isNotBlank(object.getString("standName"))){
+            prcName = object.getString("standName") + "-企标制修订-技术标准";
+        }else {
+            prcName = "企标制修订-技术标准";
+        }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary12After.java

@@ -36,7 +36,12 @@ public class BussLibrary12After implements TaskListener{
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
 
-        String prcName = "企标制修订流程及企业标准库流程";
+        String prcName = "";
+        if(StringUtils.isNotBlank(object.getString("standName"))){
+            prcName = object.getString("standName") + "-企标制修订-技术标准";
+        }else {
+            prcName = "企标制修订-技术标准";
+        }
         BussUtils.endFunc(delegateTask, prcName,busBean, object, "0", busProcessNameService);
     }
 

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary2After.java

@@ -63,7 +63,12 @@ public class BussLibrary2After implements TaskListener{
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
         String standName = "";
-        String prcName = "企标制修订流程及企业标准库流程";
+        String prcName = "";
+        if(StringUtils.isNotBlank(object.getString("standName"))){
+            prcName = object.getString("standName") + "-企标制修订-技术标准";
+        }else {
+            prcName = "企标制修订-技术标准";
+        }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary3After.java

@@ -53,7 +53,12 @@ public class BussLibrary3After implements TaskListener{
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
         String standName = "";
-        String prcName = "企标制修订流程及企业标准库流程";
+        String prcName = "";
+        if(StringUtils.isNotBlank(object.getString("standName"))){
+            prcName = object.getString("standName") + "-企标制修订-技术标准";
+        }else {
+            prcName = "企标制修订-技术标准";
+        }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary4After.java

@@ -40,7 +40,12 @@ public class BussLibrary4After implements TaskListener{
         String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString();
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");
-        String prcName = "企标制修订流程及企业标准库流程";
+        String prcName = "";
+        if(StringUtils.isNotBlank(object.getString("standName"))){
+            prcName = object.getString("standName") + "-企标制修订-技术标准";
+        }else {
+            prcName = "企标制修订-技术标准";
+        }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary5After.java

@@ -59,7 +59,12 @@ public class BussLibrary5After implements TaskListener{
         //截止时间 流程描述 创建人
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");
-        String prcName = "企标制修订流程及企业标准库流程";
+        String prcName = "";
+        if(StringUtils.isNotBlank(object.getString("standName"))){
+            prcName = object.getString("standName") + "-企标制修订-技术标准";
+        }else {
+            prcName = "企标制修订-技术标准";
+        }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary6After.java

@@ -46,7 +46,12 @@ public class BussLibrary6After implements TaskListener{
         //截止时间 流程描述 创建人
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");
-        String prcName = "企标制修订流程及企业标准库流程";
+        String prcName = "";
+        if(StringUtils.isNotBlank(object.getString("standName"))){
+            prcName = object.getString("standName") + "-企标制修订-技术标准";
+        }else {
+            prcName = "企标制修订-技术标准";
+        }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary7After.java

@@ -43,17 +43,16 @@ public class BussLibrary7After implements TaskListener{
 
         List<String> nextUserList = new ArrayList();
 
-        if(StringUtils.isNotBlank(object.getString("jsfzrUserId"))){
-            delegateTask.setVariable("jsfzrUserId",object.getString("jsfzrUserId"));
-            nextUserList.add(object.getString("jsfzrUserId"));
-        }else {
-            throw new ActivitiException("1#2标准化员不存在,请配置相关人员");
-        }
-
         //截止时间 流程描述 创建人
+        String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString();
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");
-        String prcName = "企标制修订流程及企业标准库流程";
+        String prcName = "";
+        if(StringUtils.isNotBlank(object.getString("standName"))){
+            prcName = object.getString("standName") + "-企标制修订-技术标准";
+        }else {
+            prcName = "企标制修订-技术标准";
+        }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -66,6 +65,44 @@ public class BussLibrary7After implements TaskListener{
             busProcessNameService.saveOrUpdate(one1);
         }
 
+        if(StringUtils.isNotBlank(approvalOpinion)){
+            if ("0".equalsIgnoreCase(approvalOpinion)) {
+                if(StringUtils.isNotBlank(object.getString("jsfzrUserId"))){
+
+                    delegateTask.setVariable("jsfzrUserId",object.getString("jsfzrUserId"));
+                    nextUserList.add(object.getString("jsfzrUserId"));
+
+                    BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
+                    // 评分存储
+                    BussUtils.evalSave(delegateTask, object, prcName, delegateTask.getAssignee());
+                    delegateTask.setVariable("fs7Flag", 0);
+                }else {
+                    throw new ActivitiException("1#2部长用户参数不存在,请配置相关用户");
+                }
+            } else {
+                if(StringUtils.isNotBlank(object.getString("xdUserId"))) {
+                    BusProcessNew busProcessNew = new BusProcessNew();
+                    busProcessNew.setMsgType("clause");
+                    busProcessNew.setPId(delegateTask.getProcessInstanceId());
+                    busProcessNew.setMesg(object.toJSONString());
+                    busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+                    busProcessNew.setFinishFlag("0");
+                    busProcessNew.setTaskInfo(delegateTask.getName());
+                    busProcessNew.setUserId(object.getString("xdUserId"));
+                    busProcessNew.setPrcName(prcName);
+                    busBean.save(busProcessNew);
+
+                    BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1");
+                    delegateTask.setVariable("cxdUserId",object.getString("xdUserId"));
+                    delegateTask.setVariable("fs7Flag", 1);
+                }else {
+                    throw new ActivitiException("1#2修订用户不存在,请配置相关人员");
+                }
+            }
+        }else {
+            throw new ActivitiException("1#2 提交OR驳回参数不存在");
+        }
+
         // 存储当前节点意见
         BusProcessNew busProcessNew = new BusProcessNew();
         busProcessNew.setMsgType("clause");

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary8After.java

@@ -39,7 +39,12 @@ public class BussLibrary8After implements TaskListener{
         String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString();
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");
-        String prcName = "企标制修订流程及企业标准库流程";
+        String prcName = "";
+        if(StringUtils.isNotBlank(object.getString("standName"))){
+            prcName = object.getString("standName") + "-企标制修订-技术标准";
+        }else {
+            prcName = "企标制修订-技术标准";
+        }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -83,11 +88,11 @@ public class BussLibrary8After implements TaskListener{
                     delegateTask.setVariable("cxdUserId",object.getString("xdUserId"));
                     delegateTask.setVariable("jsfzrFlag", 1);
                 }else {
-                    throw new ActivitiException("1#2 提交OR驳回参数不存在");
+                    throw new ActivitiException("1#2修订用户不存在,请配置相关人员");
                 }
             }
         }else {
-            throw new ActivitiException("1#2标准化员不存在,请配置相关人员");
+            throw new ActivitiException("1#2 提交OR驳回参数不存在");
         }
     }
 

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary9After.java

@@ -39,7 +39,12 @@ public class BussLibrary9After implements TaskListener{
         String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString();
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");
-        String prcName = "企标制修订流程及企业标准库流程";
+        String prcName = "";
+        if(StringUtils.isNotBlank(object.getString("standName"))){
+            prcName = object.getString("standName") + "-企标制修订-技术标准";
+        }else {
+            prcName = "企标制修订-技术标准";
+        }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC3After.java

@@ -61,7 +61,12 @@ public class BussLibraryC3After implements TaskListener{
             String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
             String standName = "";
-            String prcName = "企标制修订流程及企业标准库流程";
+            String prcName = "";
+            if(StringUtils.isNotBlank(object.getString("standName"))){
+                prcName = object.getString("standName") + "-企标制修订-技术标准";
+            }else {
+                prcName = "企标制修订-技术标准";
+            }
             QueryWrapper queryWrapper2 = new QueryWrapper();
             queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
             BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC6After.java

@@ -61,7 +61,12 @@ public class BussLibraryC6After implements TaskListener{
             String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
             String standName = "";
-            String prcName = "企标制修订流程及企业标准库流程";
+            String prcName = "";
+            if(StringUtils.isNotBlank(object.getString("standName"))){
+                prcName = object.getString("standName") + "-企标制修订-技术标准";
+            }else {
+                prcName = "企标制修订-技术标准";
+            }
             QueryWrapper queryWrapper2 = new QueryWrapper();
             queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
             BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

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

@@ -46,7 +46,12 @@ public class BLApplicantAfter implements TaskListener{
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
         String standName = "";
-        String prcName = "企标制修订-产品标准";
+        String prcName = "";
+        if(StringUtils.isNotBlank(object.getString("standName"))){
+            prcName = object.getString("standName") + "-企标制修订-产品标准";
+        }else {
+            prcName = "企标制修订-产品标准";
+        }
 
         List<String> nextUserList = new ArrayStack<>();
         if(StringUtils.isNotBlank(object.getString("bussUser2"))){

src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct10After.java

@@ -41,7 +41,12 @@ public class BussLibraryProduct10After implements TaskListener{
         String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString();
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");
-        String prcName = "企标制修订-产品标准";
+        String prcName = "";
+        if(StringUtils.isNotBlank(object.getString("standName"))){
+            prcName = object.getString("standName") + "-企标制修订-产品标准";
+        }else {
+            prcName = "企标制修订-产品标准";
+        }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct11After.java

@@ -41,7 +41,12 @@ public class BussLibraryProduct11After implements TaskListener{
         String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString();
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");
-        String prcName = "企标制修订-产品标准";
+        String prcName = "";
+        if(StringUtils.isNotBlank(object.getString("standName"))){
+            prcName = object.getString("standName") + "-企标制修订-产品标准";
+        }else {
+            prcName = "企标制修订-产品标准";
+        }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct12After.java

@@ -41,7 +41,12 @@ public class BussLibraryProduct12After implements TaskListener{
         String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString();
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");
-        String prcName = "企标制修订-产品标准";
+        String prcName = "";
+        if(StringUtils.isNotBlank(object.getString("standName"))){
+            prcName = object.getString("standName") + "-企标制修订-产品标准";
+        }else {
+            prcName = "企标制修订-产品标准";
+        }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct13After.java

@@ -46,7 +46,12 @@ public class BussLibraryProduct13After implements TaskListener{
         //截止时间 流程描述 创建人
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");
-        String prcName = "企标制修订-产品标准";
+        String prcName = "";
+        if(StringUtils.isNotBlank(object.getString("standName"))){
+            prcName = object.getString("standName") + "-企标制修订-产品标准";
+        }else {
+            prcName = "企标制修订-产品标准";
+        }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct14After.java

@@ -33,7 +33,12 @@ public class BussLibraryProduct14After implements TaskListener{
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
 
-        String prcName = "企标制修订-产品标准";
+        String prcName = "";
+        if(StringUtils.isNotBlank(object.getString("standName"))){
+            prcName = object.getString("standName") + "-企标制修订-产品标准";
+        }else {
+            prcName = "企标制修订-产品标准";
+        }
         BussUtils.endFunc2(delegateTask, prcName,busBean, object, "0", busProcessNameService);
     }
 

src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct2After.java

@@ -62,7 +62,12 @@ public class BussLibraryProduct2After implements TaskListener{
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
         String standName = "";
-        String prcName = "企标制修订-产品标准";
+        String prcName = "";
+        if(StringUtils.isNotBlank(object.getString("standName"))){
+            prcName = object.getString("standName") + "-企标制修订-产品标准";
+        }else {
+            prcName = "企标制修订-产品标准";
+        }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct3After.java

@@ -53,7 +53,12 @@ public class BussLibraryProduct3After implements TaskListener{
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
         String standName = "";
-        String prcName = "企标制修订-产品标准";
+        String prcName = "";
+        if(StringUtils.isNotBlank(object.getString("standName"))){
+            prcName = object.getString("standName") + "-企标制修订-产品标准";
+        }else {
+            prcName = "企标制修订-产品标准";
+        }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct4After.java

@@ -41,7 +41,12 @@ public class BussLibraryProduct4After implements TaskListener{
         String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString();
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");
-        String prcName = "企标制修订-产品标准";
+        String prcName = "";
+        if(StringUtils.isNotBlank(object.getString("standName"))){
+            prcName = object.getString("standName") + "-企标制修订-产品标准";
+        }else {
+            prcName = "企标制修订-产品标准";
+        }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct5After.java

@@ -56,7 +56,12 @@ public class BussLibraryProduct5After implements TaskListener{
         //截止时间 流程描述 创建人
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");
-        String prcName = "企标制修订-产品标准";
+        String prcName = "";
+        if(StringUtils.isNotBlank(object.getString("standName"))){
+            prcName = object.getString("standName") + "-企标制修订-产品标准";
+        }else {
+            prcName = "企标制修订-产品标准";
+        }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct6After.java

@@ -46,7 +46,12 @@ public class BussLibraryProduct6After implements TaskListener{
         //截止时间 流程描述 创建人
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");
-        String prcName = "企标制修订-产品标准";
+        String prcName = "";
+        if(StringUtils.isNotBlank(object.getString("standName"))){
+            prcName = object.getString("standName") + "-企标制修订-产品标准";
+        }else {
+            prcName = "企标制修订-产品标准";
+        }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct7After.java

@@ -8,6 +8,7 @@ import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
 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.listener.bussLibrary.BussUtils;
 import com.ydw.bat.wkflow.util.SpringContextUtil;
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
@@ -15,6 +16,7 @@ import org.activiti.engine.delegate.TaskListener;
 import org.apache.commons.lang.StringUtils;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -34,19 +36,16 @@ public class BussLibraryProduct7After implements TaskListener{
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
 
-        List<String> nextUserList = new ArrayList();
-
-        if(StringUtils.isNotBlank(object.getString("bussUser8"))){
-            delegateTask.setVariable("bussUser8",object.getString("bussUser8"));
-            nextUserList.add(object.getString("bussUser8"));
-        }else {
-            throw new ActivitiException("1#2总院项目总工/各事业部整车所产品经理不存在,请配置相关人员");
-        }
-
         //截止时间 流程描述 创建人
+        String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString();
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");
-        String prcName = "企标制修订-产品标准";
+        String prcName = "";
+        if(StringUtils.isNotBlank(object.getString("standName"))){
+            prcName = object.getString("standName") + "-企标制修订-产品标准";
+        }else {
+            prcName = "企标制修订-产品标准";
+        }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -59,31 +58,46 @@ public class BussLibraryProduct7After implements TaskListener{
             busProcessNameService.saveOrUpdate(one1);
         }
 
-        // 存储当前节点意见
+        List<String> nextUserList = new ArrayList();
-        BusProcessNew busProcessNew = new BusProcessNew();
-        busProcessNew.setMsgType("clause");
-        busProcessNew.setPId(delegateTask.getProcessInstanceId());
-        busProcessNew.setMesg(object.toJSONString());
-        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
-        busProcessNew.setTaskId(delegateTask.getId());
-        busProcessNew.setCommitText(object.getString("commentText"));
-        busProcessNew.setFinishFlag("0");
-        busProcessNew.setTaskInfo(delegateTask.getName());
-        busBean.save(busProcessNew);
 
-        if(nextUserList != null && !nextUserList.isEmpty()){
+        if(StringUtils.isNotBlank(approvalOpinion)){
-            for(String nextUser : nextUserList){
+            if ("0".equalsIgnoreCase(approvalOpinion)) {
-                BusProcessNew busProcessNewNext = new BusProcessNew();
+                if(StringUtils.isNotBlank(object.getString("bussUser8"))){
-                busProcessNewNext.setMsgType("clause");
+
-                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+                    if(object.getString("bussUser8").contains(",")){
-                busProcessNewNext.setMesg(object.toJSONString());
+                        nextUserList = Arrays.asList(object.getString("bussUser8").split(","));
-                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
+                    }else {
-                busProcessNewNext.setFinishFlag("0");
+                        nextUserList.add(object.getString("bussUser8"));
-                busProcessNewNext.setTaskInfo(delegateTask.getName());
+                    }
-                busProcessNewNext.setUserId(nextUser);
+
-                busProcessNewNext.setPrcName(prcName);
+                    BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
-                busBean.save(busProcessNewNext);
+                    delegateTask.setVariable("bussUser8",object.getString("bussUser8"));
+                    delegateTask.setVariable("bussP7Flag", 0);
+                }else {
+                    throw new ActivitiException("1#2总院标准法规部产品标准工程师/各事业部标准法规部参数不存在,请配置相关用户");
+                }
+            } else {
+                if(StringUtils.isNotBlank(object.getString("bussUser6"))) {
+                    BusProcessNew busProcessNew = new BusProcessNew();
+                    busProcessNew.setMsgType("clause");
+                    busProcessNew.setPId(delegateTask.getProcessInstanceId());
+                    busProcessNew.setMesg(object.toJSONString());
+                    busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+                    busProcessNew.setFinishFlag("0");
+                    busProcessNew.setTaskInfo(delegateTask.getName());
+                    busProcessNew.setUserId(object.getString("bussUser6"));
+                    busProcessNew.setPrcName(prcName);
+                    busBean.save(busProcessNew);
+
+                    BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1");
+                    delegateTask.setVariable("bussUserC6",object.getString("bussUser6"));
+                    delegateTask.setVariable("bussP7Flag", 1);
+                }else {
+                    throw new ActivitiException("1#2意见汇总及标准修改参数不存在,请配置相关用户");
+                }
             }
+        }else {
+            throw new ActivitiException("1#2 提交OR驳回参数不存在");
         }
     }
 

src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct8After.java

@@ -41,7 +41,12 @@ public class BussLibraryProduct8After implements TaskListener{
         String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString();
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");
-        String prcName = "企标制修订-产品标准";
+        String prcName = "";
+        if(StringUtils.isNotBlank(object.getString("standName"))){
+            prcName = object.getString("standName") + "-企标制修订-产品标准";
+        }else {
+            prcName = "企标制修订-产品标准";
+        }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct9After.java

@@ -41,7 +41,12 @@ public class BussLibraryProduct9After implements TaskListener{
         String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString();
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");
-        String prcName = "企标制修订-产品标准";
+        String prcName = "";
+        if(StringUtils.isNotBlank(object.getString("standName"))){
+            prcName = object.getString("standName") + "-企标制修订-产品标准";
+        }else {
+            prcName = "企标制修订-产品标准";
+        }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProductC3After.java

@@ -53,7 +53,12 @@ public class BussLibraryProductC3After implements TaskListener{
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
         String standName = "";
-        String prcName = "企标制修订-产品标准";
+        String prcName = "";
+        if(StringUtils.isNotBlank(object.getString("standName"))){
+            prcName = object.getString("standName") + "-企标制修订-产品标准";
+        }else {
+            prcName = "企标制修订-产品标准";
+        }
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java

@@ -124,10 +124,19 @@ public class DeptApplayAfter implements TaskListener{
             lawsUserInfoService.sarStandItemsSaveBatch(sarStandItems);
             lawsUserInfoService.SarInterpretationNationalStandardSaveBatch(standards);
             prcName=prcName+"-流程结束";
+            if (null==delegateTask.getVariable("lastCount")){
+                delegateTask.setVariable("lastCount",1);
+            }else {
+                delegateTask.setVariable("lastCount",delegateTask.getVariable("lastCount",Integer.class)+1);
+            }
         } else {
             delegateTask.setVariable("bzFlag", 2);
             prcName=prcName+"-填写解读分析";
         }
+
+
+
+
         //截止时间 流程描述 创建人
         String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         String user = object.getString("applyUserId");
@@ -137,7 +146,7 @@ public class DeptApplayAfter implements TaskListener{
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
-            if (!object.getString("gcApplyFlag").equals("1")) {
+            if (delegateTask.getVariable("lastCount",Integer.class)>=delegateTask.getVariable("zxUserList",List.class).size()) {
                 one1.setOverTime(OVERTIME);
             }
             one1.setPrcType("9");

src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java

@@ -50,6 +50,7 @@ public class DeptZrAfter implements TaskListener{
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("id",str);
             jsonObject.put("applyUserId",delegateTask.getAssignee());
+            jsonObject.put("KEYS",str+delegateTask.getAssignee());
             responUserList.add(jsonObject);
         }
         delegateTask.setVariable("zxUserList",responUserList);
@@ -73,7 +74,6 @@ public class DeptZrAfter implements TaskListener{
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
-//            one1.setOverTime(OVERTIME);
             one1.setPrcType("9");
             one1.setPrcName(prcName);
             one1.setCreatUser(user);
@@ -97,23 +97,9 @@ public class DeptZrAfter implements TaskListener{
         busBean.update(busProcessNew,updataWapper);
         if(nextUserList != null && !nextUserList.isEmpty()){
             for(String nextUser : nextUserList){ //2次
-//                if (null==delegateTask.getVariable("maps")){
-//                    Map<String,String> stringMap=new HashMap<>();
-//                    String as= String.valueOf(UUID.randomUUID());
-//                    stringMap.put(nextUser,as);
-//                    delegateTask.setVariable("maps",stringMap);
-//                    object.put("wkKey",as);
-//                }
-//                else if (null!=delegateTask.getVariable("maps",Map.class).get(nextUser)){
-//                    String as= String.valueOf(UUID.randomUUID());
-//                    object.put("wkKey",as);
-//                }else {
-//                    String as= String.valueOf(UUID.randomUUID());
-//                    object.put("wkKey",as);
-//                    delegateTask.getVariable("maps",Map.class).put(nextUser,as);
-//                }
                 List<JSONArrayVo> listRes = userGroupMap.get(nextUser);
                 object.put("itemList", JSON.toJSONString(listRes));
+                object.put("AOLIGEI",nextUser+delegateTask.getAssignee());
                 BusProcessNew busProcessNewNext = new BusProcessNew();
                 busProcessNewNext.setMsgType("clause");
                 busProcessNewNext.setPId(delegateTask.getProcessInstanceId());

src/main/java/com/ydw/bat/wkflow/listener/standardRead/ExpainAfter.java

@@ -81,16 +81,18 @@ public class ExpainAfter implements TaskListener{
         if(responUserList != null){
             for (Object obj:responUserList) {
                 JSONObject object1 = (JSONObject)obj;
-                BusProcessNew busProcessNewNext = new BusProcessNew();
+                if (object.getString("AOLIGEI").equals(object1.getString("KEYS"))) {
-                busProcessNewNext.setMsgType("clause");
+                    BusProcessNew busProcessNewNext = new BusProcessNew();
-                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+                    busProcessNewNext.setMsgType("clause");
-                busProcessNewNext.setMesg(object.toJSONString());
+                    busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
-                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
+                    busProcessNewNext.setMesg(object.toJSONString());
-                busProcessNewNext.setFinishFlag("0");
+                    busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
-                busProcessNewNext.setTaskInfo(delegateTask.getName());
+                    busProcessNewNext.setFinishFlag("0");
-                busProcessNewNext.setPrcName(prcName);
+                    busProcessNewNext.setTaskInfo(delegateTask.getName());
-                busProcessNewNext.setUserId(object1.getString("applyUserId"));
+                    busProcessNewNext.setPrcName(prcName);
-                busBean.save(busProcessNewNext);
+                    busProcessNewNext.setUserId(object1.getString("applyUserId"));
+                    busBean.save(busProcessNewNext);
+                }
             }
         }
     }

src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java

@@ -79,7 +79,6 @@ public class ResolveAfter implements TaskListener{
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
-//            one1.setOverTime(OVERTIME);
             one1.setPrcType("9");
             one1.setPrcName(prcName);
             one1.setCreatUser(user);
@@ -87,16 +86,16 @@ public class ResolveAfter implements TaskListener{
             busProcessNameService.saveOrUpdate(one1);
         }
 //        // 存储当前节点意见
-//        BusProcessNew busProcessNew = new BusProcessNew();
+        BusProcessNew busProcessNew = new BusProcessNew();
-//        busProcessNew.setMsgType("clause");
+        busProcessNew.setMsgType("clause");
-//        busProcessNew.setPId(delegateTask.getProcessInstanceId());
+        busProcessNew.setPId(delegateTask.getProcessInstanceId());
-//        busProcessNew.setMesg(object.toJSONString());
+        busProcessNew.setMesg(object.toJSONString());
-//        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
-//        busProcessNew.setTaskId(delegateTask.getId());
+        busProcessNew.setTaskId(delegateTask.getId());
-//        busProcessNew.setCommitText(object.getString("commentText"));
+        busProcessNew.setCommitText(object.getString("commentText"));
-//        busProcessNew.setFinishFlag("0");
+        busProcessNew.setFinishFlag("0");
-//        busProcessNew.setTaskInfo(delegateTask.getName());
+        busProcessNew.setTaskInfo(delegateTask.getName());
-//        busBean.save(busProcessNew);
+        busBean.save(busProcessNew);
         if(nextUserList != null && !nextUserList.isEmpty()){
             for(String nextUser : nextUserList){ //2次
                 List<JSONArrayVo> listRes = userGroupMap.get(nextUser);