From 3ee15f1fc80a8fd073bfdd5f84481cb25f45d0a9 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Fri, 22 Jul 2022 14:21:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=9F=8E-=E4=BA=8B=E4=BB=B6=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=8F=8A=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/dto/events/EpdcEventsDTO.java   | 10 +++++
 .../controller/EpdcEventsController.java      | 27 ++++++++++++
 .../modules/events/dao/EpdcEventsDao.java     |  9 ++++
 .../modules/events/excel/UnEventsExcel.java   |  2 +
 .../events/service/EpdcEventsService.java     | 18 ++++++++
 .../service/impl/EpdcEventsServiceImpl.java   | 13 ++++++
 .../resources/mapper/events/EpdcEventsDao.xml | 44 +++++++++++++++++++
 7 files changed, 123 insertions(+)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDTO.java
index 13a104dbe..07f5f0787 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDTO.java
@@ -70,4 +70,14 @@ public class EpdcEventsDTO implements Serializable {
 	 */
 	private String categoryFullName;
 
+	/**
+	 * 事件状态 0-待审核，2-驳回，4-审核通过
+	 */
+	private Integer eventState;
+
+	/**
+	 * 状态全称
+	 */
+	private String eventStateName;
+
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java
index c11c14c5e..6e0670c96 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java
@@ -66,6 +66,20 @@ public class EpdcEventsController {
         return new Result<PageData<EpdcEventsDTO>>().ok(page);
     }
 
+    /**
+    * @describe: 创城页面事件
+    * @author wangtong
+    * @date 2022/7/22 13:50
+    * @params [params]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.events.EpdcEventsDTO>>
+    */
+    @GetMapping("pageCreateCity")
+    @DataFilter(tableAlias = "temp", deptId = "grid_id", prefix = "AND", isPendingCreator = false)
+    public Result<PageData<EpdcEventsDTO>> genCityPage(@RequestParam Map<String, Object> params) {
+        PageData<EpdcEventsDTO> page = epdcEventsService.listGenOfPendingReviewEvents(params);
+        return new Result<PageData<EpdcEventsDTO>>().ok(page);
+    }
+
     @GetMapping("{id}")
     public Result<EpdcEventsDetailDTO> get(@PathVariable("id") String id) {
         EpdcEventsDetailDTO data = epdcEventsService.getEvent(id);
@@ -204,6 +218,19 @@ public class EpdcEventsController {
         ExcelUtils.exportExcelToTarget(response, "待回应", list, UnEventsExcel.class);
     }
 
+    /**
+    * @describe: 创城-项目管理 -待回应
+    * @author wangtong
+    * @date 2022/7/22 14:02
+    * @params [params, response]
+    * @return void
+    */
+    @GetMapping("unexportCreateCity")
+    public void unexportCreateCity(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<EpdcEventsDTO> list= epdcEventsService.unGenEventList(params);
+        ExcelUtils.exportExcelToTarget(response, "待回应", list, UnEventsExcel.class);
+    }
+
     /***
      *  项目管理 -已驳回
      * @param params
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java
index 44c25e72e..5b9c925c8 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java
@@ -232,4 +232,13 @@ public interface EpdcEventsDao extends BaseDao<EpdcEventsEntity> {
      * @return void
      */
     void rejectEventsImgInfo(@Param("relationId") String relationId);
+
+    /**
+    * @describe: 创城-事件待审核列表
+    * @author wangtong
+    * @date 2022/7/22 13:51
+    * @params [params]
+    * @return java.util.List<com.elink.esua.epdc.dto.events.EpdcEventsDTO>
+    */
+    List<EpdcEventsDTO> selectListOfGenPendingReviewEvents(Map<String, Object> params);
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/excel/UnEventsExcel.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/excel/UnEventsExcel.java
index a4b5a8028..e813f5b98 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/excel/UnEventsExcel.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/excel/UnEventsExcel.java
@@ -22,5 +22,7 @@ public class UnEventsExcel {
     private String nickName;
     @Excel(name = "所属网格")
     private String allDeptNames;
+    @Excel(name = "状态")
+    private String eventStateName;
 
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java
index c3f2d6bb1..482fa3528 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java
@@ -305,4 +305,22 @@ public interface EpdcEventsService extends BaseService<EpdcEventsEntity> {
      * @date 2020-11
      */
     List<EpdcRejectEventsDTO> rejectEventsExportList(Map<String, Object> params);
+
+    /**
+    * @describe: 创城-事件待审核列表
+    * @author wangtong
+    * @date 2022/7/22 13:51
+    * @params [params]
+    * @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.events.EpdcEventsDTO>
+    */
+    PageData<EpdcEventsDTO> listGenOfPendingReviewEvents(Map<String, Object> params);
+
+    /**
+    * @describe: 创城-议题管理 - 待回应 - 导出
+    * @author wangtong
+    * @date 2022/7/22 14:04
+    * @params [params]
+    * @return java.util.List<com.elink.esua.epdc.dto.events.EpdcEventsDTO>
+    */
+    List<EpdcEventsDTO> unGenEventList(Map<String, Object> params);
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
index fdb66bdf1..2af284711 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
@@ -145,6 +145,13 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
         return new PageData<>(list, page.getTotal());
     }
 
+    @Override
+    public PageData<EpdcEventsDTO> listGenOfPendingReviewEvents(Map<String, Object> params) {
+        IPage<EpdcEventsDTO> page = getPage(params);
+        List<EpdcEventsDTO> list = baseDao.selectListOfGenPendingReviewEvents(params);
+        return new PageData<>(list, page.getTotal());
+    }
+
     @Override
     public List<EpdcEventsDTO> list(Map<String, Object> params) {
         List<EpdcEventsEntity> entityList = baseDao.selectList(getWrapper(params));
@@ -158,6 +165,12 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
         return list;
     }
 
+    @Override
+    public List<EpdcEventsDTO> unGenEventList(Map<String, Object> params) {
+        List<EpdcEventsDTO> list = baseDao.selectListOfGenPendingReviewEvents(params);
+        return list;
+    }
+
     private QueryWrapper<EpdcEventsEntity> getWrapper(Map<String, Object> params) {
         String id = (String) params.get(FieldConstant.ID_HUMP);
         String issueCategoryId = (String) params.get("issueCategoryId");
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml
index 497d79cb3..60b764fbf 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml
@@ -413,5 +413,49 @@
         UPDATE epdc_img SET DEL_FLAG = 1,UPDATED_TIME=NOW()
         where REFERENCE_ID=#{relationId}
     </update>
+    <select id="selectListOfGenPendingReviewEvents" resultType="com.elink.esua.epdc.dto.events.EpdcEventsDTO">
+
+        SELECT
+        temp.id,
+        temp.nick_Name AS nickName,
+        temp.event_content AS eventContent,
+        temp.CREATED_TIME AS createdTime,
+        temp.ALL_DEPT_NAMES as allDeptNames,
+        EVENT_STATE,
+        case EVENT_STATE
+        when 0 then '待审核'
+        when 2 then '驳回'
+        when 4 then '审核通过'
+        else ''
+        end as eventStateName
+        FROM
+        epdc_events temp
+        WHERE
+        temp.DEL_FLAG = '0'
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            AND DATE_FORMAT( temp.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
+        </if>
+        <if test="eventContent != null and eventContent != ''">
+            AND  temp.event_content like '%${eventContent}%'
+        </if>
+        <if test="nickName != null and nickName != '' ">
+            AND temp.nick_Name like '%${nickName}%'
+        </if>
+        <if test="gridId != null and gridId != ''">
+            AND (temp.GRID_ID = #{gridId}
+            OR find_in_set(#{gridId},temp.ALL_DEPT_IDS))
+        </if>
+        <if test="streetId != null and streetId != ''">
+            AND (find_in_set(#{streetId},temp.PARENT_DEPT_IDS)
+            OR find_in_set(#{streetId},temp.ALL_DEPT_IDS))
+        </if>
+        <if test="communityId != null and communityId != ''">
+            AND (find_in_set(#{communityId},temp.PARENT_DEPT_IDS)
+            OR find_in_set(#{communityId},temp.ALL_DEPT_IDS))
+        </if>
+        AND temp.EVENT_STATE = 0
+        AND temp.IS_CREATE_CITY='1'
+        ORDER BY temp.CREATED_TIME DESC
+    </select>
 
 </mapper>