diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ScoreListResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ScoreListResultDTO.java index 64d2b02a95..40db66a38b 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ScoreListResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ScoreListResultDTO.java @@ -44,6 +44,12 @@ public class ScoreListResultDTO implements Serializable { private Double subAgencyWeight; + /** + * 下级指数=indexTotalOriginScore-selfOriginScore + */ private Double subOriginScore; - + /** + * 下级指数,四舍五入,前端不用此值 + */ + private Double subOriginScoreBak; } 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 ce03de993a..37438d4249 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 @@ -31,7 +31,8 @@ ROUND(self.self_score,1) AS selfOriginScore, self.SELF_WEIGHT AS agencyWeight, ROUND(self.sub_score*fact.WEIGHT, 1) AS "subAgencyScore", - ROUND(self.sub_score,1) AS subOriginScore, + ROUND(self.sub_score,1) AS subOriginScoreBak, + ROUND(fact.score,1)-ROUND(self.self_score,1) as subOriginScore, self.SUB_WEIGHT AS subAgencyWeight FROM fact_index_agency_score fact 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 1fcb8a4dc1..bd42a2b2b8 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 @@ -31,7 +31,8 @@ ROUND(self.self_score, 1) AS selfOriginScore, self.SELF_WEIGHT AS agencyWeight, ROUND(ROUND(self.sub_score,1)*fact.WEIGHT, 1) AS "subAgencyScore", - ROUND(self.sub_score, 1) AS subOriginScore, + ROUND(self.sub_score, 1) AS subOriginScoreBak, + ROUND(fact.score,1)-ROUND(self.self_score, 1) as subOriginScore, self.SUB_WEIGHT AS subAgencyWeight FROM fact_index_community_score fact 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 1b5d82dbd1..62a7984b85 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 @@ -31,7 +31,8 @@ ROUND(self.self_score, 1) AS selfOriginScore, self.SELF_WEIGHT AS agencyWeight, ROUND(ROUND(self.sub_score,1)*fact.WEIGHT, 1) AS "subAgencyScore", - ROUND(self.sub_score, 1) AS subOriginScore, + ROUND(self.sub_score, 1) AS subOriginScoreBak, + ROUND(fact.score,1)-ROUND(self.self_score, 1) as subOriginScore, self.SUB_WEIGHT AS subAgencyWeight FROM fact_index_grid_score fact