Merge branch 'wxz_fix_job_repeat' into develop

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",

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",

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",

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,
@@ -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

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");