From c4929c60b9dd376324e749fd4d04006c02197cf5 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Thu, 19 Aug 2021 09:45:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E5=86=8D=E4=BB=8E=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E4=B8=AD=E8=8E=B7=E5=8F=96=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ScreenGovernanceController.java       |  2 +-
 .../service/impl/ScreenGovernanceServiceImpl.java    | 12 +++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenGovernanceController.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenGovernanceController.java
index 0dde5b37..313eafc4 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenGovernanceController.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenGovernanceController.java
@@ -48,7 +48,7 @@ public class ScreenGovernanceController {
      */
     @PostMapping("gridgoverndaily")
     public Result gridgoverndaily(@RequestBody ScreenJobFormDTO formDto) {
-        log.info("<governrankdatadaily|网格治理指数（天）>定时任务执行");
+        log.info("<gridgoverndaily|网格治理指数（天）>定时任务执行");
         return screenGovernanceService.gridgoverndaily(formDto);
     }
 
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGovernanceServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGovernanceServiceImpl.java
index 7c9f0ebc..fc191236 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGovernanceServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGovernanceServiceImpl.java
@@ -43,9 +43,7 @@ public class ScreenGovernanceServiceImpl extends BaseServiceImpl<ScreenGovernanc
     @Override
     public Result governrankdatadaily(ScreenJobFormDTO formDto) {
         String yearMonthDay = DateUtils.formatNoSplit(DateUtils.addDateDays(new Date(), -1));
-        if (formDto.getYearMonth() != null && StringUtils.isNotBlank(formDto.getYearMonth())) {
-            yearMonthDay = formDto.getYearMonth();
-        }
+
         List<ScreenGovernRankDataDailyResultDTO> data = baseDao.governrankdatadaily();
         List<ScreenGovernRankDataDailyResultDTO> agencyData = baseDao.governrankdatadailyAgency();
         List<ScreenGovernRankDataDailyResultDTO> noRespData = baseDao.governrankdatadailyNoResp();
@@ -100,9 +98,7 @@ public class ScreenGovernanceServiceImpl extends BaseServiceImpl<ScreenGovernanc
     @Override
     public Result gridgoverndaily(ScreenJobFormDTO formDto) {
         String yearMonthDay = DateUtils.formatNoSplit(DateUtils.addDateDays(new Date(), -1));
-        if (formDto.getYearMonth() != null && StringUtils.isNotBlank(formDto.getYearMonth())) {
-            yearMonthDay = formDto.getYearMonth();
-        }
+
         List<ScreenGridGovernDailyResultDTO> data = baseDao.gridgoverndaily();
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("isFirst", true);
@@ -115,9 +111,7 @@ public class ScreenGovernanceServiceImpl extends BaseServiceImpl<ScreenGovernanc
     @Override
     public Result agencygoverndaily(ScreenJobFormDTO formDto) {
         String yearMonthDay = DateUtils.formatNoSplit(DateUtils.addDateDays(new Date(), -1));
-        if (formDto.getYearMonth() != null && StringUtils.isNotBlank(formDto.getYearMonth())) {
-            yearMonthDay = formDto.getYearMonth();
-        }
+
         List<ScreenAgencyGovernDailyResultDTO> data = baseDao.agencygoverndaily();
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("isFirst", true);