From a2c2f99b2a91c006f26fc6510efb004db7e5b384 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 2 Sep 2021 16:50:29 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E4=BB=B7=E6=8C=87=E6=A0=87=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=20=E8=AE=BE=E7=BD=AE=E5=88=86=E5=80=BC=E7=9A=84?= =?UTF-8?q?=E6=8C=89=E7=85=A7=E3=80=90=E6=80=BB=E5=88=86=3D=E5=90=84?= =?UTF-8?q?=E4=B8=AA=E8=83=BD=E5=8A=9B=E5=80=BC=E5=9B=9B=E8=88=8D=E4=BA=94?= =?UTF-8?q?=E5=85=A5=E4=BF=9D=E7=95=99=E4=B8=80=E4=BD=8D=20*=20=E6=9D=83?= =?UTF-8?q?=E9=87=8D=20=E7=9B=B8=E5=8A=A0=EF=BC=8C=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E5=80=BC=E5=9B=9B=E8=88=8D=E4=BA=94=E5=85=A5=E4=BF=9D=E7=95=99?= =?UTF-8?q?=E4=B8=80=E4=BD=8D=EF=BC=9B=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=E4=B8=89=E5=A4=A7=E8=83=BD=E5=8A=9B=E7=9A=84?= =?UTF-8?q?=E5=88=86=3D=E5=8E=9F=E5=A7=8B=E5=80=BC=E5=9B=9B=E8=88=8D?= =?UTF-8?q?=E4=BA=94=E5=85=A5=E4=BF=9D=E7=95=99=E4=B8=80=E4=BD=8D*=20?= =?UTF-8?q?=E6=9D=83=E9=87=8D=EF=BC=8C=E7=BB=93=E6=9E=9C=E5=80=BC=E5=9B=9B?= =?UTF-8?q?=E8=88=8D=E4=BA=94=E5=85=A5=E4=BF=9D=E7=95=99=E4=B8=80=E4=BD=8D?= =?UTF-8?q?=EF=BC=9B=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=E5=8D=95=E9=A1=B9=E5=8E=9F=E5=A7=8B=E5=80=BC=EF=BC=9A=E7=9B=B4?= =?UTF-8?q?=E6=8E=A5=E5=9B=9B=E8=88=8D=E4=BA=94=E5=85=A5=E4=BF=9D=E7=95=99?= =?UTF-8?q?=E4=B8=80=E4=BD=8D=E5=B0=8F=E6=95=B0=EF=BC=9B=E3=80=91=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/fact/FactIndexAgencyScoreDao.xml | 8 ++++---- .../mapper/fact/FactIndexAgencySubScoreDao.xml | 4 ++-- .../mapper/fact/FactIndexCommunityScoreDao.xml | 12 ++++++------ .../fact/FactIndexCommunitySubScoreDao.xml | 4 ++-- .../mapper/fact/FactIndexGridScoreDao.xml | 12 ++++++------ .../mapper/fact/FactIndexGridSubScoreDao.xml | 4 ++-- .../screen/ScreenIndexDataMonthlyDao.xml | 18 +++++++++--------- 7 files changed, 31 insertions(+), 31 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencyScoreDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencyScoreDao.xml index 214385cc29..04fcae2efd 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencyScoreDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencyScoreDao.xml @@ -6,7 +6,7 @@ SELECT fact.month_id AS "monthId", - ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal", + ROUND(ROUND(fact.score,1)*fact.WEIGHT, 1) AS "indexTotal", ROUND(fact.score,1) AS "indexTotalOriginScore", fact.WEIGHT AS "indexTotalSupWeight", - ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore", - ROUND(self.sub_score*fact.WEIGHT, 1) AS "subAgencyScore", + ROUND(ROUND(self.self_score,1)*fact.WEIGHT, 1) AS "agencyScore", + ROUND(ROUND(self.sub_score,1)*fact.WEIGHT, 1) AS "subAgencyScore", fact.index_code AS "indexCode", self.SELF_WEIGHT AS "selfWeight", self.SUB_WEIGHT AS "subWeight" diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencySubScoreDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencySubScoreDao.xml index aafd8dd25b..17354e06f7 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencySubScoreDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencySubScoreDao.xml @@ -7,10 +7,10 @@ SELECT fact.index_code AS "key", IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS "value", - fact.score AS score, + round(fact.score,1) AS score, dict.index_name AS "name", round(fact.WEIGHT,2) AS weight, - (fact.SCORE * fact.WEIGHT) AS weightedScore + round(round(fact.SCORE,1) * fact.WEIGHT,1) AS weightedScore FROM fact_index_agency_sub_score fact LEFT JOIN index_dict dict ON fact.index_code = dict.index_code diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunityScoreDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunityScoreDao.xml index 8bb86a24b3..5f77c4950d 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunityScoreDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunityScoreDao.xml @@ -6,7 +6,7 @@ SELECT fact.month_id AS "monthId", - ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal", + ROUND(ROUND(fact.score,1)*fact.WEIGHT, 1) AS "indexTotal", ROUND(fact.score,1) AS "indexTotalOriginScore", fact.WEIGHT AS "indexTotalSupWeight", - ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore", - ROUND(self.sub_score*fact.WEIGHT, 1) AS "subAgencyScore", + ROUND(ROUND(self.self_score,1)*fact.WEIGHT, 1) AS "agencyScore", + ROUND(ROUND(self.sub_score,1)*fact.WEIGHT, 1) AS "subAgencyScore", fact.index_code AS "indexCode", self.SELF_WEIGHT AS "selfWeight", self.SUB_WEIGHT AS "subWeight" diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunitySubScoreDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunitySubScoreDao.xml index 37290ed60a..11a9f85a9b 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunitySubScoreDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunitySubScoreDao.xml @@ -8,9 +8,9 @@ fact.index_code AS "key", IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS "value", dict.index_name AS "name", - fact.score AS score, + round(fact.score,1) AS score, round(fact.WEIGHT,2) AS weight, - (fact.SCORE * fact.WEIGHT) AS weightedScore + round(round(fact.SCORE,1) * fact.WEIGHT,1) AS weightedScore FROM fact_index_community_sub_score fact LEFT JOIN index_dict dict ON fact.index_code = dict.index_code diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridScoreDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridScoreDao.xml index 9be33bd524..c152cbd144 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridScoreDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridScoreDao.xml @@ -6,7 +6,7 @@ SELECT fact.month_id AS "monthId", - ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal", + ROUND(ROUND(fact.score,1)*fact.WEIGHT, 1) AS "indexTotal", ROUND(fact.score,1) AS "indexTotalOriginScore", fact.WEIGHT AS "indexTotalSupWeight", - ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore", - ROUND(self.sub_score*fact.WEIGHT, 1) AS "subAgencyScore", + ROUND(ROUND(self.self_score,1)*fact.WEIGHT, 1) AS "agencyScore", + ROUND(ROUND(self.sub_score,1)*fact.WEIGHT, 1) AS "subAgencyScore", fact.index_code AS "indexCode", self.SELF_WEIGHT AS "selfWeight", self.SUB_WEIGHT AS "subWeight" diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridSubScoreDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridSubScoreDao.xml index 1fda25b3ac..f3127095e7 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridSubScoreDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridSubScoreDao.xml @@ -8,9 +8,9 @@ fact.index_code AS "key", IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS "value", dict.index_name AS "name", - fact.score AS score, + round(fact.score,1) AS score, round(fact.WEIGHT,2) AS weight, - (fact.SCORE * fact.WEIGHT) AS weightedScore + round(round(fact.SCORE,1) * fact.WEIGHT,1) AS weightedScore FROM fact_index_grid_sub_score fact LEFT JOIN index_dict dict ON fact.index_code = dict.index_code 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 03f4da3f4f..d6ad50cc2b 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 @@ -88,9 +88,9 @@ resultType="com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankResultDTO"> SELECT score.org_name AS `NAME`, - score.service_ablity * score.SERVICE_ABLITY_WEIGHT AS serviceAbility, - score.party_dev_ablity * score.PARTY_DEV_WEIGHT AS partyDevAbility, - score.govern_ablity * score.GOVERN_ABLITY_WEIGHT AS governAbility, + ROUND(ROUND(score.service_ablity,1) * score.SERVICE_ABLITY_WEIGHT, 1) AS serviceAbility, + ROUND(ROUND(score.party_dev_ablity,1) * score.PARTY_DEV_WEIGHT, 1) AS partyDevAbility, + ROUND(ROUND(score.govern_ablity,1) * score.GOVERN_ABLITY_WEIGHT, 1) AS governAbility, score.PARTY_DEV_WEIGHT AS partyWeight, score.GOVERN_ABLITY_WEIGHT AS governWeight, score.SERVICE_ABLITY_WEIGHT AS serviceWeight, @@ -156,13 +156,13 @@ org_id AS "orgId", org_name AS "orgName", - round((party_dev_ablity * party_dev_weight),1) AS "score" + round(round(party_dev_ablity,1) * party_dev_weight,1) AS "score" - round((govern_ablity * govern_ablity_weight),1) AS "score" + round(round(govern_ablity,1) * govern_ablity_weight,1) AS "score" - round((service_ablity * service_ablity_weight),1) AS "score" + round(round(service_ablity,1) * service_ablity_weight,1) AS "score" FROM screen_index_data_monthly @@ -406,9 +406,9 @@ resultType="com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankResultDTO"> SELECT score.org_name AS `NAME`, - score.service_ablity * score.SERVICE_ABLITY_WEIGHT AS serviceAbility, - score.party_dev_ablity * score.PARTY_DEV_WEIGHT AS partyDevAbility, - score.govern_ablity * score.GOVERN_ABLITY_WEIGHT AS governAbility, + ROUND(ROUND(score.service_ablity,1)*score.SERVICE_ABLITY_WEIGHT, 1)AS serviceAbility, + ROUND(ROUND(score.party_dev_ablity,1) * score.PARTY_DEV_WEIGHT, 1) AS partyDevAbility, + ROUND(ROUND(score.govern_ablity,1) * score.GOVERN_ABLITY_WEIGHT, 1) AS governAbility, score.PARTY_DEV_WEIGHT AS partyWeight, score.GOVERN_ABLITY_WEIGHT AS governWeight, score.SERVICE_ABLITY_WEIGHT AS serviceWeight,