议题-全部修改

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/IssueConstant.java

@@ -13,6 +13,7 @@ public interface IssueConstant {
     String ISSUE_STATUS_SHIFT_PROJECT = "shift_project";
     String ISSUE_STATUS_CLOSED = "closed";
     String ISSUE_STATUS_AUDITING = "auditing";
+    String ISSUE_STATUS_UNDER_AUDITING = "under_auditing";
     String ISSUE_STATUS_REJECTED = "rejected";
 
     String NOT_EXISTS_ISSUE_TYPE = "议题类型不能为空......";

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java

@@ -72,11 +72,11 @@ public class GovIssueServiceImpl implements GovIssueService {
         List<GridsInfoListResultDTO> gridsInfoList = govOrgService.gridListByIds(formDTO.getGridIdList());
         AllIssueResultDTO result = new AllIssueResultDTO();
         switch (formDTO.getIssueType()){
-            // 审核中议题
+            // 待审核议题
             case IssueConstant.ISSUE_STATUS_AUDITING:
                 List<IssueListResultDTO> resultAuditing = issueStatusAuditing(formDTO);
                 result.setIssueList(resultAuditing);
-                Integer auditingCount = issueApplicationDao.selectApplicationCount(formDTO.getGridIdList(), formDTO.getIssueType());
+                Integer auditingCount = issueApplicationDao.selectApplicationCount(formDTO.getGridIdList(), IssueConstant.ISSUE_STATUS_UNDER_AUDITING);
                 result.setTotal(auditingCount);
                 break;
             // 被拒绝的议题

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueApplicationDao.xml

@@ -16,10 +16,11 @@
         FROM issue_application_history iah
         LEFT JOIN issue_application ia ON iah.ISSUE_APPLICATION_ID = ia.ID AND ia.APPLY_STATUS = 'rejected'
         WHERE ia.DEL_FLAG = 0
-          AND
+          AND(
           <foreach collection="gridIds" item="gridId" separator=" OR ">
               ia.GRID_ID = #{gridId}
           </foreach>
+          )
         order by iah.created_time desc
     </select>
 
@@ -33,11 +34,11 @@
             grid_id
         FROM issue_application
         WHERE DEL_FLAG = 0
-            AND APPLY_STATUS = 'under_auditing'
-            AND
+            AND (
             <foreach collection="gridIds" item="gridId" separator=" OR ">
                 GRID_ID = #{gridId}
-            </foreach>
+            </foreach>)
+            AND APPLY_STATUS = 'under_auditing'
         order by created_time desc
     </select>
     <select id="selectApplicationCount" resultType="java.lang.Integer">