From d59198dda60c6009b801930acd67faad89d128d9 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 31 七月 2025 09:21:58 +0800
Subject: [PATCH] 三保工单定时任务
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
index 8ce714f..20b1c9b 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
@@ -261,7 +261,7 @@
list(new LambdaQueryWrapper<BaseFactoryUser>().eq(BaseFactoryUser::getUserId,sysUser.getId()));
if(!CollectionUtils.isEmpty(baseFactoryUserList)){
Set<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toSet());
- Set<String> factoryCode= baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getOrgCode).collect(Collectors.toSet());
+ Set<String> factoryCode = baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getOrgCode).collect(Collectors.toSet());
queryWrapper.in("e.factory_org_code", factoryCode);
} else {
return Collections.emptyList();
@@ -273,7 +273,7 @@
queryWrapper.or().like("e.equipment_name", keyword);
}
if(StringUtils.isNotBlank(factoryOrgCode)){
- queryWrapper.eq("e.factory_org_code", factoryOrgCode);
+ queryWrapper.likeRight("e.factory_org_code", factoryOrgCode);
}
queryWrapper.eq("e.del_flag", CommonConstant.DEL_FLAG_0);
IPage<EamEquipment> pageResult = eamEquipmentMapper.queryPageList(page, queryWrapper);
@@ -417,6 +417,16 @@
return this.getBaseMapper().selectTechnicalEquipmentList(queryWrapper);
}
+ @Override
+ public List<EamEquipment> selectThreeMaintenanceEquipmentList() {
+ QueryWrapper<EamEquipment> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("e.del_flag", CommonConstant.DEL_FLAG_0);
+ queryWrapper.ne("ext.maintenance_status", MaintenanceStatusEnum.PROHIBITED.name());
+ queryWrapper.isNotNull("ext.third_maintenance_period");
+ queryWrapper.isNotNull("ext.next_third_maintenance");
+ return this.getBaseMapper().selectThreeMaintenanceEquipmentList(queryWrapper);
+ }
+
/**
* 鑾峰彇鎵�鏈夌殑浜х嚎id锛堝寘鍚墍鏈変笂绾э級
*/
--
Gitblit v1.9.3