From 7d2ccc1906362aaff3e3b47b16397591d3100300 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 2 Sep 2021 09:51:42 +0800
Subject: [PATCH 1/4] =?UTF-8?q?selectMonthPieChart=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/screen/ScreenIndexDataMonthlyDao.xml   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 43d30e9193..7b641de992 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
@@ -6,9 +6,9 @@
     <!-- 2、月度指数分析-饼状图 -->
     <select id="selectMonthPieChart" resultType="com.epmet.evaluationindex.screen.dto.result.MonthPieChartResultDTO">
         SELECT
-            service_ablity * SERVICE_ABLITY_WEIGHT AS serviceAbility,
-            party_dev_ablity * PARTY_DEV_WEIGHT AS partyDevAbility,
-            govern_ablity * GOVERN_ABLITY_WEIGHT AS governAbility,
+            ROUND(service_ablity,1) * SERVICE_ABLITY_WEIGHT AS serviceAbility,
+            ROUND(party_dev_ablity,1)  * PARTY_DEV_WEIGHT AS partyDevAbility,
+            ROUND(govern_ablity,1) * GOVERN_ABLITY_WEIGHT AS governAbility,
             ROUND(service_ablity,1) serviceOriginScore,
             ROUND(party_dev_ablity,1) partyOriginScore,
             ROUND(govern_ablity,1) governOriginScore,

From 3dfb39724fa168f72368a5d045f17f5f010b376d Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 2 Sep 2021 12:37:16 +0800
Subject: [PATCH 2/4] =?UTF-8?q?/report/fact/index/scorelist=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/fact/FactIndexAgencyScoreDao.xml  | 2 +-
 .../main/resources/mapper/fact/FactIndexCommunityScoreDao.xml   | 2 +-
 .../src/main/resources/mapper/fact/FactIndexGridScoreDao.xml    | 2 +-
 3 files changed, 3 insertions(+), 3 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 5662edfaf7..214385cc29 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,7 +24,7 @@
     <select id="selectAgencyWeightScoreList" resultType="com.epmet.evaluationindex.screen.dto.result.ScoreListResultDTO">
         SELECT
             fact.index_code AS "indexCode",
-            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",
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 7c6be5ab92..8bb86a24b3 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,7 +24,7 @@
     <select id="selectCommunityWeightScoreList" resultType="com.epmet.evaluationindex.screen.dto.result.ScoreListResultDTO">
         SELECT
             fact.index_code AS "indexCode",
-            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",
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 a177451112..9be33bd524 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,7 +24,7 @@
     <select id="selectGridWeightScoreList" resultType="com.epmet.evaluationindex.screen.dto.result.ScoreListResultDTO">
         SELECT
             fact.index_code AS "indexCode",
-            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",

From 084be558edb1206ca8bc24ff5062529d90005aa0 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 2 Sep 2021 13:12:10 +0800
Subject: [PATCH 3/4] =?UTF-8?q?month/indexscore=E6=8E=A5=E5=8F=A3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/screen/ScreenIndexDataMonthlyDao.xml   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 7b641de992..8d6109753d 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
@@ -201,13 +201,13 @@
     <select id="selectMonthData" resultType="com.epmet.evaluationindex.screen.dto.result.IndexScoreResultDTO">
         SELECT
             score.index_total AS "total",
-            (score.party_dev_ablity * score.party_dev_weight) AS "party",
+            (ROUND(score.party_dev_ablity,1) * score.party_dev_weight) AS "party",
             ROUND(score.party_dev_ablity,1) partyOriginScore,
             score.party_dev_weight AS "partyDevAbilityWeight",
-            (score.govern_ablity * score.govern_ablity_weight) AS "govern",
+            (ROUND(score.govern_ablity,1) * score.govern_ablity_weight) AS "govern",
             ROUND(score.govern_ablity,1) governOriginScore,
             score.govern_ablity_weight AS "governAbilityWeight",
-            (score.service_ablity * score.service_ablity_weight) AS "service",
+            (ROUND(score.service_ablity,1) * score.service_ablity_weight) AS "service",
             ROUND(score.service_ablity,1) serviceOriginScore,
             score.service_ablity_weight AS "serviceAbilityWeight"
         FROM

From 3b4c455df9a07f84c018b86753e0dede9d0987f1 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Thu, 2 Sep 2021 17:12:10 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9Ajob=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E6=89=A7=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/config/ScheduleConfig.java           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/config/ScheduleConfig.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/config/ScheduleConfig.java
index 199da6b24d..a20624fa18 100644
--- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/config/ScheduleConfig.java
+++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/config/ScheduleConfig.java
@@ -46,6 +46,7 @@ public class ScheduleConfig {
         prop.put("org.quartz.jobStore.misfireThreshold", "12000");
         prop.put("org.quartz.jobStore.tablePrefix", "QRTZ_");
         prop.put("org.quartz.jobStore.selectWithLockSQL", "SELECT * FROM {0}LOCKS UPDLOCK WHERE LOCK_NAME = ?");
+        prop.put("org.quartz.jobStore.acquireTriggersWithinLock", "true");
 
         //PostgreSQL数据库，需要打开此注释
         //prop.put("org.quartz.jobStore.driverDelegateClass", "org.quartz.impl.jdbcjobstore.PostgreSQLDelegate");