From 19e8c3e9e8211949fc44935d3a369467bfd6b23c Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 7 Apr 2021 17:22:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=BF=97=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/plugins/form/VoluntaryServiceTrendFormDTO.java   | 2 +-
 .../java/com/epmet/plugins/form/WorkRecordRankFormDTO.java     | 2 +-
 .../plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java      | 3 ++-
 .../resources/mapper/plugins/ScreenWorkRecordOrgMonthlyDao.xml | 2 ++
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/plugins/form/VoluntaryServiceTrendFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/plugins/form/VoluntaryServiceTrendFormDTO.java
index 63fdbc4571..037c0d895a 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/plugins/form/VoluntaryServiceTrendFormDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/plugins/form/VoluntaryServiceTrendFormDTO.java
@@ -18,7 +18,7 @@ public class VoluntaryServiceTrendFormDTO {
     @NotBlank(message = "agencyId不能为空")
     private String agencyId;
 
-    @NotBlank(message = "目前只有平阴在传，默认赋值：370124")
+    // @NotBlank(message = "目前只有平阴在传，默认赋值：370124")
     private String areaCode;
 
     @NotBlank(message = "customerId不能为空")
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/plugins/form/WorkRecordRankFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/plugins/form/WorkRecordRankFormDTO.java
index a4e5e0b9f4..7460a1a9ed 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/plugins/form/WorkRecordRankFormDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/plugins/form/WorkRecordRankFormDTO.java
@@ -36,6 +36,6 @@ public class WorkRecordRankFormDTO implements Serializable {
     @NotBlank(message = "customerId不能为空")
     private String customerId;
 
-    @NotBlank(message = "areaCode不能为空,目前只有平阴在传，默认赋值：370124")
+    // @NotBlank(message = "areaCode不能为空,目前只有平阴在传，默认赋值：370124")
     private String areaCode;
 }
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java
index d55fbf927a..c6d37bc8a3 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java
@@ -253,8 +253,9 @@ public class ScreenWorkRecordOrgDailyServiceImpl extends BaseServiceImpl<ScreenW
     public VoluntaryServiceTrendResultDTO voluntaryServiceTrend(VoluntaryServiceTrendFormDTO formDTO) {
         VoluntaryServiceTrendResultDTO resultDTO = new VoluntaryServiceTrendResultDTO();
         //近12个月的monthId集合,["202002","202003","202004","202005","202006","202007","202008","202009","202010","202011","202012","202101"]
+        //截止到上个月
         List<String> monthIdList = com.epmet.commons.tools.utils.DateUtils.getMonthIdList(formDTO.getEndMonthId(), NumConstant.ELEVEN);
-        // log.info(JSON.toJSONString(monthIdList));
+        log.info(JSON.toJSONString(monthIdList));
 
         AgencyInfoDTO agencyInfoDTO = agencyService.getAgencyInfoDTO(formDTO.getAreaCode(), formDTO.getAgencyId());
         List<String> orgIds = new ArrayList<>();
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgMonthlyDao.xml
index 9bbe13d732..6a87be93da 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgMonthlyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgMonthlyDao.xml
@@ -28,6 +28,7 @@
         AND sw.month_id &gt;= #{startMonth}
         AND sw.month_id <![CDATA[ <= ]]> #{endMonth}
         AND wrd.data_type = #{dataType}
+        and sw.CUSTOMER_ID=#{customerId}
         GROUP BY
             sw.month_id,sw.meeting_code
         ORDER BY
@@ -43,6 +44,7 @@
         FROM
          screen_work_record_org_monthly m
         WHERE m.DEL_FLAG = '0'
+        and m.CUSTOMER_ID=#{customerId}
         AND m.TYPE_CODE =(
             SELECT
             dict.RESOURCE_CODE