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