From 4083b24f3a0bf74f10fbfb7e0b1a78099e0e3e55 Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Mon, 21 Jun 2021 16:31:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E6=89=B9=E9=87=8F=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=20+=20=E5=A4=A7=E5=B1=8F=E8=A1=97=E9=81=93=E5=90=8D?=
 =?UTF-8?q?=E5=AD=97=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/screen/ScreenPublicDataDao.xml     |  2 +-
 .../esua/epdc/dto/GroupTopicCloseFormDTO.java |  8 ++++---
 .../service/impl/PartyTopicServiceImpl.java   | 21 ++++++++++++-------
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml
index 3322f3f3..a344c10c 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenPublicDataDao.xml
@@ -2860,7 +2860,7 @@ SELECT gr.id as orgId,
     <select id="publicpartitotaldataForStreetParty"
             resultType="com.elink.esua.epdc.dto.screen.result.PublicpartitotaldataResultDTO">
         SELECT st.id as orgId,
-				 st.name as orgName,
+                if( st.name = '锦水街道办事处','锦水街道',st.name) AS orgName,
 				 st.pid as parentId,
 				'agency' as orgType,
 				st.area_code as areaCode,
diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/GroupTopicCloseFormDTO.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/GroupTopicCloseFormDTO.java
index 5f297632..55b7bc6a 100644
--- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/GroupTopicCloseFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/GroupTopicCloseFormDTO.java
@@ -3,8 +3,10 @@ package com.elink.esua.epdc.dto;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @author songyunpeng
@@ -18,8 +20,8 @@ public class GroupTopicCloseFormDTO  implements Serializable {
     /**
      * 话题ID
      */
-    @NotBlank(message = "话题ID不能为空")
-    private String id;
+    @NotNull(message = "话题ID不能为空")
+    private List<String> id;
 
     /**
      * 关闭原因
@@ -28,4 +30,4 @@ public class GroupTopicCloseFormDTO  implements Serializable {
     @Size(min = 1, max = 50, message = "关闭原因不能为空且在50字以内")
     private String remark;
 
-}
\ No newline at end of file
+}
diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicServiceImpl.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicServiceImpl.java
index 17b84fc6..9875149e 100644
--- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicServiceImpl.java
@@ -62,7 +62,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.*;
 
 /**
- * 话题表 
+ * 话题表
  *
  * @author elink elink@elink-cn.com
  * @since v1.0.0 2020-05-29
@@ -150,11 +150,18 @@ public class PartyTopicServiceImpl extends BaseServiceImpl<PartyTopicDao, PartyT
 
     @Override
     public Result modifyTopicState(GroupTopicCloseFormDTO formDto) {
-        PartyTopicEntity entity = new PartyTopicEntity();
-        entity.setId(formDto.getId());
-        entity.setRemark(formDto.getRemark());
-        entity.setState(20);
-        updateById(entity);
+        if(formDto.getId().size() == 0){
+            return new Result().error("请选择关闭的话题");
+        }
+        List<PartyTopicEntity>  list = new ArrayList<>();
+        for (String id : formDto.getId()) {
+            PartyTopicEntity entity = new PartyTopicEntity();
+            entity.setId(id);
+            entity.setRemark(formDto.getRemark());
+            entity.setState(20);
+            list.add(entity);
+        }
+        updateBatchById(list);
         return new Result();
     }
 
@@ -410,4 +417,4 @@ public class PartyTopicServiceImpl extends BaseServiceImpl<PartyTopicDao, PartyT
         return entities;
     }
 
-}
\ No newline at end of file
+}