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

src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java

@@ -103,7 +103,7 @@ public interface LawsUserInfoService {
     @PostMapping("slrs/sar-public-idea/addSarPublicIdea")
     public com.ydw.bat.wkflow.util.http.ResponseMessage addSarPublicIdea(@RequestBody SarPublicIdea sarPublicIdea);
 
-    @PostMapping("slrs/sar-public-idea-all/saveBatch")
+    @PostMapping("slrs/sar-public-idea-all/saveBatchByWk")
     public com.ydw.bat.wkflow.util.http.ResponseMessage savePublicIdeaBatch(@RequestBody List<SarPublicIdeaAll> sarPublicIdea);
 
 

src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarPublicIdeaAll.java

@@ -72,4 +72,7 @@ public class SarPublicIdeaAll  {
     @TableField("state")
     private String state;
 
+    @TableField("cause")
+    private String cause;
+
 }

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step10After.java

@@ -51,7 +51,11 @@ public class Step10After implements TaskListener {
                     JSONObject object1=JSONObject.parseObject(o.toString());
                     if ("1".equals(object1.getString("state")) || "2".equals(object1.getString("state"))) {
                         SarPublicIdeaAll sarPublicIdeaAll = new SarPublicIdeaAll();
-                        sarPublicIdeaAll.setId(String.valueOf(UUID.randomUUID()));
+                        if (null!=object1.get("id")){
+                            sarPublicIdeaAll.setId(object1.getString("id"));
+                        }else {
+                            sarPublicIdeaAll.setId(String.valueOf(UUID.randomUUID()));
+                        }
                         sarPublicIdeaAll.setChapterName(object1.getString("chapterName"));
                         sarPublicIdeaAll.setOldText(object1.getString("oldText"));
                         sarPublicIdeaAll.setNewText(object1.getString("newText"));
@@ -61,9 +65,12 @@ public class Step10After implements TaskListener {
                         sarPublicIdeaAll.setCid(object.getString("cid"));
                         sarPublicIdeaAll.setUserName(object1.getString("responUserName"));
                         sarPublicIdeaAll.setUserId(object1.getString("responUser"));
-                        sarPublicIdeaAll.setWkFlag("1");
+                        if ("1".equals(object1.getString("source"))) {
+                            sarPublicIdeaAll.setWkFlag("1");
+                        }
                         sarPublicIdeaAll.setIdeaId(delegateTask.getVariable("YJID", String.class));
                         sarPublicIdeaAll.setState(object1.getString("state"));
+                        sarPublicIdeaAll.setCause(object1.getString("cause"));
                         sarPublicIdeaAlls.add(sarPublicIdeaAll);
                     }
                 });

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step7After.java

@@ -45,6 +45,14 @@ public class Step7After implements TaskListener {
             delegateTask.setVariable("hqCount",delegateTask.getVariable("hqCount",Integer.class)+1);
         }
 
+        if (null==delegateTask.getVariable("user7")){
+            List<String> user=new ArrayList<>();
+            user.add(object.getString("user7"));
+            delegateTask.setVariable("user7",user);
+        }else {
+            if (!delegateTask.getVariable("user7",List.class).contains(object.getString("user7")))
+            delegateTask.getVariable("user7",List.class).add(object.getString("user7"));
+        }
         //整备数据
         if ("0".equals(object.getString("hqFlag"))) {
             delegateTask.setVariable("hqMark",delegateTask.getVariable("hqMark",Integer.class));
@@ -58,9 +66,9 @@ public class Step7After implements TaskListener {
         if (delegateTask.getVariable("hqCount",Integer.class)==delegateTask.getVariable("responUserList",List.class).size()) {
             if (0 == delegateTask.getVariable("hqMark", Integer.class)) {
                 prcName =delegateTask.getVariable("cid")+"-标准征求意见流程-部长+对接人审批";
-                List<String> strings=delegateTask.getVariable("zrUserIdList",List.class);
+                List<String> strings=delegateTask.getVariable("user7",List.class);
                 strings.forEach(s -> {
-                    if (!nextUserList.contains(s)){
+                    if (null!=s &&!nextUserList.contains(s)){
                         nextUserList.add(s);
                     }
                 });

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step8After.java

@@ -38,6 +38,9 @@ public class Step8After implements TaskListener {
 
         String prcName =delegateTask.getVariable("cid")+"-标准征求意见流程";
 
+        List<String> user1=new ArrayList<>();
+        delegateTask.setVariable("user7",user1);
+
         if (null==delegateTask.getVariable("bdCount")){
             delegateTask.setVariable("bdCount",1);
         }else {