From 857cb7137f4b91c54bc1fc3326d1527d719de10c Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 4 Jan 2021 17:28:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E6=80=BB=E6=95=B0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataaggre/dao/govissue/IssueApplicationDao.java   |  2 ++
 .../com/epmet/dataaggre/dao/govissue/IssueDao.java    |  2 ++
 .../service/govissue/impl/GovIssueServiceImpl.java    | 11 +++++++----
 .../resources/mapper/govissue/IssueApplicationDao.xml |  8 ++++++++
 .../src/main/resources/mapper/govissue/IssueDao.xml   |  8 ++++++++
 5 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govissue/IssueApplicationDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govissue/IssueApplicationDao.java
index bf9e3a4a2e..0924e9cdb7 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govissue/IssueApplicationDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govissue/IssueApplicationDao.java
@@ -50,4 +50,6 @@ public interface IssueApplicationDao extends BaseDao<IssueApplicationEntity> {
      */
     List<IssueListResultDTO> issueStatusAuditing(@Param("gridIds") List<String> gridIds);
 
+    Integer selectApplicationCount(@Param("gridIds") List<String> gridIds);
+
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govissue/IssueDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govissue/IssueDao.java
index 7f583e13fa..a5b7dd5cf8 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govissue/IssueDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govissue/IssueDao.java
@@ -73,4 +73,6 @@ public interface IssueDao extends BaseDao<IssueEntity> {
      * @author sun
      **/
     List<ClosedIssueListResultDTO> selectClosedListGov(ClosedIssueListFormDTO fromDTO);
+
+    Integer selectIssueCount(@Param("gridIds") List<String> gridIds);
 }
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java
index 411ec78a9a..d39981e446 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java
@@ -70,31 +70,34 @@ public class GovIssueServiceImpl implements GovIssueService {
         }
         // xx街道-xx网格
         List<GridsInfoListResultDTO> gridsInfoList = govOrgService.gridListByIds(formDTO.getGridIdList());
+        Integer issueCount = issueDao.selectIssueCount(formDTO.getGridIdList());
+        Integer applicationCount = issueApplicationDao.selectApplicationCount(formDTO.getGridIdList());
+        Integer all = 0;
+        if (null != issueCount && null != applicationCount){
+            all = issueCount+applicationCount;
+        }
         AllIssueResultDTO result = new AllIssueResultDTO();
+        result.setTotal(all);
         switch (formDTO.getIssueType()){
             // 审核中议题
             case IssueConstant.ISSUE_STATUS_AUDITING:
                 List<IssueListResultDTO> resultAuditing = issueStatusAuditing(formDTO);
                 result.setIssueList(resultAuditing);
-                result.setTotal(resultAuditing.size());
                 break;
             // 被拒绝的议题
             case IssueConstant.ISSUE_STATUS_REJECTED:
                 List<IssueListResultDTO> resultRejected = issueStatusRejected(formDTO);
                 result.setIssueList(resultRejected);
-                result.setTotal(resultRejected.size());
                 break;
             // 已转项目的议题
             case IssueConstant.ISSUE_STATUS_SHIFT_PROJECT:
                 List<IssueListResultDTO> resultShiftProject = issueStatusShiftProject(formDTO);
                 result.setIssueList(resultShiftProject);
-                result.setTotal(resultShiftProject.size());
                 break;
             // 已关闭、表决中的议题
             default:
                 List<IssueListResultDTO> resultClosedOrVoting = issueStatusClosedOrVoting(formDTO);
                 result.setIssueList(resultClosedOrVoting);
-                result.setTotal(resultClosedOrVoting.size());
         }
         if (!CollectionUtils.isEmpty(gridsInfoList)){
             // 给所属网格 赋值
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueApplicationDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueApplicationDao.xml
index 987bbc5c74..ef3e74012d 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueApplicationDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueApplicationDao.xml
@@ -40,4 +40,12 @@
             </foreach>
         order by created_time desc
     </select>
+    <select id="selectApplicationCount" resultType="java.lang.Integer">
+        select count(id) from issue_application
+        where del_flag = '0'
+        AND(
+        <foreach collection="gridIds" item="gridId" separator=" OR ">
+            GRID_ID = #{gridId}
+        </foreach>)
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml
index 06f5af5e31..94e4eb1ef8 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml
@@ -96,5 +96,13 @@
             count DESC, i.closed_time DESC
         LIMIT #{pageNo}, #{pageSize}
     </select>
+    <select id="selectIssueCount" resultType="java.lang.Integer">
+        select count(id) from issue
+        where del_flag = '0'
+        AND(
+        <foreach collection="gridIds" item="gridId" separator=" OR ">
+            GRID_ID = #{gridId}
+        </foreach>)
+    </select>
 
 </mapper>
\ No newline at end of file