From bd8f7a75c36a78569da553de0e9b00d0525533f2 Mon Sep 17 00:00:00 2001 From: haungxing <1203316822@qq.com> Date: Wed, 31 Jul 2024 08:44:15 +0800 Subject: [PATCH] =?UTF-8?q?add=EF=BC=9A=E6=97=A5=E5=B8=B8=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4=E8=AE=A1=E5=88=92=E6=9F=A5=E8=AF=A2=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=AB=99=E7=82=B9=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../maintenance/dto/OperMaintenanceMonitorReportMonthDTO.java | 3 +++ .../maintenance/service/impl/OperMaintenanceMonitorServiceImpl.java | 1 + 2 files changed, 4 insertions(+) diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/dto/OperMaintenanceMonitorReportMonthDTO.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/dto/OperMaintenanceMonitorReportMonthDTO.java index fc36121..e5a7cd9 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/dto/OperMaintenanceMonitorReportMonthDTO.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/dto/OperMaintenanceMonitorReportMonthDTO.java @@ -27,4 +27,7 @@ public class OperMaintenanceMonitorReportMonthDTO implements Serializable { @ApiModelProperty(value = "机构ID") private Long deptId; + @ApiModelProperty(value = "站点编号") + private String stationCode; + } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenanceMonitorServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenanceMonitorServiceImpl.java index 660269c..8c61857 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenanceMonitorServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenanceMonitorServiceImpl.java @@ -49,6 +49,7 @@ public class OperMaintenanceMonitorServiceImpl implements IOperMaintenanceMonito eq(OperMaintenancePlanEntity::getIsDeleted, 0L); ge(OperMaintenancePlanEntity::getDisposeTime, startDate); lt(OperMaintenancePlanEntity::getDisposeTime, startDate.plusMonths(1)); + eq(StringUtil.isNotBlank(req.getStationCode()),OperMaintenancePlanEntity::getStationCode,req.getStationCode()); eq(Func.isNotEmpty(req.getDeptId()), OperMaintenancePlanEntity::getCreateDept, req.getDeptId()); }});