From afb90aaaaf4beef4b8cc811b2308608a94065dfe Mon Sep 17 00:00:00 2001
From: lichao <326994889@qq.com>
Date: Thu, 7 Sep 2023 10:12:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E7=9B=B8=E5=85=B3=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../issue/controller/IssueController.java     | 27 ++++++++++++++++++-
 .../esua/epdc/modules/issue/dao/IssueDao.java |  3 +++
 .../modules/issue/service/IssueService.java   |  2 ++
 .../issue/service/impl/IssueServiceImpl.java  | 13 +++++++++
 .../main/resources/mapper/issue/IssueDao.xml  | 26 ++++++++++++++++++
 5 files changed, 70 insertions(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueController.java
index 81499574..2e415261 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueController.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/controller/IssueController.java
@@ -213,4 +213,29 @@ public class IssueController {
         return issueService.modifyCommentById(eventDeleteCommentsFormDTO.getCommentIds());
     }
 
-}
+    /**
+     * @Description: 锦水大屏事件列表
+     * @param params:
+     * @Return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < com.elink.esua.epdc.dto.issue.IssueWaitHandleOrClosedDTO>>
+     * @Author: lichao
+     * @Date: 2023/9/6 15:06
+     */
+    @GetMapping("screenJinShui/page")
+    public Result<PageData<IssueWaitHandleOrClosedDTO>> screenJinShuiList(@RequestParam Map<String, Object> params){
+        PageData<IssueWaitHandleOrClosedDTO> page = issueService.screenJinShuiList(params);
+        return new Result<PageData<IssueWaitHandleOrClosedDTO>>().ok(page);
+    }
+
+    /**
+     * @Description: 锦水大屏事件详情
+     * @param id:
+     * @Return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.issue.IssueContentDetailDTO>
+     * @Author: lichao
+     * @Date: 2023/9/6 15:06
+     */
+    @GetMapping("screenJinShui/issueContentDetail/{id}")
+    public Result<IssueContentDetailDTO> screenJinIssueContentDetail(@PathVariable("id") String id) {
+        IssueContentDetailDTO data = issueService.getIssueContentDetail(id);
+        return new Result<IssueContentDetailDTO>().ok(data);
+    }
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java
index 5dac83a9..9cb56cb9 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/dao/IssueDao.java
@@ -50,6 +50,9 @@ public interface IssueDao extends BaseDao<IssueEntity> {
      */
     List<IssueWaitHandleOrClosedDTO> selectListOfIssueWaitHandleOrClosed(Map<String, Object> params);
 
+
+    List<IssueWaitHandleOrClosedDTO> screenList(Map<String, Object> params);
+
     /**
      * 议题待处理列表详情
      * @Params: [id]
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java
index 586b60bb..44cc6e99 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/IssueService.java
@@ -35,6 +35,7 @@ import com.elink.esua.epdc.modules.issue.entity.IssueEntity;
 import com.elink.esua.epdc.modules.rocketmq.dto.CategoryModifyDTO;
 import com.elink.esua.epdc.modules.rocketmq.dto.OrganizationModifyDTO;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 import java.util.Map;
@@ -306,4 +307,5 @@ public interface IssueService extends BaseService<IssueEntity> {
     List<EditProgressResultDTO> listEditIssueProgress(String issueId);
 
 
+    PageData<IssueWaitHandleOrClosedDTO> screenJinShuiList(Map<String, Object> params);
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java
index a9d38677..40f25339 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java
@@ -74,6 +74,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.*;
 
@@ -747,4 +748,16 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
     public List<EditProgressResultDTO> listEditIssueProgress(String issueId) {
         return baseDao.selectListEditIssueProgress(issueId);
     }
+
+    @Override
+    public PageData<IssueWaitHandleOrClosedDTO> screenJinShuiList( Map<String, Object> params) {
+
+
+        IPage<IssueWaitHandleOrClosedDTO> page = getPage(params);
+
+        List<IssueWaitHandleOrClosedDTO> list = baseDao.selectListOfIssueWaitHandleOrClosed(params);
+        return new PageData<>(list, page.getTotal());
+
+
+    }
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml
index 3e08cb1b..0fe0fd08 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml
@@ -54,6 +54,32 @@
             issue.CREATED_TIME DESC
     </select>
 
+
+
+    <select id="screenList" resultType="com.elink.esua.epdc.dto.issue.IssueWaitHandleOrClosedDTO">
+        SELECT
+        issue.ID,
+        issue.ISSUE_CONTENT AS issueContent,
+        e.CREATED_TIME AS createdTime,
+        e.NICK_NAME AS nickName,
+        e.APPROVE_NUM AS approveNum,
+        e.OPPOSE_NUM AS opposeNum,
+        e.BROWSE_NUM AS browseNum,
+        e.COMMENT_NUM AS commentNum,
+        ( e.APPROVE_NUM + e.OPPOSE_NUM + e.BROWSE_NUM + e.COMMENT_NUM ) AS participateNum,
+        ( e.APPROVE_NUM + e.OPPOSE_NUM + e.BROWSE_NUM + e.COMMENT_NUM ) AS participantsNum,
+        issue.ISSUE_CODE
+        FROM
+        epdc_issue issue
+        LEFT JOIN epdc_work_user_events u ON u.EVENT_ID = issue.EVENT_ID AND u.DEL_FLAG = '0'
+        LEFT JOIN epdc_events e ON issue.EVENT_ID = e.ID
+        AND e.DEL_FLAG = '0'
+        WHERE
+        issue.DEL_FLAG = '0'
+        ORDER BY
+        issue.CREATED_TIME DESC
+    </select>
+
     <resultMap id="waitHandleIssueDetailResultMap" type="com.elink.esua.epdc.dto.issue.IssueWaitHandleDetailDTO">
         <result property="id" column="id"/>
         <result property="nickName" column="NICK_NAME"/>