From 9df5611c7c55e7b832aa13acfaa5aeddf257aebc Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 24 Sep 2020 17:50:57 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=A4=E5=90=8C=E7=BA=A7=E5=AF=B9=E6=AF=94?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E5=90=84=E9=A1=B9=E6=95=B0=E6=8D=AE=E4=B8=8D?= =?UTF-8?q?=E4=B9=98=E6=9D=83=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/fact/FactIndexAgencyScoreDao.xml | 8 ++++---- .../resources/mapper/fact/FactIndexCommunityScoreDao.xml | 8 ++++---- .../main/resources/mapper/fact/FactIndexGridScoreDao.xml | 8 ++++---- 3 files changed, 12 insertions(+), 12 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 e1d744940e..374814375d 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 @@ -24,8 +24,8 @@ SELECT #{indexCode} AS "indexCode", ROUND(fact.score, 1) AS "indexTotal", - ROUND(self.self_score * self.self_weight,1) AS "agencyScore", - ROUND(self.sub_score * self.sub_weight,1) AS "subAgencyScore" + ROUND(self.self_score, 1) AS "agencyScore", + ROUND(self.sub_score, 1) AS "subAgencyScore" FROM fact_index_agency_score fact INNER JOIN fact_index_agency_self_sub_score self ON fact.agency_id = self.agency_id @@ -44,8 +44,8 @@ SELECT fact.month_id AS "monthId", ROUND(fact.score, 1) AS "indexTotal", - ROUND(self.self_score * self.self_weight,1) AS "agencyScore", - ROUND(self.sub_score * self.sub_weight,1) AS "subAgencyScore" + ROUND(self.self_score, 1) AS "agencyScore", + ROUND(self.sub_score, 1) AS "subAgencyScore" FROM fact_index_agency_score fact INNER JOIN fact_index_agency_self_sub_score self ON fact.agency_id = self.agency_id 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 3e4f7ed0d5..31c051f887 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 @@ -24,8 +24,8 @@ SELECT #{indexCode} AS "indexCode", ROUND(fact.score, 1) AS "indexTotal", - ROUND(self.self_score * self.self_weight,1) AS "agencyScore", - ROUND(self.sub_score * self.sub_weight,1) AS "subAgencyScore" + ROUND(self.self_score, 1) AS "agencyScore", + ROUND(self.sub_score, 1) AS "subAgencyScore" FROM fact_index_community_score fact INNER JOIN fact_index_community_self_sub_score self ON fact.agency_id = self.agency_id @@ -44,8 +44,8 @@ SELECT fact.month_id AS "monthId", ROUND(fact.score, 1) AS "indexTotal", - ROUND(self.self_score * self.self_weight,1) AS "agencyScore", - ROUND(self.sub_score * self.sub_weight,1) AS "subAgencyScore" + ROUND(self.self_score, 1) AS "agencyScore", + ROUND(self.sub_score, 1) AS "subAgencyScore" FROM fact_index_community_score fact INNER JOIN fact_index_community_self_sub_score self ON fact.agency_id = self.agency_id 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 20752058bd..47d5ad74a0 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 @@ -24,8 +24,8 @@ SELECT #{indexCode} AS "indexCode", ROUND(fact.score, 1) AS "indexTotal", - ROUND(self.self_score * self.self_weight,1) AS "agencyScore", - ROUND(self.sub_score * self.sub_weight,1) AS "subAgencyScore" + ROUND(self.self_score, 1) AS "agencyScore", + ROUND(self.sub_score, 1) AS "subAgencyScore" FROM fact_index_grid_score fact INNER JOIN fact_index_grid_self_sub_score self ON fact.grid_id = self.grid_id @@ -45,8 +45,8 @@ SELECT fact.month_id AS "monthId", ROUND(fact.score, 1) AS "indexTotal", - ROUND(self.self_score * self.self_weight,1) AS "agencyScore", - ROUND(self.sub_score * self.sub_weight,1) AS "subAgencyScore" + ROUND(self.self_score, 1) AS "agencyScore", + ROUND(self.sub_score, 1) AS "subAgencyScore" FROM fact_index_grid_score fact INNER JOIN fact_index_grid_self_sub_score self ON fact.grid_id = self.grid_id