From 1800c05a61a53d528e4f137fa42413cb0bf26734 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 18 四月 2025 16:21:15 +0800
Subject: [PATCH] art: 设备管理-周保工单-自动生成周保，周保过期未保养标记过期
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
index b6e17d8..abc92aa 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java
@@ -28,6 +28,7 @@
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
@@ -61,7 +62,8 @@
queryWrapper.in("e.equipment_code", equipArr);
} else {
//娌℃湁閫夋嫨璁惧锛屾牴鎹溅闂磋繃婊よ澶�
- queryWrapper.exists("select 1 from mdc_user_production t where t.user_id={0} and t.pro_id=e.org_id ", sysUser.getId()); }
+ queryWrapper.exists("select 1 from mdc_user_production t where t.user_id={0} and t.pro_id=e.org_id ", sysUser.getId());
+ }
if(eamMaintenanceStandard != null) {
//缂栫爜 妯＄硦鏌ヨ
if(StringUtils.isNotBlank(eamMaintenanceStandard.getStandardCode())) {
@@ -277,7 +279,18 @@
query.setEquipmentId(equipmentId);
query.setEquipmentCode(keyword);
query.setEquipmentName(keyword);
+ query.setMaintenanceCategory(maintenanceCategory);
+ query.setStandardStatus(MaintenanceStandardStatusEnum.NORMAL.name());
IPage<EamMaintenanceStandard> pageData = this.queryPageList(page, query);
return pageData.getRecords();
}
+
+ @Override
+ public List<EamMaintenanceStandard> queryListByCategory(String maintenanceCategory) {
+ LambdaQueryWrapper<EamMaintenanceStandard> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(EamMaintenanceStandard::getDelFlag, CommonConstant.DEL_FLAG_0);
+ queryWrapper.eq(EamMaintenanceStandard::getMaintenanceCategory, maintenanceCategory);
+ queryWrapper.eq(EamMaintenanceStandard::getStandardStatus, MaintenanceStandardStatusEnum.NORMAL.name());
+ return eamMaintenanceStandardMapper.selectList(queryWrapper);
+ }
}
--
Gitblit v1.9.3