工作日志接口修改

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不能为空")

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;
 }

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<>();

epmet-module/data-report/data-report-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgMonthlyDao.xml

@@ -28,6 +28,7 @@
         AND sw.month_id >= #{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