From 4a4c14c132f1ad48175485e375b93ab2cf5be437 Mon Sep 17 00:00:00 2001
From: lichao <326994889@qq.com>
Date: Thu, 21 Sep 2023 17:47:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/issue/IssueWaitHandleOrClosedDTO.java |  9 +++++++++
 .../issue/service/impl/IssueServiceImpl.java  |  4 ++++
 .../main/resources/mapper/issue/IssueDao.xml  | 20 ++++++++++++++++++-
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueWaitHandleOrClosedDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueWaitHandleOrClosedDTO.java
index a5293816..f8c246ae 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueWaitHandleOrClosedDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueWaitHandleOrClosedDTO.java
@@ -57,4 +57,13 @@ public class IssueWaitHandleOrClosedDTO implements Serializable {
      * 议题编号
      */
     private String issueCode;
+
+    /**
+     * 议题状态
+     */
+    private String issueStatus;
+
+    private String allDeptNames;
+
+    private String categoryName;
 }
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 c07a1dce..66712815 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
@@ -52,6 +52,7 @@ import com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO;
 import com.elink.esua.epdc.enums.ItemHandleCategoryEnum;
 import com.elink.esua.epdc.modules.async.IssueOverseeResultsTask;
 import com.elink.esua.epdc.modules.async.NewsTask;
+import com.elink.esua.epdc.modules.category.dao.CategoryDao;
 import com.elink.esua.epdc.modules.comment.service.EventCommentService;
 import com.elink.esua.epdc.modules.events.service.EpdcEventsService;
 import com.elink.esua.epdc.modules.events.service.ImgService;
@@ -120,6 +121,9 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
     @Autowired
     private AdminFeignClient adminFeignClient;
 
+    @Autowired
+    private CategoryDao categoryDao;
+
     @Override
     public PageData<IssueWaitHandleOrClosedDTO> listOfIssues(Map<String, Object> params) {
         UserDetail user = SecurityUser.getUser();
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 2005677b..c0838d7e 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
@@ -60,6 +60,8 @@
         SELECT
         issue.ID,
         issue.ISSUE_CONTENT AS issueContent,
+        issue.ALL_DEPT_NAMES as allDeptNames,
+        issue.CATEGORY_FULL_NAME as categoryName,
         e.CREATED_TIME AS createdTime,
         e.NICK_NAME AS nickName,
         e.APPROVE_NUM AS approveNum,
@@ -68,14 +70,30 @@
         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
+        issue.ISSUE_CODE,
+        if(issue.ISSUE_STATE = 0,'待处理',if(issue.ISSUE_STATE = 2,'已关闭',if(issue.ISSUE_STATE = 4,'已转项目',''))) as issueStatus
         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
+        <if test="category !=null and category != ''">
+            LEFT JOIN epdc_category ca ON ca.category_code = issue.FIRST_CATEGORY_CODE AND ca.pid = 0
+        </if>
         AND e.DEL_FLAG = '0'
         WHERE
         issue.DEL_FLAG = '0'
+        <if test="timeType == 'month'">
+        and STR_TO_DATE(issue.CREATED_TIME, '%Y-%m') BETWEEN STR_TO_DATE(#{startDate}, '%Y-%m') AND STR_TO_DATE(#{endDate}, '%Y-%m')
+        </if>
+        <if test="timeType == 'quarter'">
+            and   STR_TO_DATE(issue.CREATED_TIME, '%Y-%m') BETWEEN STR_TO_DATE(#{startDate}, '%Y-%m') AND STR_TO_DATE(#{endDate}, '%Y-%m')
+        </if>
+        <if test="timeType == 'year'">
+            and  YEAR(issue.CREATED_TIME) BETWEEN CAST(#{startDate} as SIGNED) AND CAST(#{endDate} as SIGNED)
+        </if>
+        <if test="category !=null and category != ''">
+            and ca.category_name = #{category}
+        </if>
         ORDER BY
         issue.CREATED_TIME DESC
     </select>