居民段政府端已关闭议题接口修改

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ClosedIssueListGovResultDTO.java

@@ -0,0 +1,37 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 政府端关闭议题列表属性
+ * @ClassName ClosedIssueListGovResultDTO
+ * @Auth wangc
+ * @Date 2020-05-18 10:33
+ */
+@Data
+public class ClosedIssueListGovResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3809252070982486401L;
+
+    /**
+     * 议题id
+     * */
+    private String issueId;
+
+    /**
+     * 议题标题
+     * */
+    private String issueTitle;
+
+    /**
+     * 议题关闭时间 时间戳
+     * */
+    private Long closedTime;
+
+    /**
+     * 解决方案
+     * */
+    private String closeReason;
+}

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java

@@ -126,7 +126,7 @@ public class IssueManageController {
     }
 
     /**
-     * @Description 获取关闭议题列表
+     * @Description 获取关闭议题列表 - 政府端
      * @param issueListFormDTO
      * @return Result<List<ClosedIssueListResultDTO>>
      * @author wangc
@@ -134,9 +134,9 @@ public class IssueManageController {
      **/
     @PostMapping(value = "closedlist")
     @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_CLOSED_LIST)
-    public Result<List<ClosedIssueListResultDTO>> closedList( @RequestBody CommonIssueListFormDTO issueListFormDTO){
+    public Result<List<ClosedIssueListGovResultDTO>> closedList( @RequestBody CommonIssueListFormDTO issueListFormDTO){
         ValidatorUtils.validateEntity(issueListFormDTO);
-        return new Result<List<ClosedIssueListResultDTO>>().ok(issueService.closedList(issueListFormDTO));
+        return new Result<List<ClosedIssueListGovResultDTO>>().ok(issueService.closedListGov(issueListFormDTO));
     }
 
     /**

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java

@@ -22,6 +22,7 @@ import com.epmet.dto.IssueDTO;
 import com.epmet.dto.form.CommonIssueListFormDTO;
 import com.epmet.dto.form.IssueDetailFormDTO;
 import com.epmet.dto.form.ShiftProjectListFromDTO;
+import com.epmet.dto.result.ClosedIssueListGovResultDTO;
 import com.epmet.dto.result.ClosedIssueListResultDTO;
 import com.epmet.dto.result.IssueResultDTO;
 import com.epmet.dto.result.VotingIssueListResultDTO;
@@ -74,11 +75,20 @@ public interface IssueDao extends BaseDao<IssueEntity> {
     List<VotingIssueListResultDTO> selectVotingList(CommonIssueListFormDTO issueListFormDTO);
 
     /**
-     * @Description 查询已关闭议题列表
+     * @Description 查询已关闭议题列表 - 居民端
      * @param issueListFormDTO
      * @return List<ClosedIssueListResultDTO>
      * @author wangc
      * @date 2020.05.14 13:34
     **/
     List<ClosedIssueListResultDTO> selectClosedList(CommonIssueListFormDTO issueListFormDTO);
+
+    /**
+     * @Description 查询已关闭议题列表 - 政府端
+     * @param issueListFormDTO
+     * @return List<ClosedIssueListResultDTO>
+     * @author wangc
+     * @date 2020.05.14 13:34
+     **/
+    List<ClosedIssueListGovResultDTO> selectClosedListGov(CommonIssueListFormDTO issueListFormDTO);
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java

@@ -149,7 +149,7 @@ public interface IssueService extends BaseService<IssueEntity> {
     List<VotingIssueListResultDTO> votingList(CommonIssueListFormDTO issueListForm);
 
     /**
-     * @Description 已关闭列表
+     * @Description 已关闭列表 居民端
      * @param issueListForm
      * @return List<ClosedIssueListResultDTO>
      * @author wangc
@@ -188,4 +188,13 @@ public interface IssueService extends BaseService<IssueEntity> {
      * @Description 议题管理-议题转项目
      **/
     void shiftProject(ShiftProjectFormDTO formDTO);
+
+    /**
+     * @Description 已关闭列表 政府端
+     * @param issueListForm
+     * @return List<ClosedIssueListResultDTO>
+     * @author wangc
+     * @date 2020.05.14 10:33
+     **/
+    List<ClosedIssueListGovResultDTO> closedListGov(CommonIssueListFormDTO issueListForm);
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@@ -274,7 +274,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
     }
 
     /**
-     * @Description 已关闭列表
+     * @Description 已关闭列表 居民端
      * @param issueListForm
      * @return List<ClosedIssueListResultDTO>
      * @author wangc
@@ -507,4 +507,19 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
 		govIssueRedis.subtractWorkGrassrootsIssueRedDotValue(entity.getGridId());
 	}
 
+	/**
+	 * @Description
+	 * @param issueListForm
+	 * @return
+	 * @author wangc
+	 * @date 2020.05.18 10:38
+	**/
+    @Override
+    public List<ClosedIssueListGovResultDTO> closedListGov(CommonIssueListFormDTO issueListForm) {
+        issueListForm.setPageNo(null == issueListForm.getPageNo() ? NumConstant.ZERO :
+                (issueListForm.getPageNo() - NumConstant.ONE)*issueListForm.getPageSize()
+        );
+        return baseDao.selectClosedListGov(issueListForm);
+    }
+
 }

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml

@@ -212,7 +212,7 @@
     <select id="selectClosedList" parameterType="com.epmet.dto.form.CommonIssueListFormDTO" resultType="com.epmet.dto.result.ClosedIssueListResultDTO">
         SELECT
             ID AS issueId,
-            IFNULL(ISSUE_TITLE,''),
+            IFNULL(ISSUE_TITLE,'') AS issueTitle,
             IFNULL(CLOSE_REASON,'') AS solution,
             UNIX_TIMESTAMP( created_time ) AS issueClosedTime
         FROM
@@ -226,5 +226,23 @@
             LIMIT #{pageNo},
             #{pageSize}
     </select>
+    <!-- 查询已关闭议题列表 政府端 -->
+    <select id="selectClosedListGov" parameterType="com.epmet.dto.form.CommonIssueListFormDTO" resultType="com.epmet.dto.result.ClosedIssueListGovResultDTO">
+        SELECT
+            ID AS issueId,
+            IFNULL(ISSUE_TITLE,'') AS issueTitle,
+            IFNULL(CLOSE_REASON,'') AS closeReason,
+            UNIX_TIMESTAMP( created_time ) AS closedTime
+        FROM
+            issue
+        WHERE
+            DEL_FLAG = '0'
+            AND GRID_ID = #{gridId}
+            AND ISSUE_STATUS = 'closed'
+        ORDER BY
+            created_time DESC
+            LIMIT #{pageNo},
+            #{pageSize}
+    </select>
 
 </mapper>