公开征求意见流程 新需求实现

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

@@ -68,7 +68,7 @@ public class Step7After implements TaskListener {
                 prcName =delegateTask.getVariable("cid")+"-标准征求意见流程-部长+对接人审批";
                 List<String> strings=delegateTask.getVariable("user7",List.class);
                 strings.forEach(s -> {
-                    if (!nextUserList.contains(s)){
+                    if (null!=s &&!nextUserList.contains(s)){
                         nextUserList.add(s);
                     }
                 });