From bc1e19dd5e324a729b395f63408ac29d3854ccfc Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 04 三月 2026 14:27:18 +0800
Subject: [PATCH] 修改bug
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceUsageServiceImpl.java | 355 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 283 insertions(+), 72 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceUsageServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceUsageServiceImpl.java
index dfa1e8b..f6cdd43 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceUsageServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceUsageServiceImpl.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -31,7 +32,7 @@
/**
* <p>
- * 服务实现类
+ * 服务实现类
* </p>
*
* @author administrator
@@ -65,7 +66,7 @@
// 判断checkTime是否是本月的时间
if (checkTime != null && YearMonth.from(checkTime).equals(YearMonth.now())) {
deviceListVo.setCheckResult("已检查");
- }else {
+ } else {
deviceListVo.setCheckResult("未检查");
}
}
@@ -79,7 +80,7 @@
@Override
- public List<EntrustProjectVo> projectList( Page<EntrustProjectVo> page,EntrustListQuery query) {
+ public List<EntrustProjectVo> projectList(Page<EntrustProjectVo> page, EntrustListQuery query) {
Integer pageNum = query.getPageNum();
Integer pageSize = query.getPageSize();
@@ -91,10 +92,10 @@
if (query.getClientId() != null) {
projectWrapper.eq(Project::getClientId, query.getClientId());
}
- if (StringUtils.hasLength(query.getName())){
+ if (StringUtils.hasLength(query.getName())) {
projectWrapper.like(Project::getName, query.getName());
}
- switch (query.getCategory()){
+ switch (query.getCategory()) {
case 1:
// 查询在建资产项目
projectWrapper.eq(Project::getDeleted, false)
@@ -103,7 +104,7 @@
.eq(Project::getStatus, 1) // 在建项目
.or(w -> w
.eq(Project::getStatus, 2) // 已完成项目
- .between(Project::getSuccessTime, startTime,endTime) // 完成时间 >= 开始日期// 完成时间 <= 结束日期
+ .between(Project::getSuccessTime, startTime, endTime) // 完成时间 >= 开始日期// 完成时间 <= 结束日期
)
);
break;
@@ -115,7 +116,7 @@
.eq(Project::getStatus, 1) // 在建项目
.or(w -> w
.eq(Project::getStatus, 2) // 已完成项目
- .between(Project::getSuccessTime, startTime,endTime) // 完成时间 >= 开始日期// 完成时间 <= 结束日期
+ .between(Project::getSuccessTime, startTime, endTime) // 完成时间 >= 开始日期// 完成时间 <= 结束日期
)
);
break;
@@ -123,7 +124,7 @@
List<Project> projects = projectMapper.selectList(projectWrapper);
List<Integer> projectIds = projects.stream().map(Project::getId).collect(Collectors.toList());
- if (projectIds.isEmpty()){
+ if (projectIds.isEmpty()) {
projectIds.add(-1);
}
query.setProjectIds(projectIds);
@@ -133,7 +134,7 @@
.eq(Task::getDeleted, false);
List<Task> taskList = taskMapper.selectList(taskWrapper);
List<Integer> checkTaskIds = taskList.stream().map(Task::getId).collect(Collectors.toList());
- if (checkTaskIds.isEmpty()){
+ if (checkTaskIds.isEmpty()) {
checkTaskIds.add(-1);
}
// 查询重大隐患记录（level 表示隐患等级，0 表示重大隐患）
@@ -142,81 +143,160 @@
.in(Record::getCheckTaskId, checkTaskIds)
.eq(Record::getLevel, 0); // 重大隐患等级
List<Integer> recordIds = new ArrayList<>(recordMapper.selectList(recordWrapper).stream().map(Record::getId).toList());
- if (recordIds.isEmpty()){
+ if (recordIds.isEmpty()) {
recordIds.add(-1);
}
Map<Integer, Integer> projectMap = projectMapper.selectList(new LambdaQueryWrapper<Project>()
+
.eq(Project::getDeleted, false)).stream().collect(Collectors.toMap(Project::getId, Project::getClientId));
- Map<Integer, String> clientParamMap = clientParamMapper.selectList(new LambdaQueryWrapper<ClientParam>())
+ Map<Integer, String> clientParamMap = clientParamMapper.selectList(new LambdaQueryWrapper<ClientParam>()
+ .isNotNull(ClientParam::getUnderConstructionProject))
.stream().collect(Collectors.toMap(ClientParam::getClientId, ClientParam::getUnderConstructionProject));
+ Map<Integer, String> assetParamMap = clientParamMapper.selectList(new LambdaQueryWrapper<ClientParam>()
+ .isNotNull(ClientParam::getAssetProject))
+ .stream().collect(Collectors.toMap(ClientParam::getClientId, ClientParam::getAssetProject));
Map<Integer, List<Task>> taskMap = taskMapper.selectList(new LambdaQueryWrapper<Task>()
.ge(Task::getCreateTime, startTime)
.le(Task::getCreateTime, LocalDateTime.now())
.in(Task::getId, checkTaskIds)
.isNotNull(Task::getProjectId))
.stream().collect(Collectors.groupingBy(Task::getProjectId));
+ Map<Integer, Task> taskRecordMap = taskMapper.selectList(new LambdaQueryWrapper<Task>()
+ .ge(Task::getCreateTime, startTime)
+ .le(Task::getCreateTime, LocalDateTime.now())
+ .in(Task::getId, checkTaskIds)
+ .isNotNull(Task::getProjectId))
+ .stream().collect(Collectors.toMap(Task::getId, e -> e));
Map<Integer, List<EvalResult>> resultMap = evalResultMapper.selectList(new LambdaQueryWrapper<EvalResult>()
.in(EvalResult::getCheckTaskId, checkTaskIds)
).stream().collect(Collectors.groupingBy(EvalResult::getProjectId));
List<Record> records = recordMapper.selectList(new LambdaQueryWrapper<Record>()
- .in(Record::getId, recordIds)
+ .in(Record::getId, recordIds)
.eq(Record::getDeleted, false));
- List<EntrustProjectVo> deviceList = this.baseMapper.projectList(page,query);
+ List<EntrustProjectVo> deviceList = this.baseMapper.projectList(page, query);
for (EntrustProjectVo deviceListVo : deviceList) {
- List<EvalResult> evalResults = resultMap.get(deviceListVo.getId());
- if (evalResults!=null){
- float temp =0;
+ if (query.getCategory() == 1) {
+ // 在建
+ List<EvalResult> evalResults = resultMap.get(deviceListVo.getId());
+ if (evalResults != null) {
+ float temp = 0;
// 计算安全检查平均分
- float avgSafetyScore = (float)evalResults.stream()
+ float avgSafetyScore = (float) evalResults.stream()
.filter(e -> e.getScore() != null)
.mapToDouble(EvalResult::getScore)
.average()
.orElse(0.0);
- // 计算设备检查平均分（需要解析 device_res_map）
- List<Float> deviceScores = evalResults.stream()
- .filter(e -> StringUtils.hasText(e.getDeviceResMap()))
- .map(e -> calculateDeviceScore(e.getDeviceResMap()))
- .filter(score -> score != null && score > 0)
- .toList();
+ // 计算设备检查平均分（需要解析 device_res_map）
+ List<Float> deviceScores = evalResults.stream()
+ .filter(e -> StringUtils.hasText(e.getDeviceResMap()))
+ .map(e -> calculateDeviceScore(e.getDeviceResMap()))
+ .filter(score -> score != null && score > 0)
+ .toList();
- if (!deviceScores.isEmpty()) {
- float avgDeviceScore =(float) deviceScores.stream()
- .mapToDouble(Float::doubleValue)
- .average()
- .orElse(0.0);
- temp = (avgSafetyScore + avgDeviceScore)/2;
+ if (!deviceScores.isEmpty()) {
+ float avgDeviceScore = (float) deviceScores.stream()
+ .mapToDouble(Float::doubleValue)
+ .average()
+ .orElse(0.0);
+ temp = (avgSafetyScore + avgDeviceScore) / 2;
+ }
+ Integer clientId = projectMap.get(deviceListVo.getId());
+ String s = clientParamMap.get(clientId);
+ JSONObject jsonObject = JSON.parseObject(s);
+ String a = jsonObject.getString("a");
+ String b = jsonObject.getString("b");
+ String c = jsonObject.getString("c");
+ if (temp >= Float.parseFloat(a)) {
+ deviceListVo.setRisk("A类");
+ } else if (temp >= Float.parseFloat(b)) {
+ deviceListVo.setRisk("B类");
+ } else if (temp >= Float.parseFloat(c)) {
+ deviceListVo.setRisk("C类");
+ }
+ } else {
+ deviceListVo.setRisk(null);
}
- Integer clientId = projectMap.get(deviceListVo.getId());
- String s = clientParamMap.get(clientId);
+ } else {
+
+ // 查询检查任务
+ LambdaQueryWrapper<Task> taskWrapperPro = new LambdaQueryWrapper<>();
+ taskWrapperPro.eq(Task::getProjectId, deviceListVo.getId())
+ .eq(Task::getDeleted, false);
+ List<Task> tasks = taskMapper.selectList(taskWrapperPro);
+ List<Integer> checkTaskIdsPro = tasks.stream().map(Task::getId).collect(Collectors.toList());
+
+ // 查询重大隐患记录（level 表示隐患等级，0 表示重大隐患）
+ LambdaQueryWrapper<Record> recordWrapperPro = new LambdaQueryWrapper<>();
+ recordWrapperPro.eq(Record::getDeleted, false)
+ .in(Record::getCheckTaskId, checkTaskIdsPro)
+ ; // 重大隐患等级
+ List<Record> records1 = recordMapper.selectList(recordWrapperPro);
+// long c1 = records1.stream().filter(e -> e.getLevel() != null && e.getLevel() == 0).count();
+// long c2 = records1.stream().filter(e -> e.getLevel() != null && e.getLevel() == 0).count();
+// long c3 = records1.stream().filter(e -> e.getLevel() != null && e.getLevel() == 0).count();
+// long c4 = records1.stream().filter(e -> e.getLevel() != null && e.getLevel() == 0).count();
+// // 固定资产
+// String s = clientParamMap.get(query.getClientId());
+// JSONObject jsonObject = JSON.parseObject(s);
+// JSONArray a = jsonObject.getJSONArray("a");
+// for (Object o : a) {
+// // 转化为jsonObject
+// JSONObject jsonObject1 = (JSONObject) o;
+// }
+// JSONArray b = jsonObject.getJSONArray("b");
+// for (Object o : b) {
+// // 转化为jsonObject
+// JSONObject jsonObject1 = (JSONObject) o;
+// }
+// JSONArray c = jsonObject.getJSONArray("c");
+// for (Object o : c) {
+// // 转化为jsonObject
+// JSONObject jsonObject1 = (JSONObject) o;
+// }
+ // 统计各等级隐患数量
+ Map<Integer, Long> levelCountMap = records1.stream()
+ .filter(e -> e.getLevel() != null)
+ .collect(Collectors.groupingBy(Record::getLevel, Collectors.counting()));
+
+// 获取客户参数配置
+ String s = assetParamMap.get(query.getClientId());
JSONObject jsonObject = JSON.parseObject(s);
- String a = jsonObject.getString("a");
- String b = jsonObject.getString("b");
- String c = jsonObject.getString("c");
- if (temp>=Float.parseFloat( a)){
- deviceListVo.setRisk("A类");
- }else if (temp>=Float.parseFloat( b)){
- deviceListVo.setRisk("B类");
- }else if (temp>=Float.parseFloat( c)){
- deviceListVo.setRisk("C类");
+
+// 初始化风险等级
+ String riskLevel = null;
+
+// 先判断 c 条件
+ JSONArray cArray = jsonObject.getJSONArray("c");
+ if (cArray != null && matchesCondition(cArray, levelCountMap)) {
+ riskLevel = "C类";
}
- }else{
- deviceListVo.setRisk(null);
+// 再判断 b 条件
+ else if (jsonObject.getJSONArray("b") != null && matchesCondition(jsonObject.getJSONArray("b"), levelCountMap)) {
+ riskLevel = "B类";
+ }
+// 最后判断 a 条件
+ else if (jsonObject.getJSONArray("a") != null && matchesCondition(jsonObject.getJSONArray("a"), levelCountMap)) {
+ riskLevel = "A类";
+ }
}
- List<Task> tasks = taskMap.get(deviceListVo.getId());
- if (tasks!=null&&!tasks.isEmpty()){
- List<Integer> taskIds = tasks.stream().map(Task::getId).toList();
- List<Record> recordList = records.stream().filter(e -> taskIds.contains(e.getCheckTaskId())).toList();
- Record record = recordList.stream().max(Comparator.comparing(Record::getCreateTime)).orElse(null);
- if (record!=null){
- deviceListVo.setCheckTime(record.getCreateTime());
+ List<Task> tasks = taskList.stream().filter(e -> e.getProjectId().equals(deviceListVo.getId())).toList();
+// List<Task> tasks = taskMap.get(deviceListVo.getId());
+ if (tasks != null && !tasks.isEmpty()) {
+
+ Task task1 = tasks.stream().filter(e -> e.getDate().getYear() == LocalDateTime.now().getYear() && e.getDate().getMonth().getValue() == LocalDateTime.now().getMonth().getValue()).findFirst().orElse(null);
+
+// List<Record> recordList = records.stream().filter(e -> taskIds.contains(e.getCheckTaskId())).toList();
+// Record record = recordList.stream().max(Comparator.comparing(Record::getCreateTime)).orElse(null);
+ if (task1 != null) {
+ deviceListVo.setCheckTime(task1.getDate().atStartOfDay());
deviceListVo.setCheckResult("已检查");
- }else{
+ } else {
deviceListVo.setCheckTime(null);
deviceListVo.setCheckResult("未检查");
deviceListVo.setRisk(null);
}
- }else{
+ } else {
deviceListVo.setCheckTime(null);
deviceListVo.setCheckResult("未检查");
deviceListVo.setRisk(null);
@@ -224,6 +304,40 @@
}
return deviceList;
}
+
+ /**
+ * 判断条件数组是否满足隐患统计结果
+ *
+ * @param conditionArray 条件数组，例如 [[{"4":"1"},{"4":"1"}], [{"4":"2"}]]
+ * @param levelCountMap 隐患等级统计结果，key为隐患等级，value为数量
+ * @return 是否满足条件
+ */
+ private boolean matchesCondition(JSONArray conditionArray, Map<Integer, Long> levelCountMap) {
+ for (Object item : conditionArray) {
+ if (item instanceof JSONArray) {
+ JSONArray andConditions = (JSONArray) item;
+ boolean allMatch = true;
+ for (Object condition : andConditions) {
+ if (condition instanceof JSONObject) {
+ JSONObject conditionObj = (JSONObject) condition;
+ for (Map.Entry<String, Object> entry : conditionObj.entrySet()) {
+ int level = Integer.parseInt(entry.getKey()); // 隐患等级
+ int requiredCount = Integer.parseInt(entry.getValue().toString()); // 所需数量
+ Long actualCount = levelCountMap.getOrDefault(level, 0L);
+ if (actualCount < requiredCount) {
+ allMatch = false;
+ break;
+ }
+ }
+ }
+ if (!allMatch) break;
+ }
+ if (allMatch) return true; // 满足任意一个“或”条件即可返回 true
+ }
+ }
+ return false;
+ }
+
private static Float calculateDeviceScore(String deviceResMapJson) {
try {
// 1. 解析 JSON 字符串
@@ -293,15 +407,16 @@
return null;
}
}
+
@Override
public List<EntrustProjectReportVo> projectReport(Page<EntrustProjectReportVo> page, ProjectReportListQuery query) {
- List<EntrustProjectReportVo> entrustProjectReportVoList = this.baseMapper.projectReport(page,query);
+ List<EntrustProjectReportVo> entrustProjectReportVoList = this.baseMapper.projectReport(page, query);
return entrustProjectReportVoList;
}
@Override
public List<EntrustDeviceListVo> deviceList(Page<EntrustDeviceListVo> page, EntrustDeviceListQuery query) {
- String startTime = query.getStartTime().replace("年","-").replace("月","-").replace("日","-");
+ String startTime = query.getStartTime().replace("年", "-").replace("月", "-").replace("日", "-");
String endTime = query.getEndTime();
// 查询在建工程项目（usage_type 表示项目用途类型，假设 0 表示在建工程）
@@ -309,7 +424,7 @@
if (query.getClientId() != null) {
projectWrapper.eq(Project::getClientId, query.getClientId());
}
- switch (query.getCategory()){
+ switch (query.getCategory()) {
case 1:
// 查询在建资产项目
projectWrapper.eq(Project::getDeleted, false)
@@ -318,7 +433,7 @@
.eq(Project::getStatus, 1) // 在建项目
.or(w -> w
.eq(Project::getStatus, 2) // 已完成项目
- .between(Project::getSuccessTime, startTime,endTime) // 完成时间 >= 开始日期// 完成时间 <= 结束日期
+ .between(Project::getSuccessTime, startTime, endTime) // 完成时间 >= 开始日期// 完成时间 <= 结束日期
)
);
break;
@@ -330,7 +445,7 @@
.eq(Project::getStatus, 1) // 在建项目
.or(w -> w
.eq(Project::getStatus, 2) // 已完成项目
- .between(Project::getSuccessTime, startTime,endTime) // 完成时间 >= 开始日期// 完成时间 <= 结束日期
+ .between(Project::getSuccessTime, startTime, endTime) // 完成时间 >= 开始日期// 完成时间 <= 结束日期
)
);
break;
@@ -339,7 +454,7 @@
query.setProjectIds(projectIds);
List<EntrustDeviceListVo> deviceList = this.baseMapper.deviceList(page, query);
List<Integer> deviceIds = deviceList.stream().map(EntrustDeviceListVo::getId).collect(Collectors.toList());
- if (deviceIds.isEmpty()){
+ if (deviceIds.isEmpty()) {
deviceIds.add(-1);
}
LambdaQueryWrapper<Record> recordWrapper = new LambdaQueryWrapper<>();
@@ -349,15 +464,19 @@
.eq(Record::getDeleted, false);
List<Record> records = recordMapper.selectList(recordWrapper);
List<Integer> deviceIdsRecord = records.stream().map(Record::getDeviceId).distinct().collect(Collectors.toList());
+
for (EntrustDeviceListVo deviceListVo : deviceList) {
- if (deviceIdsRecord.contains(deviceListVo.getId())){
+ if (deviceIdsRecord.contains(deviceListVo.getId())) {
Record record = records.stream().filter(e -> e.getDeviceId().equals(deviceListVo.getId())).findFirst()
.orElse(null);
- if (record!=null){
+ if (record != null) {
+ Task task = taskMapper.selectById(record.getCheckTaskId());
+ if (task != null) {
+ deviceListVo.setCheckTime(task.getCreateTime());
+ }
deviceListVo.setCheckResult("已检查");
- deviceListVo.setCheckTime(record.getCreateTime());
}
- }else{
+ } else {
deviceListVo.setCheckResult("未检查");
deviceListVo.setCheckTime(null);
@@ -376,11 +495,18 @@
@Override
public List<ErrorListVo> errorList(Page<ErrorListVo> page, ErrorListQuery query) throws ParseException {
+ String startTime;
+ String endTime;
// 查询在建工程项目（usage_type 表示项目用途类型，假设 0 表示在建工程）
- String startTime = query.getStartTime().replace("年","-").replace("月","-").replace("日","-");
- String endTime = query.getEndTime();
+ if (StringUtils.hasLength(query.getStartTime())) {
+ startTime = query.getStartTime().replace("年", "-").replace("月", "-").replace("日", "-");
+ endTime = query.getEndTime();
+ } else {
+ endTime = "";
+ startTime = "";
+ }
LambdaQueryWrapper<Project> projectWrapper = new LambdaQueryWrapper<>();
- switch (query.getCategory()){
+ switch (query.getCategory()) {
case 1:
// 查询在建资产项目
projectWrapper.eq(Project::getDeleted, false)
@@ -389,7 +515,8 @@
.eq(Project::getStatus, 1) // 在建项目
.or(w -> w
.eq(Project::getStatus, 2) // 已完成项目
- .between(Project::getSuccessTime, startTime,endTime) // 完成时间 >= 开始日期// 完成时间 <= 结束日期
+
+ .between(StringUtils.hasLength(startTime), Project::getSuccessTime, startTime, endTime) // 完成时间 >= 开始日期// 完成时间 <= 结束日期
)
);
break;
@@ -401,7 +528,7 @@
.eq(Project::getStatus, 1) // 在建项目
.or(w -> w
.eq(Project::getStatus, 2) // 已完成项目
- .between(Project::getSuccessTime, startTime,endTime) // 完成时间 >= 开始日期// 完成时间 <= 结束日期
+ .between(StringUtils.hasLength(startTime), Project::getSuccessTime, startTime, endTime) // 完成时间 >= 开始日期// 完成时间 <= 结束日期
)
);
break;
@@ -411,7 +538,7 @@
}
List<Project> projects = projectMapper.selectList(projectWrapper);
List<Integer> projectIds = projects.stream().map(Project::getId).collect(Collectors.toList());
- if (projectIds.isEmpty()){
+ if (projectIds.isEmpty()) {
projectIds.add(-1);
}
// 查询检查任务
@@ -434,14 +561,50 @@
@Override
public List<ErrorListVo> deviceErrorList(Page<ErrorListVo> page, ErrorListQuery query) {
+ String startTime;
+ String endTime;
// 查询在建工程项目（usage_type 表示项目用途类型，假设 0 表示在建工程）
+ if (StringUtils.hasLength(query.getStartTime())) {
+ startTime = query.getStartTime().replace("年", "-").replace("月", "-").replace("日", "-");
+ endTime = query.getEndTime();
+ } else {
+ endTime = "";
+ startTime = "";
+ }
LambdaQueryWrapper<Project> projectWrapper = new LambdaQueryWrapper<>();
+ switch (query.getCategory()) {
+ case 1:
+ // 查询在建资产项目
+ projectWrapper.eq(Project::getDeleted, false)
+ .ne(Project::getType, 2) // 在建工程
+ .and(wrapper -> wrapper
+ .eq(Project::getStatus, 1) // 在建项目
+ .or(w -> w
+ .eq(Project::getStatus, 2) // 已完成项目
+
+ .between(StringUtils.hasLength(startTime), Project::getSuccessTime, startTime, endTime) // 完成时间 >= 开始日期// 完成时间 <= 结束日期
+ )
+ );
+ break;
+ case 2:
+ // 查询固定资产项目
+ projectWrapper.eq(Project::getDeleted, false)
+ .eq(Project::getType, 2) // 在建工程
+ .and(wrapper -> wrapper
+ .eq(Project::getStatus, 1) // 在建项目
+ .or(w -> w
+ .eq(Project::getStatus, 2) // 已完成项目
+ .between(StringUtils.hasLength(startTime), Project::getSuccessTime, startTime, endTime) // 完成时间 >= 开始日期// 完成时间 <= 结束日期
+ )
+ );
+ break;
+ }
if (query.getClientId() != null) {
projectWrapper.eq(Project::getClientId, query.getClientId());
}
List<Project> projects = projectMapper.selectList(projectWrapper);
List<Integer> projectIds = projects.stream().map(Project::getId).collect(Collectors.toList());
- if (projectIds.isEmpty()){
+ if (projectIds.isEmpty()) {
projectIds.add(-1);
}
// 查询检查任务
@@ -458,35 +621,83 @@
List<Integer> recordIds = recordMapper.selectList(recordWrapper).stream().map(Record::getId).toList();
query.setRecordIds(recordIds);
List<ErrorListVo> errorList = this.baseMapper.deviceErrorList(page, query);
- return errorList; }
+ return errorList;
+ }
@Override
public List<ErrorListVo> safetyErrorList(Page<ErrorListVo> page, ErrorListQuery query) {
+ String startTime;
+ String endTime;
// 查询在建工程项目（usage_type 表示项目用途类型，假设 0 表示在建工程）
+ if (StringUtils.hasLength(query.getStartTime())) {
+ startTime = query.getStartTime().replace("年", "-").replace("月", "-").replace("日", "-");
+ endTime = query.getEndTime();
+ } else {
+ endTime = "";
+ startTime = "";
+ }
LambdaQueryWrapper<Project> projectWrapper = new LambdaQueryWrapper<>();
+ switch (query.getCategory()) {
+ case 1:
+ // 查询在建资产项目
+ projectWrapper
+// .eq(Project::getDeleted, false)
+ .ne(Project::getType, 2) // 在建工程
+ .and(wrapper -> wrapper
+ .eq(Project::getStatus, 1) // 在建项目
+ .or(w -> w
+ .eq(Project::getStatus, 2) // 已完成项目
+ .between(StringUtils.hasLength(startTime), Project::getSuccessTime, startTime, endTime) // 完成时间 >= 开始日期// 完成时间 <= 结束日期
+ )
+ .or(w -> w
+ .isNull(Project::getStatus) // 已完成项目
+ .between(StringUtils.hasLength(startTime), Project::getSuccessTime, startTime, endTime) // 完成时间 >= 开始日期// 完成时间 <= 结束日期
+ )
+ );
+ break;
+ case 2:
+ // 查询固定资产项目
+ projectWrapper
+// .eq(Project::getDeleted, false)
+ .eq(Project::getType, 2) // 在建工程
+ .and(wrapper -> wrapper
+ .eq(Project::getStatus, 1) // 在建项目
+ .or(w -> w
+ .eq(Project::getStatus, 2) // 已完成项目
+ .between(StringUtils.hasLength(startTime), Project::getSuccessTime, startTime, endTime) // 完成时间 >= 开始日期// 完成时间 <= 结束日期
+ )
+ .or(w -> w
+ .isNull(Project::getStatus) // 已完成项目
+// .between(StringUtils.hasLength(startTime),Project::getSuccessTime, startTime, endTime) // 完成时间 >= 开始日期// 完成时间 <= 结束日期
+ )
+ );
+ break;
+ }
if (query.getClientId() != null) {
projectWrapper.eq(Project::getClientId, query.getClientId());
}
List<Project> projects = projectMapper.selectList(projectWrapper);
List<Integer> projectIds = projects.stream().map(Project::getId).collect(Collectors.toList());
- if (projectIds.isEmpty()){
+ if (projectIds.isEmpty()) {
projectIds.add(-1);
}
// 查询检查任务
LambdaQueryWrapper<Task> taskWrapper = new LambdaQueryWrapper<>();
taskWrapper.in(Task::getProjectId, projectIds)
- .eq(Task::getDeleted, false);
+ ;
List<Task> tasks = taskMapper.selectList(taskWrapper);
List<Integer> checkTaskIds = tasks.stream().map(Task::getId).collect(Collectors.toList());
// 查询重大隐患记录（level 表示隐患等级，0 表示重大隐患）
LambdaQueryWrapper<Record> recordWrapper = new LambdaQueryWrapper<>();
recordWrapper.eq(Record::getDeleted, false)
+ .eq(Record::getRecordType, "error")
.in(Record::getCheckTaskId, checkTaskIds);
List<Integer> recordIds = recordMapper.selectList(recordWrapper).stream().map(Record::getId).toList();
query.setRecordIds(recordIds);
List<ErrorListVo> errorList = this.baseMapper.safetyErrorList(page, query);
- return errorList; }
+ return errorList;
+ }
}
--
Gitblit v1.7.1