Merge remote-tracking branch 'origin/dev'

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ScoreListResultDTO.java

@@ -29,6 +29,12 @@ public class ScoreListResultDTO implements Serializable {
      * 能力总分原始值
      */
     private Double indexTotalOriginScore;
+
+    /**
+     * 能力总分原始值-bak,12.4修改
+     */
+    private Double indexTotalOriginScoreBak;
+
     /**
      * 本级分数(保留一位小数)
      */

epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencyScoreDao.xml

@@ -25,7 +25,8 @@
         SELECT
             fact.index_code AS "indexCode",
             ROUND(ROUND(fact.score,1)*fact.WEIGHT, 1) AS "indexTotal",
-            ROUND(fact.score,1) AS "indexTotalOriginScore",
+            ROUND(fact.score,1) AS "indexTotalOriginScoreBak",
+            ROUND(self.sub_score,1)+ROUND(self.self_score,1) as indexTotalOriginScore,
             fact.WEIGHT AS "indexTotalSupWeight",
             ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore",
             ROUND(self.self_score,1) AS selfOriginScore,

epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunityScoreDao.xml

@@ -25,7 +25,8 @@
         SELECT
             fact.index_code AS "indexCode",
             ROUND(ROUND(fact.score,1)*fact.WEIGHT, 1) AS "indexTotal",
-            ROUND(fact.score,1) AS "indexTotalOriginScore",
+            ROUND(fact.score,1) AS "indexTotalOriginScoreBak",
+            ROUND(self.self_score, 1)+ROUND(self.sub_score, 1) as indexTotalOriginScore,
             fact.WEIGHT AS "indexTotalSupWeight",
             ROUND(ROUND(self.self_score,1)*fact.WEIGHT, 1) AS "agencyScore",
             ROUND(self.self_score, 1) AS selfOriginScore,

epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridScoreDao.xml

@@ -25,7 +25,8 @@
         SELECT
             fact.index_code AS "indexCode",
             ROUND(ROUND(fact.score,1)*fact.WEIGHT, 1) AS "indexTotal",
-            ROUND(fact.score,1) AS "indexTotalOriginScore",
+            ROUND(fact.score,1) AS "indexTotalOriginScoreBak",
+            ROUND(self.self_score, 1)+ROUND(self.sub_score, 1) as indexTotalOriginScore,
             fact.WEIGHT AS "indexTotalSupWeight",
             ROUND(ROUND(self.self_score,1)*fact.WEIGHT, 1) AS "agencyScore",
             ROUND(self.self_score, 1) AS selfOriginScore,

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexCollDistrictDepartmentServiceImpl.java

@@ -122,6 +122,7 @@ public class IndexCollDistrictDepartmentServiceImpl implements IndexCollDistrict
 						BigDecimal sum = new BigDecimal(item.getSum());
 						BigDecimal one = new BigDecimal(NumConstant.ONE);
 						entity.setClosedProjectRatio(one.divide(sum.divide(count), NumConstant.SIX, RoundingMode.HALF_UP));
+						entity.setClosedProjectRatio(sum.divide(count).setScale(NumConstant.SIX, RoundingMode.HALF_UP));
 					}
 				}));
 			}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectLogDailyServiceImpl.java

@@ -269,8 +269,8 @@ public class FactOriginProjectLogDailyServiceImpl extends BaseServiceImpl<FactOr
                     //每个机关的项目平均耗时
                     BigDecimal avgCost = new BigDecimal(total).divide(new BigDecimal(v.size()),4, BigDecimal.ROUND_HALF_UP);
 
-                    efficiencyMap.put(k,BigDecimal.ONE.divide(avgCost,4, BigDecimal.ROUND_HALF_UP));
-
+                    //efficiencyMap.put(k,BigDecimal.ONE.divide(avgCost,4, BigDecimal.ROUND_HALF_UP));
+                    efficiencyMap.put(k,avgCost.setScale(6,BigDecimal.ROUND_HALF_UP));
                 }else{
                     efficiencyMap.put(k,BigDecimal.ZERO);
                 }