From 96dd6b945f014fa84e3b478a9939a5b222b15c71 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 2 Jun 2021 15:30:19 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BA=A2=E9=BB=84=E7=BB=BF=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/screen/ColorProjectTotalFormDTO.java | 6 ++ .../screen/ScreenProjectDataDao.java | 4 +- .../screen/impl/ScreenProjectServiceImpl.java | 17 ++++- .../mapper/screen/ScreenProjectDataDao.xml | 68 ++++++++++++------- 4 files changed, 67 insertions(+), 28 deletions(-) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/screen/ColorProjectTotalFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/screen/ColorProjectTotalFormDTO.java index 651808e10e..e115815e44 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/screen/ColorProjectTotalFormDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/screen/ColorProjectTotalFormDTO.java @@ -1,5 +1,6 @@ package com.epmet.dto.form.screen; +import com.epmet.commons.tools.constant.NumConstant; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -27,4 +28,9 @@ public class ColorProjectTotalFormDTO implements Serializable { * 行政区域码【平阴必填】 */ private String areaCode; + + /** + * 绿灯事件查询几个月的数据 + */ + private Integer monthCount = NumConstant.ONE; } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectDataDao.java index 43801dabda..2ee4a79202 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectDataDao.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectDataDao.java @@ -36,7 +36,7 @@ public interface ScreenProjectDataDao { * @author zxc * @date 2021/6/1 3:48 下午 */ - List selectColorProjectByAgencyId(@Param("agencyId") String agencyId); + List selectColorProjectByAgencyId(@Param("agencyId") String agencyId,@Param("monthCount")Integer monthCount); /** * @Description 根据areaCode查询事件 @@ -44,5 +44,5 @@ public interface ScreenProjectDataDao { * @author zxc * @date 2021/6/1 3:48 下午 */ - List selectColorProjectByAreaCode(@Param("areaCode") String areaCode); + List selectColorProjectByAreaCode(@Param("areaCode") String areaCode,@Param("level")Integer level,@Param("monthCount")Integer monthCount); } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java index 153db70313..2e1e8babcf 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java @@ -156,6 +156,8 @@ public class ScreenProjectServiceImpl implements ScreenProjectService { /** * @Description 红黄绿事件总数 + * 绿色事件查询近30天，红色和黄色查询全部 + * 可以添加传参 monthCount，查询几个月的绿色事件 * @Param formDTO * @author zxc * @date 2021/6/1 3:20 下午 @@ -165,9 +167,20 @@ public class ScreenProjectServiceImpl implements ScreenProjectService { ColorProjectTotalResultDTO result = new ColorProjectTotalResultDTO(); List list = new ArrayList<>(); if (StringUtils.isEmpty(formDTO.getAreaCode())){ - list = screenProjectDataDao.selectColorProjectByAgencyId(formDTO.getAgencyId()); + list = screenProjectDataDao.selectColorProjectByAgencyId(formDTO.getAgencyId(), formDTO.getMonthCount()); }else { - list = screenProjectDataDao.selectColorProjectByAreaCode(formDTO.getAreaCode()); + List colorProjectTotal1 = screenProjectDataDao.selectColorProjectByAreaCode(formDTO.getAreaCode(), NumConstant.ONE, formDTO.getMonthCount()); + if (!CollectionUtils.isEmpty(colorProjectTotal1)){ + list.addAll(colorProjectTotal1); + } + List colorProjectTotal2 = screenProjectDataDao.selectColorProjectByAreaCode(formDTO.getAreaCode(), NumConstant.TWO, formDTO.getMonthCount()); + if (!CollectionUtils.isEmpty(colorProjectTotal2)){ + list.addAll(colorProjectTotal2); + } + List colorProjectTotal3 = screenProjectDataDao.selectColorProjectByAreaCode(formDTO.getAreaCode(), NumConstant.THREE, formDTO.getMonthCount()); + if (!CollectionUtils.isEmpty(colorProjectTotal3)){ + list.addAll(colorProjectTotal3); + } } // 事件级别 红色1级：已超期；黄色2级:即将超期；绿色3级：未超期 if (!CollectionUtils.isEmpty(list)){ diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml index aed4954ead..210d0a1b27 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml @@ -115,38 +115,58 @@