From 48e50752139000967ceb99d6c62390f60a0c666a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 7 Jul 2021 17:49:23 +0800 Subject: [PATCH 1/3] =?UTF-8?q?submitProjectRelationData=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extract/todata/impl/FactOriginExtractServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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) { From 32ec19b0272f8303413dbf007a6a16a465ac2c26 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 7 Jul 2021 19:06:50 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=85=88=E8=BF=9B=E6=94=AF=E9=83=A8?= =?UTF-8?q?=E6=8C=89=E5=85=9A=E5=91=98=E6=95=B0=E9=99=8D=E5=BA=8F=E6=8E=92?= =?UTF-8?q?=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/screen/ScreenOrgRankDataDao.xml | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) 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 From e53dc0f9e0f3005cc8e0c032dc2f6e1ba29d85c2 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 7 Jul 2021 19:18:16 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=9F=BA=E5=B1=82=E6=B2=BB=E7=90=86--?= =?UTF-8?q?=E6=B2=BB=E7=90=86=E8=83=BD=E5=8A=9B=EF=BC=8C=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E6=8C=89=E7=85=A7=E2=80=9C=E5=93=8D=E5=BA=94=E7=8E=87=E9=99=8D?= =?UTF-8?q?=E5=BA=8F=E6=8E=92=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/screen/ScreenGovernRankDataDao.xml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) 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