diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml index dd04bb5130..26d9ac136c 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml +++ b/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 @@ -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 \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml index 6c176721d5..6908b80953 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml +++ b/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 @@ -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 \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginExtractServiceImpl.java index 2ec8212d21..7f20601afa 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginExtractServiceImpl.java +++ b/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 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) {