From 7f99539841cb7109f46827c24eb6f59c42446ee6 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 23 Apr 2021 13:47:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=AE=81=E5=A4=A7=E5=B1=8F=E8=BF=94?= =?UTF-8?q?=E5=8F=82=E5=A2=9E=E5=8A=A0monthId,=E6=96=B9=E4=BE=BF=E7=9F=A5?= =?UTF-8?q?=E9=81=93=E6=95=B0=E6=8D=AE=E6=89=80=E5=B1=9E=E6=9C=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screen/dto/result/GrassRootsGovernRankResultDTO.java | 5 +++++ .../screen/dto/result/GrassRootsGovernResultDTO.java | 5 +++++ .../screen/dto/result/GrassRootsOrgRankResultDTO.java | 2 ++ .../screen/dto/result/GrassRootsOrgResultDTO.java | 5 +++++ .../evaluationindex/screen/dto/result/PmTotalResultDTO.java | 5 +++++ .../screen/dto/result/ProjectProfileResultDTO.java | 2 ++ .../mapper/screenan/ScreenAnCommunityProjectProfileDao.xml | 3 ++- .../mapper/screenan/ScreenAnGrassRootsGovernMonthlyDao.xml | 6 ++++-- .../mapper/screenan/ScreenAnGrassRootsOrgMonthlyDao.xml | 6 ++++-- .../mapper/screenan/ScreenAnGrassRootsPmTotalMonthlyDao.xml | 3 ++- 10 files changed, 36 insertions(+), 6 deletions(-) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsGovernRankResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsGovernRankResultDTO.java index ac2072d44c..624868df62 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsGovernRankResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsGovernRankResultDTO.java @@ -39,4 +39,9 @@ public class GrassRootsGovernRankResultDTO implements Serializable { * 组织名称 */ private String orgName; + + /** + * 数据所属月份 + */ + private String monthId; } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsGovernResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsGovernResultDTO.java index 05b2e6c382..27be4bb8ce 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsGovernResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsGovernResultDTO.java @@ -35,4 +35,9 @@ public class GrassRootsGovernResultDTO implements Serializable { * 办结率（当前界面是社区时显示） */ private String closedProjectRatio; + + /** + * 数据所属月份 + */ + private String monthId; } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsOrgRankResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsOrgRankResultDTO.java index 61b7ab9b74..e6c3ee3971 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsOrgRankResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsOrgRankResultDTO.java @@ -31,4 +31,6 @@ public class GrassRootsOrgRankResultDTO implements Serializable { * 组织名称 */ private String orgName; + + private String monthId; } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsOrgResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsOrgResultDTO.java index d01bf5837e..8c4f0df674 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsOrgResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GrassRootsOrgResultDTO.java @@ -27,4 +27,9 @@ public class GrassRootsOrgResultDTO implements Serializable { * 项目数 */ private Integer projectTotal; + + /** + * 数据所属月份 + */ + private String monthId; } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PmTotalResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PmTotalResultDTO.java index aa5dcb67b5..2024fcd9d8 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PmTotalResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/PmTotalResultDTO.java @@ -31,4 +31,9 @@ public class PmTotalResultDTO implements Serializable { * 议题数 */ private Integer issueTotal; + + /** + * 数据所属月份 + */ + private String monthId; } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ProjectProfileResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ProjectProfileResultDTO.java index 9e6b2d509e..a5f3f8ce4f 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ProjectProfileResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ProjectProfileResultDTO.java @@ -27,4 +27,6 @@ public class ProjectProfileResultDTO implements Serializable { * 级别 */ private String level; + + private String dataEndTime; } diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnCommunityProjectProfileDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnCommunityProjectProfileDao.xml index 10679f3f96..8718bfa0f2 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnCommunityProjectProfileDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnCommunityProjectProfileDao.xml @@ -5,7 +5,8 @@ SELECT GROUP_TOTAL, ISSUE_TOTAL, - PROJECT_TOTAL + PROJECT_TOTAL, + MONTH_ID FROM screen_an_grass_roots_org_monthly WHERE DEL_FLAG = 0 AND ORG_ID = #{agencyId} @@ -47,7 +48,8 @@ SELECT ORG_NAME, GROUP_TOTAL, ISSUE_TOTAL, - PROJECT_TOTAL + PROJECT_TOTAL, + MONTH_ID FROM screen_an_grass_roots_org_monthly WHERE DEL_FLAG = 0 AND PID = #{agencyId} diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsPmTotalMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsPmTotalMonthlyDao.xml index 58b7001046..0cb482df47 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsPmTotalMonthlyDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsPmTotalMonthlyDao.xml @@ -7,7 +7,8 @@ SELECT GROUP_MEMBER_TOTAL, TOPIC_TOTAL, TOPIC_PARTI_USER_TOTAL, - ISSUE_TOTAL + ISSUE_TOTAL, + MONTH_ID FROM screen_an_grass_roots_pm_total_monthly WHERE DEL_FLAG = '0' AND ORG_ID = #{agencyId}