From ce3f55e4daea0640fd5065b8e655c3b177e79b9b Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期一, 25 八月 2025 15:55:22 +0800
Subject: [PATCH] 设备管理首页列表接口
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java
index abd8ec3..97133c1 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java
@@ -814,6 +814,7 @@
*/
@Override
public IPage<EamThirdMaintenanceOrder> maintenanceList(String code, Page<EamThirdMaintenanceOrder> page){
+ IPage<EamThirdMaintenanceOrder> eamThirdMaintenanceOrderIPage=new Page<>();
// 鐢ㄦ埛鏁版嵁鏉冮檺妫�鏌�
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if (sysUser == null) {
@@ -852,23 +853,30 @@
switch (code){
case "bysbzs":
// 鏈湀涓変繚璁″垝鎬绘暟
- return this.baseMapper.queryPageList(page,queryWrapper.clone().like("maintenance_date", currentYearMonth));
+ eamThirdMaintenanceOrderIPage=this.baseMapper.queryPageList(page,queryWrapper.clone().like("maintenance_date", currentYearMonth));
+ break;
case "bwc":
// 鏈湀瀹屾垚
- return this.baseMapper.queryPageList(page,queryWrapper.clone().like("maintenance_date", currentYearMonth)
+ eamThirdMaintenanceOrderIPage=this.baseMapper.queryPageList(page,queryWrapper.clone().like("maintenance_date", currentYearMonth)
.eq("maintenance_status", ThirdMaintenanceStatusEnum.COMPLETE.name()));
+ break;
case "xysb":
// 涓嬫湀涓変繚璁″垝
String nextMonth = LocalDate.now().plusMonths(1).format(DateTimeFormatter.ofPattern("yyyy-MM"));
- return this.baseMapper.queryPageList(page,queryWrapper.clone().like("maintenance_date", nextMonth));
+ eamThirdMaintenanceOrderIPage=this.baseMapper.queryPageList(page,queryWrapper.clone().like("maintenance_date", nextMonth));
+ break;
case "xxysb":
// 涓嬩笅鏈堜笁淇濊鍒�
String nextNextMonth = LocalDate.now().plusMonths(2).format(DateTimeFormatter.ofPattern("yyyy-MM"));
- return this.baseMapper.queryPageList(page,queryWrapper.clone().like("maintenance_date", nextNextMonth));
+ eamThirdMaintenanceOrderIPage=this.baseMapper.queryPageList(page,queryWrapper.clone().like("maintenance_date", nextNextMonth));
+ break;
default:
break;
}
- return null;
+ eamThirdMaintenanceOrderIPage.getRecords().forEach(eamThirdMaintenanceOrder -> {
+ eamThirdMaintenanceOrder.setTechnologyStatus(eamEquipmentExtendService.getById(eamThirdMaintenanceOrder.getEquipmentId()).getTechnologyStatus());
+ });
+ return eamThirdMaintenanceOrderIPage;
}
/**
--
Gitblit v1.9.3