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..09336cf37f 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 @@ -205,17 +205,20 @@ public class ScreenWorkRecordOrgDailyServiceImpl extends BaseServiceImpl map = dateUtils.getXpro(); + Map map = dateUtils.getXproSub(); resultDTO.setXAxis(map.values().stream().collect(Collectors.toList())); List monthIdList = map.keySet().stream().collect(Collectors.toList()); //3-1.查询当前组织及所有下级过去12个月份某项数据所有资源的统计数据 - DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyyMM"); - LocalDate today = LocalDate.now(); - formDTO.setStartMonth(today.minusMonths(NumConstant.THIRTEEN).format(fmt)); - formDTO.setEndMonth(today.minusMonths(NumConstant.ONE).format(fmt)); + formDTO.setStartMonth(monthIdList.get(NumConstant.ZERO)); + formDTO.setEndMonth(monthIdList.get(NumConstant.ELEVEN)); List list = screenWorkRecordOrgMonthlyDao.selectMonthList(formDTO); + /*log.info("legendList:"+ JSON.toJSONString(legendList,true)); + log.info("xAxis:"+JSON.toJSONString(resultDTO.getXAxis(),true)); + log.info("monthIdList:"+JSON.toJSONString(monthIdList,true)); + log.info("startMonth:"+formDTO.getStartMonth()+";endMonth="+formDTO.getEndMonth());*/ + //3-2.遍历封装数据并返回 LinkedList seriesList = new LinkedList<>(); //按资源类型封装每一个资源类型对应的过去12个月的汇总数据,某个月份没有数据的补0 @@ -253,8 +256,9 @@ public class ScreenWorkRecordOrgDailyServiceImpl extends BaseServiceImpl 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 orgIds = new ArrayList<>(); diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/utils/DateUtils.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/utils/DateUtils.java index 62356ad9f5..bfc46d03bd 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/utils/DateUtils.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/utils/DateUtils.java @@ -75,6 +75,21 @@ public class DateUtils { return result; } + public Map getXproSub(){ + Map xAxis = new HashMap<>(); + LocalDate today = LocalDate.now(); + + for(int i = NumConstant.TWELVE;i > NumConstant.ZERO; i--){ + LocalDate localDate = today.minusMonths(i); + String s = localDate.getMonth().getValue() + "月"; + xAxis.put(localDate.format(fmt),s); + } + Map result = Maps.newLinkedHashMap(); + xAxis.entrySet().stream().sorted(Map.Entry.comparingByKey()) + .forEachOrdered((e -> result.put(e.getKey(),e.getValue()))); + return result; + } + public Map getXproEndMonth(String monthId){ Map xAxis = new HashMap<>(); for(int i=NumConstant.ZERO;i <= NumConstant.ELEVEN; i++){ 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 >= #{startMonth} AND sw.month_id #{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