Merge branch 'develop' into FOTON

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

@@ -122,6 +122,9 @@ public interface LawsUserInfoService {
     @PostMapping("slrs/sar-public-idea/addSarPublicIdea")
     public com.ydw.bat.wkflow.util.http.ResponseMessage addSarPublicIdea(@RequestBody SarPublicIdea sarPublicIdea);
 
+    @GetMapping("slrs/sar-public-idea-all/getAllStandById")
+    public List<SarPublicIdeaAll> getAllStandById(@RequestParam("ideaId") String ideaId);
+
     @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/listener/StandardCommentNewProcess/Step10After.java

@@ -7,6 +7,7 @@ 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.ResponseMessage;
 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;
@@ -14,12 +15,14 @@ import com.ydw.bat.wkflow.business_slrs.dao.SarPublicIdeaAll;
 import com.ydw.bat.wkflow.util.SpringContextUtil;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.springframework.beans.BeanUtils;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 //新征求意见流程!!!!!
 public class Step10After implements TaskListener {
@@ -45,6 +48,17 @@ public class Step10After implements TaskListener {
             delegateTask.setVariable("presidentFlag","0");
             //加一个入库逻辑解决一些
             List<SarPublicIdeaAll> sarPublicIdeaAlls=new ArrayList<>();
+
+            /**
+             * 征求意见库添加的所有意见信息
+             * date 2022-07-29
+             */
+            List<SarPublicIdeaAll> sarPublicIdeaAlls1 = lawsUserInfoService.getAllStandById(delegateTask.getVariable("YJID", String.class));
+
+            /**
+             * 征求意见流程中添加的所有意见信息
+             * date 2022-07-29
+             */
             JSONArray jsonArray=JSONArray.parseArray(object.getString("info"));
             if (!jsonArray.isEmpty()){
                 jsonArray.forEach(o -> {
@@ -74,7 +88,21 @@ public class Step10After implements TaskListener {
                         sarPublicIdeaAlls.add(sarPublicIdeaAll);
                 });
             }
-            lawsUserInfoService.savePublicIdeaBatch(sarPublicIdeaAlls);
+            if(!sarPublicIdeaAlls1.isEmpty()){
+                List<SarPublicIdeaAll> collect = sarPublicIdeaAlls1.stream().map(publicIdeaAll -> {
+                    SarPublicIdeaAll standards1 = new SarPublicIdeaAll();
+                    standards1.setId(publicIdeaAll.getId());
+                    standards1.setState("1");
+                    standards1.setSourceType("公开");
+                    return standards1;
+                }).collect(Collectors.toList());
+                if(!collect.isEmpty()){
+                    sarPublicIdeaAlls.addAll(collect);
+                }
+            }
+            if(!sarPublicIdeaAlls.isEmpty()){
+                lawsUserInfoService.savePublicIdeaBatch(sarPublicIdeaAlls);
+            }
             prcName=delegateTask.getVariable("cid")+"-征求意见";
         }else {
             delegateTask.setVariable("presidentFlag","1");

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

@@ -36,7 +36,7 @@ public class Step6After implements TaskListener {
         delegateTask.setVariable("objectJson",object);
 
         List<String> nextUserList = new ArrayList();
-        String prcName = delegateTask.getVariable("cid")+"-标准征求意见流程-责任人会签";;
+        String prcName =delegateTask.getVariable("cid")+"-征求意见";
 
         //整备数据
         nextUserList.addAll(delegateTask.getVariable("Step6",List.class));

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

@@ -65,7 +65,7 @@ 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")+"-标准征求意见流程-部长+对接人审批";
+                prcName =delegateTask.getVariable("cid")+"-征求意见";
                 List<String> strings=delegateTask.getVariable("user7",List.class);
                 strings.forEach(s -> {
                     if (null!=s &&!nextUserList.contains(s)){