From e1037c73f17d744f40ba4cd8ae22b82951df4ce5 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Wed, 17 Nov 2021 10:36:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=BF=E7=AD=96=E9=87=8D=E7=82=B9=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E4=BA=8B=E4=B8=9A=E9=83=A8=20=E9=A3=8E=E9=99=A9?=
 =?UTF-8?q?=E9=A1=B9=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PolicyWorkFlowController.java         |  2 +-
 .../da/workFlow/service/PolicyWorkFlowService.java   | 12 ++++++++----
 .../entity/BusinessDeptIssue.java                    |  4 ++++
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/PolicyWorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/PolicyWorkFlowController.java
index 4b39a04b..f961bf6a 100644
--- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/PolicyWorkFlowController.java
+++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/PolicyWorkFlowController.java
@@ -56,7 +56,7 @@ public class PolicyWorkFlowController {
     private PolicyWorkFlowService policyWorkFlowService;
 
     /**
-     * 政策征求意见导出
+     * 纳入重点问题管控
      */
     @PostMapping("/enterIssue")
     @ApiOperation("纳入重点问题管控")
diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/PolicyWorkFlowService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/PolicyWorkFlowService.java
index e5db9b02..410ec242 100644
--- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/PolicyWorkFlowService.java
+++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/PolicyWorkFlowService.java
@@ -21,9 +21,11 @@ public class PolicyWorkFlowService  {
     public boolean enterIssue(String json){
         boolean count=false; //是否成功
         JSONObject dataJsonObj = JSONObject.parseObject(json);
+        JSONObject jsonData = dataJsonObj.getJSONObject("json");
 
-        if ("1".equals(dataJsonObj.getString("department"))) {
-            JSONArray dataList = dataJsonObj.getJSONArray("dataList");
+
+        if ("1".equals(  jsonData.getString("feedbackDept"))) {
+            JSONArray dataList = jsonData.getJSONArray("infoTableDatas");
 
             /**
              * 把json对象转换未实体对象
@@ -31,11 +33,13 @@ public class PolicyWorkFlowService  {
             List<BusinessDeptIssue> data = dataList
                     .stream()
                     .map(jsonObj -> {
-
                         BusinessDeptIssue businessDeptIssue = JSONObject.parseObject(jsonObj.toString(), BusinessDeptIssue.class);
                         businessDeptIssue.setId(UUIDUtils.randomUUID20());
                         return businessDeptIssue;
-                    }).collect(Collectors.toList());
+                    }).collect(Collectors.toList())
+                    .stream()
+                    .filter(item->"1".equals(item.getIsRisk()))
+                    .collect(Collectors.toList());
             count=businessDeptIssueService.saveBatch(data);
 
         }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/BusinessDeptIssue.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/BusinessDeptIssue.java
index de432cda..905cb9ee 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/BusinessDeptIssue.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/BusinessDeptIssue.java
@@ -85,6 +85,10 @@ public class BusinessDeptIssue {
   @TableField("is_close")
   private String isClose;
 
+  @ExcelIgnore
+  @TableField("is_risk")
+  private String isRisk;
+
   @ExcelIgnore
   @TableField(exist = false)
   private Integer page;