From af9fce892f29e44343da112168b1e645650d2f2f Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 5 Jan 2021 10:20:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=AE=E9=A2=98-=E5=85=A8=E9=83=A8=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dataaggre/constant/IssueConstant.java | 1 + .../service/govissue/impl/GovIssueServiceImpl.java | 4 ++-- .../resources/mapper/govissue/IssueApplicationDao.xml | 9 +++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/IssueConstant.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/IssueConstant.java index e0c9506d37..644b680ea5 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/IssueConstant.java +++ b/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 = "议题类型不能为空......"; 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 fbc822f919..5b61ad4227 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 @@ -72,11 +72,11 @@ public class GovIssueServiceImpl implements GovIssueService { List gridsInfoList = govOrgService.gridListByIds(formDTO.getGridIdList()); AllIssueResultDTO result = new AllIssueResultDTO(); switch (formDTO.getIssueType()){ - // 审核中议题 + // 待审核议题 case IssueConstant.ISSUE_STATUS_AUDITING: List 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; // 被拒绝的议题 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 d7278f559f..08db0e9088 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 @@ -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( ia.GRID_ID = #{gridId} + ) order by iah.created_time desc @@ -33,11 +34,11 @@ grid_id FROM issue_application WHERE DEL_FLAG = 0 - AND APPLY_STATUS = 'under_auditing' - AND + AND ( GRID_ID = #{gridId} - + ) + AND APPLY_STATUS = 'under_auditing' order by created_time desc