From d62d0aff6c14f59eaba2bb2583a20919eaa104f1 Mon Sep 17 00:00:00 2001
From: "396572590@qq.com" <liuchao>
Date: Fri, 29 Jul 2022 17:26:30 +0800
Subject: [PATCH] =?UTF-8?q?feat:=2056812=20=E6=96=B0=E5=A2=9E=E7=9A=84?=
 =?UTF-8?q?=EF=BC=8C=E8=B5=B0=E5=AE=8C=E6=B5=81=E7=A8=8B=E5=90=8E=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E6=98=BE=E7=A4=BA=E5=85=AC=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business_auth/LawsUserInfoService.java    |  3 ++
 .../Step10After.java                          | 30 ++++++++++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java
index f107dd14..26014398 100644
--- a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java
+++ b/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);
 
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step10After.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step10After.java
index 843037e8..ebd30f8f 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step10After.java
+++ b/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");