From 99332177406f57804a086ef3c29e4d207988c492 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 6 Nov 2020 13:37:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=9C=AC=E7=BA=A7?= =?UTF-8?q?=E5=92=8C=E4=B8=8B=E7=BA=A7=E5=88=86=E6=95=B0=E6=97=B6=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=20=E6=80=BB=E5=88=86=E7=9A=84=E5=8E=9F=E5=A7=8B?= =?UTF-8?q?=E5=80=BC=E5=8F=8A=E6=80=BB=E5=88=86=E5=AF=B9=E5=BA=94=E7=9A=84?= =?UTF-8?q?=20=E4=B8=8A=E7=BA=A7=E6=8C=87=E6=A0=87=E7=9A=84=E6=9D=83?= =?UTF-8?q?=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screen/dto/result/MonthScoreListResultDTO.java | 8 ++++++++ .../screen/dto/result/ScoreListResultDTO.java | 8 ++++++++ .../resources/mapper/fact/FactIndexAgencyScoreDao.xml | 4 ++++ .../resources/mapper/fact/FactIndexCommunityScoreDao.xml | 4 ++++ .../main/resources/mapper/fact/FactIndexGridScoreDao.xml | 4 ++++ 5 files changed, 28 insertions(+) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/MonthScoreListResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/MonthScoreListResultDTO.java index 0acdbf9c73..19fad59717 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/MonthScoreListResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/MonthScoreListResultDTO.java @@ -30,6 +30,14 @@ public class MonthScoreListResultDTO implements Serializable { * 能力总分 */ private Double indexTotal; + /** + * 能力总分在上级的权重 + */ + private Double indexTotalSupWeight; + /** + * 能力总分原始值 + */ + private Double indexTotalOriginScore; /** * 本级能力分 */ 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 3b299ac780..64d2b02a95 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 @@ -21,6 +21,14 @@ public class ScoreListResultDTO implements Serializable { * 总分(保留一位小数) */ private Double indexTotal; + /** + * 能力总分在上级的权重 + */ + private Double indexTotalSupWeight; + /** + * 能力总分原始值 + */ + private Double indexTotalOriginScore; /** * 本级分数(保留一位小数) */ 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 9bc3f57b22..070feb04aa 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 @@ -25,6 +25,8 @@ SELECT fact.index_code AS "indexCode", ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal", + ROUND(fact.score,1) AS "indexTotalSupWeight", + fact.WEIGHT AS "indexTotalSupWeight", ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore", self.self_score AS selfOriginScore, self.SELF_WEIGHT AS agencyWeight, @@ -49,6 +51,8 @@ SELECT fact.month_id AS "monthId", ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal", + ROUND(fact.score,1) AS "indexTotalSupWeight", + fact.WEIGHT AS "indexTotalSupWeight", ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore", ROUND(self.sub_score*fact.WEIGHT, 1) AS "subAgencyScore", fact.index_code AS "indexCode" 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 64e645e536..0f04e3b8a0 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 @@ -25,6 +25,8 @@ SELECT fact.index_code AS "indexCode", ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal", + ROUND(fact.score,1) AS "indexTotalSupWeight", + fact.WEIGHT AS "indexTotalSupWeight", ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore", self.self_score AS selfOriginScore, self.SELF_WEIGHT AS agencyWeight, @@ -49,6 +51,8 @@ SELECT fact.month_id AS "monthId", ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal", + ROUND(fact.score,1) AS "indexTotalSupWeight", + fact.WEIGHT AS "indexTotalSupWeight", ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore", ROUND(self.sub_score*fact.WEIGHT, 1) AS "subAgencyScore", fact.index_code AS "indexCode" 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 5ee3c7d5f8..a332efdf54 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 @@ -25,6 +25,8 @@ SELECT fact.index_code AS "indexCode", ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal", + ROUND(fact.score,1) AS "indexTotalSupWeight", + fact.WEIGHT AS "indexTotalSupWeight", ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore", self.self_score AS selfOriginScore, self.SELF_WEIGHT AS agencyWeight, @@ -50,6 +52,8 @@ SELECT fact.month_id AS "monthId", ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal", + ROUND(fact.score,1) AS "indexTotalSupWeight", + fact.WEIGHT AS "indexTotalSupWeight", ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore", ROUND(self.sub_score*fact.WEIGHT, 1) AS "subAgencyScore", fact.index_code AS "indexCode" From 36c306ee7ae2e078dbc3275b8cc58b6384586323 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 6 Nov 2020 13:51:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=9C=AC=E7=BA=A7?= =?UTF-8?q?=E5=92=8C=E4=B8=8B=E7=BA=A7=E5=88=86=E6=95=B0=E6=97=B6=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=20=E6=80=BB=E5=88=86=E7=9A=84=E5=8E=9F=E5=A7=8B?= =?UTF-8?q?=E5=80=BC=E5=8F=8A=E6=80=BB=E5=88=86=E5=AF=B9=E5=BA=94=E7=9A=84?= =?UTF-8?q?=20=E4=B8=8A=E7=BA=A7=E6=8C=87=E6=A0=87=E7=9A=84=E6=9D=83?= =?UTF-8?q?=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/fact/FactIndexAgencyScoreDao.xml | 4 ++-- .../main/resources/mapper/fact/FactIndexCommunityScoreDao.xml | 4 ++-- .../src/main/resources/mapper/fact/FactIndexGridScoreDao.xml | 4 ++-- 3 files changed, 6 insertions(+), 6 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 070feb04aa..6eb14469a2 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 @@ -25,7 +25,7 @@ SELECT fact.index_code AS "indexCode", ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal", - ROUND(fact.score,1) AS "indexTotalSupWeight", + ROUND(fact.score,1) AS "indexTotalOriginScore", fact.WEIGHT AS "indexTotalSupWeight", ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore", self.self_score AS selfOriginScore, @@ -51,7 +51,7 @@ SELECT fact.month_id AS "monthId", ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal", - ROUND(fact.score,1) AS "indexTotalSupWeight", + 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", 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 0f04e3b8a0..ca682e107b 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 @@ -25,7 +25,7 @@ SELECT fact.index_code AS "indexCode", ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal", - ROUND(fact.score,1) AS "indexTotalSupWeight", + ROUND(fact.score,1) AS "indexTotalOriginScore", fact.WEIGHT AS "indexTotalSupWeight", ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore", self.self_score AS selfOriginScore, @@ -51,7 +51,7 @@ SELECT fact.month_id AS "monthId", ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal", - ROUND(fact.score,1) AS "indexTotalSupWeight", + 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", 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 a332efdf54..708a5fbf1f 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 @@ -25,7 +25,7 @@ SELECT fact.index_code AS "indexCode", ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal", - ROUND(fact.score,1) AS "indexTotalSupWeight", + ROUND(fact.score,1) AS "indexTotalOriginScore", fact.WEIGHT AS "indexTotalSupWeight", ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore", self.self_score AS selfOriginScore, @@ -52,7 +52,7 @@ SELECT fact.month_id AS "monthId", ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal", - ROUND(fact.score,1) AS "indexTotalSupWeight", + 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",