Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml

@@ -23,7 +23,7 @@
             AND rankData.PARENT_ID = #{agencyId}
             AND rankData.MONTH_ID = #{monthId}
         ORDER BY
-            (rankData.RESPONSE_RATIO + rankData.RESOLVED_RATIO + rankData.GOVERN_RATIO + rankData.SATISFACTION_RATIO) DESC,rankData.RESPONSE_RATIO DESC,rankData.RESOLVED_RATIO DESC,rankData.GOVERN_RATIO DESC,rankData.SATISFACTION_RATIO DESC
+            rankData.RESPONSE_RATIO DESC
     </select>
 
     <!--  基层治理-治理能力榜单 多客户版，调用此sql -->
@@ -77,10 +77,7 @@
             AND rankData.MONTH_ID =#{monthId}
         )
         ORDER BY
-        RESPONSE_RATIO DESC,
-        RESOLVED_RATIO DESC,
-        GOVERN_RATIO DESC,
-        SATISFACTION_RATIO DESC
+        RESPONSE_RATIO DESC
     </select>
 
 </mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml

@@ -25,13 +25,7 @@
             AND rankData.ALL_PARENT_IDS LIKE CONCAT('%',#{agencyId},'%')
             AND rankData.MONTH_ID = #{monthId}
             ORDER BY
-            (rankData.PARTY_TOTAL + rankData.GROUP_TOTAL + rankData.ISSUE_TOTAL + rankData.PROJECT_TOTAL + rankData.CLOSE_PROJECT_RATIO + rankData.SATISFACTION_RATIO) DESC,
-            rankData.PARTY_TOTAL DESC,
-            rankData.GROUP_TOTAL DESC,
-            rankData.ISSUE_TOTAL DESC,
-            rankData.PROJECT_TOTAL DESC,
-            rankData.CLOSE_PROJECT_RATIO DESC,
-            rankData.SATISFACTION_RATIO DESC
+            rankData.PARTY_TOTAL DESC
 
     </select>
 
@@ -60,12 +54,6 @@
                     and scg.AREA_CODE like CONCAT('%',#{areaCode},'%')
                     AND rankData.MONTH_ID = #{monthId}
                     ORDER BY
-                    (rankData.PARTY_TOTAL + rankData.GROUP_TOTAL + rankData.ISSUE_TOTAL + rankData.PROJECT_TOTAL + rankData.CLOSE_PROJECT_RATIO + rankData.SATISFACTION_RATIO) DESC,
-                    rankData.PARTY_TOTAL DESC,
-                    rankData.GROUP_TOTAL DESC,
-                    rankData.ISSUE_TOTAL DESC,
-                    rankData.PROJECT_TOTAL DESC,
-                    rankData.CLOSE_PROJECT_RATIO DESC,
-                    rankData.SATISFACTION_RATIO DESC
+                    rankData.PARTY_TOTAL DESC
     </select>
 </mapper>

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

@@ -303,9 +303,8 @@ public class FactOriginExtractServiceImpl implements FactOriginExtractService {
     @Override
     public Future<?> submitProjectRelationData(ExtractOriginFormDTO param, List<String> finalDaysBetween) {
         Future<?> submit = threadPool.submit(() -> {
-            ExtractOriginFormDTO paramNew = null;
+            ExtractOriginFormDTO paramNew = ConvertUtils.sourceToTarget(param, ExtractOriginFormDTO.class);
             if (CollectionUtils.isEmpty(finalDaysBetween)) {
-                paramNew = ConvertUtils.sourceToTarget(param, ExtractOriginFormDTO.class);
                 try {
                     projectExtractService.saveOriginProjectDaily(paramNew);
                 } catch (Exception e) {