Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

新增状态管理查询

Browse Source
This commit is contained in:
cdf
2024-06-05 14:53:05 +08:00
parent 84d3f108ad
commit 4045944558
11 changed files with 55 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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，查看该部门下所有的数据

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

@@ -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.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
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",

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

@@ -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())),

6
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java
View File

@@ -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())),

8
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportNormalServiceImpl.java
View File

@@ -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<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());