新增状态管理查询

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

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

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineDebugParam.java

@@ -73,5 +73,11 @@ public class SupervisionTempLineDebugParam {
 
         private List<Integer> statueList;
 
+        /**
+         * 1:审批中；2：审批通过；3：审批不通过；4：已取消
+         */
+        @ApiModelProperty(value="1:审批中；2：审批通过；3：审批不通过；4：已取消")
+        private Integer status;
+
     }
 }

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineReportParam.java

@@ -271,5 +271,8 @@ public class SupervisionTempLineReportParam {
 
         private List<Integer> statueList;
 
+        @ApiModelProperty(value = "审核状态")
+        private Integer status;
+
     }
 }

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

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

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java

@@ -142,6 +142,11 @@ public class QuitRunningDeviceServiceImpl extends ServiceImpl<QuitRunningDeviceM
             //判断监测点/设备的选择
             quitRunningDeviceVOQueryWrapper.eq("supervision_quit_running_device.device_type", quitRunningDeviceQueryParam.getDeviceType());
 
+
+            if (Objects.nonNull(quitRunningDeviceQueryParam.getStatus())) {
+                quitRunningDeviceVOQueryWrapper.eq("supervision_quit_running_device.status", quitRunningDeviceQueryParam.getStatus());
+            }
+
         }
 
         //获取当前用户部门所有同事的id，查看该部门下所有的数据

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java

@@ -36,10 +36,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -161,7 +158,9 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl<Supervisi
             /*获取直接下属子单位*/
             List<String> 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",

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java

@@ -153,6 +153,11 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
             queryWrapper.in("supervision_temp_line_report.org_id", data);
 
         }
+
+        if (Objects.nonNull(supervisionTempLineDebugQuery.getStatus())) {
+            queryWrapper.eq("supervision_temp_line_report.status", supervisionTempLineDebugQuery.getStatus());
+        }
+
         //添加上时间范围
         queryWrapper.between("supervision_temp_line_report.Create_Time",
                 DateUtil.beginOfDay(DateUtil.parse(supervisionTempLineDebugQuery.getSearchBeginTime())),
@@ -177,6 +182,10 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
             List<String> 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())),

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<Supervisio
             List<String> 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())),

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.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -138,7 +135,8 @@ public class UserReportNormalServiceImpl extends ServiceImpl<UserReportNormalMap
         lambdaQueryWrapper.orderByDesc(UserReportNormalPO::getCreateTime)
                 .eq(UserReportNormalPO::getType,userReportNormalParam.getType())
                 .in(UserReportNormalPO::getCreateBy, colleaguesIds)
-                .eq(UserReportNormalPO::getUserReportId,userReportNormalParam.getUserReportId());
+                .eq(UserReportNormalPO::getUserReportId,userReportNormalParam.getUserReportId()).eq(Objects.nonNull(userReportNormalParam.getStatus()),UserReportNormalPO::getStatus,userReportNormalParam.getStatus());
+
         Page<UserReportNormalPO> page = this.page(new Page<>(PageFactory.getPageNum(userReportNormalParam), PageFactory.getPageSize(userReportNormalParam)), lambdaQueryWrapper);
         if (CollUtil.isNotEmpty(page.getRecords())) {
             List<String> ids = page.getRecords().stream().map(UserReportNormalPO::getUserReportId).distinct().collect(Collectors.toList());