From 4045944558fcff4838f90f37f36fe83803c6505d Mon Sep 17 00:00:00 2001 From: cdf <857448963@qq.com> Date: Wed, 5 Jun 2024 14:53:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=8A=B6=E6=80=81=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/param/device/QuitRunningDeviceParam.java | 6 ++++++ .../pojo/param/device/SupervisionDevMainReportParam.java | 6 ++++++ .../pojo/param/device/SupervisionTempLineDebugParam.java | 6 ++++++ .../param/device/SupervisionTempLineReportParam.java | 3 +++ .../pojo/param/leaflet/WarningLeafletParam.java | 6 +++++- .../pojo/vo/problem/SupervisionUserComplaintVO.java | 2 ++ .../device/impl/QuitRunningDeviceServiceImpl.java | 5 +++++ .../impl/SupervisionDevMainReportPOServiceImpl.java | 9 ++++----- .../impl/SupervisionTempLineDebugPOServiceImpl.java | 9 +++++++++ .../impl/SupervisionTempLineReportServiceImpl.java | 6 ++++++ .../service/user/impl/UserReportNormalServiceImpl.java | 8 +++----- 11 files changed, 55 insertions(+), 11 deletions(-) diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/QuitRunningDeviceParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/QuitRunningDeviceParam.java index 1fc1ec547..e9d0f0855 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/QuitRunningDeviceParam.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/QuitRunningDeviceParam.java @@ -120,6 +120,12 @@ public class QuitRunningDeviceParam implements Serializable { @ApiModelProperty(value = "设备编号") private String deviceId; + /** + * 1:审批中；2：审批通过；3：审批不通过；4：已取消 + */ + @ApiModelProperty(value = "审批状态") + private Integer status; + } diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionDevMainReportParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionDevMainReportParam.java index 0e390019f..86f51d46a 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionDevMainReportParam.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionDevMainReportParam.java @@ -179,5 +179,11 @@ public class SupervisionDevMainReportParam { @ApiModelProperty(value = "填报部门") private String orgNo; + /** + * 1:审批中；2：审批通过；3：审批不通过；4：已取消 + */ + @ApiModelProperty(value = "审批状态") + private Integer status; + } } diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineDebugParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineDebugParam.java index 021c02c04..9ae108edc 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineDebugParam.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineDebugParam.java @@ -73,5 +73,11 @@ public class SupervisionTempLineDebugParam { private List statueList; + /** + * 1:审批中；2：审批通过；3：审批不通过；4：已取消 + */ + @ApiModelProperty(value="1:审批中；2：审批通过；3：审批不通过；4：已取消") + private Integer status; + } } diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineReportParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineReportParam.java index acfa87837..e4f0407cf 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineReportParam.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineReportParam.java @@ -271,5 +271,8 @@ public class SupervisionTempLineReportParam { private List statueList; + @ApiModelProperty(value = "审核状态") + private Integer status; + } } diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/leaflet/WarningLeafletParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/leaflet/WarningLeafletParam.java index 4243a3076..e1e2deb1b 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/leaflet/WarningLeafletParam.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/leaflet/WarningLeafletParam.java @@ -116,7 +116,11 @@ public class WarningLeafletParam implements Serializable{ @EqualsAndHashCode(callSuper = true) public static class WarningLeafletQueryParam extends BaseParam { - + /** + * 1:审批中；2：审批通过；3：审批不通过；4：已取消；5：待反馈 + */ + @ApiModelProperty(value = "设备编号") + private Integer status; } diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/problem/SupervisionUserComplaintVO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/problem/SupervisionUserComplaintVO.java index 861b4eb13..679ee6131 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/problem/SupervisionUserComplaintVO.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/problem/SupervisionUserComplaintVO.java @@ -48,6 +48,8 @@ public class SupervisionUserComplaintVO { @ApiModelProperty(value = "是否发起警告单(0：否；1：是)") private Integer initiateWarningFlag; + private String createBy; + diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java index 7b2af3b92..f62f80c74 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java @@ -142,6 +142,11 @@ public class QuitRunningDeviceServiceImpl extends ServiceImpl data = deptFeignClient.getDepSonIdtByDeptId(supervisionDevMainReportQuery.getOrgNo()).getData(); queryWrapper.in("supervision_dev_main_report.org_id", data); - + } + if (Objects.nonNull(supervisionDevMainReportQuery.getStatus())) { + queryWrapper.eq("supervision_dev_main_report.status", supervisionDevMainReportQuery.getStatus()); } //添加上时间范围 queryWrapper.between("supervision_dev_main_report.Create_Time", diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java index 574fb159b..0c09383ec 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java @@ -153,6 +153,11 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl data = deptFeignClient.getDepSonIdtByDeptId(supervisionTempLineDebugQuery.getOrgNo()).getData(); queryWrapper.in("supervision_temp_line_report.org_id", data); } + + if (Objects.nonNull(supervisionTempLineDebugQuery.getStatus())) { + queryWrapper.eq("supervision_temp_line_debug.status", supervisionTempLineDebugQuery.getStatus()); + } //添加上时间范围 queryWrapper.between("supervision_temp_line_debug.Create_Time", DateUtil.beginOfDay(DateUtil.parse(supervisionTempLineDebugQuery.getSearchBeginTime())), diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java index da4c332bb..5fdd0567d 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java @@ -38,6 +38,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -136,6 +137,11 @@ public class SupervisionTempLineReportServiceImpl extends ServiceImpl data = deptFeignClient.getDepSonIdtByDeptId(supervisionTempLineReportQuery.getOrgNo()).getData(); queryWrapper.in("supervision_temp_line_report.org_id", data); } + + if (Objects.nonNull(supervisionTempLineReportQuery.getStatus())) { + queryWrapper.eq("supervision_temp_line_report.status", supervisionTempLineReportQuery.getStatus()); + } + //添加上时间范围 queryWrapper.between("supervision_temp_line_report.Create_Time", DateUtil.beginOfDay(DateUtil.parse(supervisionTempLineReportQuery.getSearchBeginTime())), diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportNormalServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportNormalServiceImpl.java index 7e173ac0f..219d882d7 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportNormalServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportNormalServiceImpl.java @@ -34,10 +34,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -138,7 +135,8 @@ public class UserReportNormalServiceImpl extends ServiceImpl page = this.page(new Page<>(PageFactory.getPageNum(userReportNormalParam), PageFactory.getPageSize(userReportNormalParam)), lambdaQueryWrapper); if (CollUtil.isNotEmpty(page.getRecords())) { List ids = page.getRecords().stream().map(UserReportNormalPO::getUserReportId).distinct().collect(Collectors.toList());