From fb52eb0ec5bfed629f3efc01a8eb7b939b7d2933 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Fri, 11 Sep 2020 17:47:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=89=E5=AE=81=E6=8C=87=E6=95=B0=20?= =?UTF-8?q?=E8=BF=94=E5=9B=9E1=E4=BD=8D=E5=B0=8F=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/screen/ScreenIndexDataMonthlyDao.xml | 8 ++++---- .../resources/mapper/screen/ScreenIndexDataYearlyDao.xml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml index 07a389ed64..394753a941 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml @@ -66,10 +66,10 @@ resultType="com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankResultDTO"> SELECT org_name AS `NAME`, - ROUND(index_total, 2) AS totalIndex, - ROUND(govern_ablity, 2) AS governAbility, - ROUND(party_dev_ablity, 2) AS partyDevAbility, - ROUND(service_ablity, 2) AS serviceAbility, + ROUND(index_total, 1) AS totalIndex, + ROUND(govern_ablity, 1) AS governAbility, + ROUND(party_dev_ablity, 1) AS partyDevAbility, + ROUND(service_ablity, 1) AS serviceAbility, ORG_ID orgId FROM screen_index_data_monthly diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml index fab8926e41..2bda5e1ec7 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml @@ -24,10 +24,10 @@ resultType="com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankResultDTO"> SELECT org_name AS `NAME`, - ROUND(index_total, 2) AS totalIndex, - ROUND(govern_ablity, 2) AS governAbility, - ROUND(party_dev_ablity, 2) AS partyDevAbility, - ROUND(service_ablity, 2) AS serviceAbility, + ROUND(index_total, 1) AS totalIndex, + ROUND(govern_ablity, 1) AS governAbility, + ROUND(party_dev_ablity, 1) AS partyDevAbility, + ROUND(service_ablity, 1) AS serviceAbility, ORG_ID orgId FROM screen_index_data_yearly From 6e1fa0f0a677e2ffe4c27c2c05b335be7e52a437 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 11 Sep 2020 17:52:15 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=B0=8F=E6=95=B0=E7=82=B9=E4=BD=8D?= =?UTF-8?q?=E6=95=B0=E4=BF=AE=E6=94=B9=20=E5=A4=A7=E5=B1=8F=E6=8C=87?= =?UTF-8?q?=E6=95=B0=E6=9F=A5=E8=AF=A2=E5=85=AC=E7=94=A8API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screen/ScreenIndexDataMonthlyDao.xml | 22 +++++++++---------- .../screen/ScreenIndexDataYearlyDao.xml | 8 +++---- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml index 394753a941..58a41b9d5f 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml @@ -6,9 +6,9 @@ SELECT month_id AS monthId, - service_ablity AS serviceAbility, - party_dev_ablity AS partyDevAbility, - govern_ablity AS governAbility, - index_total AS indexTotal + ROUND(service_ablity,1) AS serviceAbility, + ROUND(party_dev_ablity,1) AS partyDevAbility, + ROUND(govern_ablity,1) AS governAbility, + ROUND(index_total,1) AS indexTotal FROM screen_index_data_monthly WHERE @@ -47,10 +47,10 @@ SELECT - index_total AS yearAverageIndex, - service_ablity AS serviceAbility, - party_dev_ablity AS partyDevAbility, - govern_ablity AS governAbility + ROUND(index_total,1) AS yearAverageIndex, + ROUND(service_ablity,1) AS serviceAbility, + ROUND(party_dev_ablity,1) AS partyDevAbility, + ROUND(govern_ablity,1) AS governAbility FROM screen_index_data_yearly WHERE From eaa4ec544cd627d08e394521f637608bafe2454a Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Fri, 11 Sep 2020 18:24:13 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=B9=B4=E8=A1=A8=E5=B9=B3=E5=9D=87?= =?UTF-8?q?=E5=80=BC=E8=AE=A1=E7=AE=97=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screen/ScreenIndexDataMonthlyDao.java | 15 ++++++++++++-- .../impl/FactIndexCollectServiceImpl.java | 4 +++- .../screen/ScreenIndexDataMonthlyDao.xml | 20 +++++++++++++++---- 3 files changed, 32 insertions(+), 7 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenIndexDataMonthlyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenIndexDataMonthlyDao.java index 760e7abc5f..653b00f415 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenIndexDataMonthlyDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenIndexDataMonthlyDao.java @@ -62,11 +62,22 @@ public interface ScreenIndexDataMonthlyDao extends BaseDao * @Author zhangyong * @Date 15:51 2020-09-04 **/ List selectListIndexDataMonthlyByYear(@Param("customerId") String customerId, - @Param("yearId") String yearId, @Param("month") String month); + @Param("yearId") String yearId, @Param("monthCount") Integer monthCount); + + /** + * 统计 今年，汇总了几个月的 指数统计 + * @param customerId + * @param yearId + * @return java.lang.Integer + * @Author zhangyong + * @Date 18:04 2020-09-11 + **/ + Integer selectCountIndexDataMonthly(@Param("customerId") String customerId, + @Param("yearId") String yearId); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexCollectServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexCollectServiceImpl.java index f466b98319..7014c4eb5d 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexCollectServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexCollectServiceImpl.java @@ -733,7 +733,9 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService { * @Date 22:06 2020-09-04 **/ private void insertIndexDataYear(String monthId, String customerId){ - List monthlyFormList = screenIndexDataMonthlyDao.selectListIndexDataMonthlyByYear(customerId, getYearStr(monthId), getMonthStr(monthId)); + // 查询今年，上报了几个月的指数统计 + Integer monthCount = screenIndexDataMonthlyDao.selectCountIndexDataMonthly(customerId, getYearStr(monthId)); + List monthlyFormList = screenIndexDataMonthlyDao.selectListIndexDataMonthlyByYear(customerId, getYearStr(monthId), monthCount); if (monthlyFormList.size() > NumConstant.ZERO){ int deleteNum; do { diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenIndexDataMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenIndexDataMonthlyDao.xml index 11a990aa9c..976a652d63 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenIndexDataMonthlyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenIndexDataMonthlyDao.xml @@ -64,10 +64,10 @@ ORG_ID orgId, PARENT_ID parentId, ORG_NAME orgName, - SUM(INDEX_TOTAL) / #{month} as indexTotal, - SUM(PARTY_DEV_ABLITY) / #{month} as partyDevAblity, - SUM(SERVICE_ABLITY) / #{month} as serviceAblity, - SUM(GOVERN_ABLITY) / #{month} as governAblity + SUM(INDEX_TOTAL) / #{monthCount} as indexTotal, + SUM(PARTY_DEV_ABLITY) / #{monthCount} as partyDevAblity, + SUM(SERVICE_ABLITY) / #{monthCount} as serviceAblity, + SUM(GOVERN_ABLITY) / #{monthCount} as governAblity FROM screen_index_data_monthly WHERE DEL_FLAG = '0' AND YEAR_ID = #{yearId} @@ -75,4 +75,16 @@ GROUP BY ORG_ID +