From de462cca87a041cc73889be62986db8446a24ef2 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 02 四月 2026 17:12:01 +0800
Subject: [PATCH] 修改bug
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DeviceUsageServiceImpl.java | 53 ++++++++++-------------------------------------------
1 files changed, 10 insertions(+), 43 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 d25d24b..94aa868 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
@@ -418,7 +418,7 @@
@Override
public List<EntrustDeviceListVo> deviceList(Page<EntrustDeviceListVo> page, EntrustDeviceListQuery query) {
- String startTime = query.getStartTime().replace("年", "-").replace("月", "-").replace("日", "-");
+ String startTime = query.getStartTime();
String endTime = query.getEndTime();
// 查询在建工程项目（usage_type 表示项目用途类型，假设 0 表示在建工程）
@@ -435,7 +435,7 @@
.eq(Project::getStatus, 1) // 在建项目
.or(w -> w
.eq(Project::getStatus, 2) // 已完成项目
- .between(Project::getSuccessTime, startTime, endTime) // 完成时间 >= 开始日期// 完成时间 <= 结束日期
+ // 完成时间 >= 开始日期// 完成时间 <= 结束日期
)
);
break;
@@ -447,66 +447,33 @@
.eq(Project::getStatus, 1) // 在建项目
.or(w -> w
.eq(Project::getStatus, 2) // 已完成项目
- .between(Project::getSuccessTime, startTime, endTime) // 完成时间 >= 开始日期// 完成时间 <= 结束日期
+ // 完成时间 >= 开始日期// 完成时间 <= 结束日期
)
);
break;
}
List<Integer> projectIds = projectMapper.selectList(projectWrapper).stream().map(Project::getId).collect(Collectors.toList());
+ if(projectIds.isEmpty()){
+ projectIds.add(-1);
+ }
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()) {
- deviceIds.add(-1);
- }
- LambdaQueryWrapper<Record> recordWrapper = new LambdaQueryWrapper<>();
- recordWrapper.eq(Record::getRecordType, "error")
- .isNotNull(Record::getDeviceId)
- .in(Record::getDeviceId, deviceIds)
- .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())) {
- Record record = records.stream().filter(e -> e.getDeviceId().equals(deviceListVo.getId())).findFirst()
- .orElse(null);
- if (record != null) {
- Task task = taskMapper.selectById(record.getCheckTaskId());
- if (task != null) {
- deviceListVo.setCheckTime(task.getCreateTime());
- }
- deviceListVo.setCheckResult("已检查");
- }
+ if (deviceListVo.getCheckTime() != null) {
+ deviceListVo.setCheckResult("已检查");
} else {
deviceListVo.setCheckResult("未检查");
- deviceListVo.setCheckTime(null);
-
}
-//
-// LocalDateTime checkTime = deviceListVo.getCheckTime();
-// // 判断checkTime是否是本月的时间
-// if (checkTime != null && YearMonth.from(checkTime).equals(YearMonth.now())) {
-// deviceListVo.setCheckResult("已检查");
-// }else {
-// deviceListVo.setCheckResult("未检查");
-// }
}
return deviceList;
}
@Override
public List<ErrorListVo> errorList(Page<ErrorListVo> page, ErrorListQuery query) throws ParseException {
- String startTime;
- String endTime;
+ String startTime=query.getStartTime();
+ String endTime=query.getEndTime();
// 查询在建工程项目（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<>();
if(query.getCategory()!=null) {
switch (query.getCategory()) {
--
Gitblit v1.7.1