政策 意见流程修改

src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DirectorAfter.java

@@ -52,7 +52,17 @@ public class DirectorAfter implements TaskListener {
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
         String standName = "";
-        String prcName = "政策征求意见流程";
+        Object lawsName = object.get("lawsName");
+        Object lawsNumber = object.get("lawsNumber");
+        String lawsInfoName = "";
+        if(lawsName != null && lawsNumber != null){
+            String name = lawsName.toString()+"-";
+            String number = lawsNumber.toString()+"-";
+            if(StringUtils.isNotBlank(name) && StringUtils.isNotBlank(number)){
+                lawsInfoName =  number+name;
+            }
+        }
+        String prcName = lawsInfoName+"政策征求意见流程";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DistributionAfter.java

@@ -66,7 +66,17 @@ public class DistributionAfter implements TaskListener {
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
         String standName = "";
-        String prcName = "政策征求意见流程";
+        Object lawsName = object.get("lawsName");
+        Object lawsNumber = object.get("lawsNumber");
+        String lawsInfoName = "";
+        if(lawsName != null && lawsNumber != null){
+            String name = lawsName.toString()+"-";
+            String number = lawsNumber.toString()+"-";
+            if(StringUtils.isNotBlank(name) && StringUtils.isNotBlank(number)){
+                lawsInfoName =  number+name;
+            }
+        }
+        String prcName = lawsInfoName+"政策征求意见流程";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DockerReviewAfter.java

@@ -57,7 +57,17 @@ public class DockerReviewAfter implements TaskListener {
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
         String standName = "";
-        String prcName = "政策征求意见流程";
+        Object lawsName = object.get("lawsName");
+        Object lawsNumber = object.get("lawsNumber");
+        String lawsInfoName = "";
+        if(lawsName != null && lawsNumber != null){
+            String name = lawsName.toString()+"-";
+            String number = lawsNumber.toString()+"-";
+            if(StringUtils.isNotBlank(name) && StringUtils.isNotBlank(number)){
+                lawsInfoName =  number+name;
+            }
+        }
+        String prcName = lawsInfoName+"政策征求意见流程";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerReviewAfter.java

@@ -44,7 +44,17 @@ public class EngineerReviewAfter implements TaskListener {
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
         String standName = "";
-        String prcName = "政策征求意见流程";
+        Object lawsName = object.get("lawsName");
+        Object lawsNumber = object.get("lawsNumber");
+        String lawsInfoName = "";
+        if(lawsName != null && lawsNumber != null){
+            String name = lawsName.toString()+"-";
+            String number = lawsNumber.toString()+"-";
+            if(StringUtils.isNotBlank(name) && StringUtils.isNotBlank(number)){
+                lawsInfoName =  number+name;
+            }
+        }
+        String prcName = lawsInfoName+"政策征求意见流程";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerRevisionAfter.java

@@ -52,7 +52,17 @@ public class EngineerRevisionAfter implements TaskListener {
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
         String standName = "";
-        String prcName = "政策征求意见流程";
+        Object lawsName = object.get("lawsName");
+        Object lawsNumber = object.get("lawsNumber");
+        String lawsInfoName = "";
+        if(lawsName != null && lawsNumber != null){
+            String name = lawsName.toString()+"-";
+            String number = lawsNumber.toString()+"-";
+            if(StringUtils.isNotBlank(name) && StringUtils.isNotBlank(number)){
+                lawsInfoName =  number+name;
+            }
+        }
+        String prcName = lawsInfoName+"政策征求意见流程";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/FillCommentAfter.java

@@ -51,7 +51,17 @@ public class FillCommentAfter implements TaskListener {
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
         String standName = "";
-        String prcName = "政策征求意见流程";
+        Object lawsName = object.get("lawsName");
+        Object lawsNumber = object.get("lawsNumber");
+        String lawsInfoName = "";
+        if(lawsName != null && lawsNumber != null){
+            String name = lawsName.toString()+"-";
+            String number = lawsNumber.toString()+"-";
+            if(StringUtils.isNotBlank(name) && StringUtils.isNotBlank(number)){
+                lawsInfoName =  number+name;
+            }
+        }
+        String prcName = lawsInfoName+"政策征求意见流程";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/LaunchAfter.java

@@ -49,7 +49,17 @@ public class LaunchAfter implements TaskListener {
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
         String standName = "";
-        String prcName = "政策征求意见流程";
+        Object lawsName = object.get("lawsName");
+        Object lawsNumber = object.get("lawsNumber");
+        String lawsInfoName = "";
+        if(lawsName != null && lawsNumber != null){
+            String name = lawsName.toString()+"-";
+            String number = lawsNumber.toString()+"-";
+            if(StringUtils.isNotBlank(name) && StringUtils.isNotBlank(number)){
+                lawsInfoName =  number+name;
+            }
+        }
+        String prcName = lawsInfoName+"政策征求意见流程";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/MinisterReviewAfter.java

@@ -46,7 +46,17 @@ public class MinisterReviewAfter implements TaskListener {
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
         String standName = "";
-        String prcName = "政策征求意见流程";
+        Object lawsName = object.get("lawsName");
+        Object lawsNumber = object.get("lawsNumber");
+        String lawsInfoName = "";
+        if(lawsName != null && lawsNumber != null){
+            String name = lawsName.toString()+"-";
+            String number = lawsNumber.toString()+"-";
+            if(StringUtils.isNotBlank(name) && StringUtils.isNotBlank(number)){
+                lawsInfoName =  number+name;
+            }
+        }
+        String prcName = lawsInfoName+"政策征求意见流程";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);

src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/ViceDirectorAfter.java

@@ -35,6 +35,20 @@ public class ViceDirectorAfter implements TaskListener {
         Datas datas = datasService.getOne(queryWrapper);
 
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
+        String lawsProveEngineerId2 = object.getString("lawsProveEngineerId");
+        if(StringUtils.isBlank(lawsProveEngineerId2)){
+            QueryWrapper<BusProcessNew> queryWrapperPid = new QueryWrapper<>();
+            queryWrapperPid.eq("P_ID", delegateTask.getProcessInstanceId());
+            queryWrapperPid.like("PRC_NAME", "政策征求意见流程");
+            List<BusProcessNew> list = busBean.list(queryWrapperPid);
+            if(!list.isEmpty()) {
+                JSONObject jsonObject = JSONObject.parseObject(list.get(0).getMesg());
+                jsonObject.put("commentText","");
+                jsonObject.put("actionFlag","1");
+                lawsProveEngineerId2 = jsonObject.get("lawsProveEngineerId").toString();
+                object = jsonObject;
+            }
+        }
         delegateTask.setVariable("objectJson",object);
 
         List<String> nextUserList = new ArrayList();
@@ -45,7 +59,17 @@ public class ViceDirectorAfter implements TaskListener {
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
         String standName = "";
-        String prcName = "政策征求意见流程";
+        Object lawsName = object.get("lawsName");
+        Object lawsNumber = object.get("lawsNumber");
+        String lawsInfoName = "";
+        if(lawsName != null && lawsNumber != null){
+            String name = lawsName.toString()+"-";
+            String number = lawsNumber.toString()+"-";
+            if(StringUtils.isNotBlank(name) && StringUtils.isNotBlank(number)){
+                lawsInfoName =  number+name;
+            }
+        }
+        String prcName = lawsInfoName+"政策征求意见流程";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -60,7 +84,7 @@ public class ViceDirectorAfter implements TaskListener {
 
         if(StringUtils.isNotBlank(object.getString("actionFlag"))){
             String lawsProveChief = object.getString("lawsProveChiefId");
-            String lawsProveEngineerId2 = object.getString("lawsProveEngineerId");
+            //String lawsProveEngineerId2 = object.getString("lawsProveEngineerId");
 
             if ("0".equalsIgnoreCase(object.getString("actionFlag"))) {