From db1a8cd3c7d8423f39bb2bf47bc908d78e3db622 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 14 十一月 2023 16:00:00 +0800
Subject: [PATCH] 添加时间筛选条件
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/MaintenanceStandardDetailServiceImpl.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/MaintenanceStandardDetailServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/MaintenanceStandardDetailServiceImpl.java
index 4e241a9..55c91e8 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/MaintenanceStandardDetailServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/MaintenanceStandardDetailServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.eam.entity.DailyInspectionStandardDetail;
+import org.jeecg.modules.eam.entity.Equipment;
import org.jeecg.modules.eam.entity.MaintenanceStandard;
import org.jeecg.modules.eam.entity.MaintenanceStandardDetail;
import org.jeecg.modules.eam.mapper.DailyInspectionStandardDetailMapper;
@@ -12,7 +13,9 @@
import org.jeecg.modules.eam.model.MaintenanceCycleVo;
import org.jeecg.modules.eam.model.MaintenanceModeVo;
import org.jeecg.modules.eam.service.IDailyInspectionStandardDetailService;
+import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.service.IMaintenanceStandardDetailService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -27,10 +30,14 @@
@Service
public class MaintenanceStandardDetailServiceImpl extends ServiceImpl<MaintenanceStandardDetailMapper, MaintenanceStandardDetail> implements IMaintenanceStandardDetailService {
+ @Autowired
+ private IEamEquipmentService equipmentService;
+
@Override
- public List<Map<String, Object>> getMaintenanceStandardDetailList(String maintenanceStandardId) {
+ public List<Map<String, Object>> getMaintenanceStandardDetailList(String maintenanceStandardId,String equipmentId) {
List<Map<String, Object>> maintenanceStandardDetailList = super.baseMapper.getMaintenanceStandardDetailList(maintenanceStandardId);
- List<MaintenanceCycleVo> maintenanceCycles = super.baseMapper.getMaintenanceCycle();
+ Equipment equipment = equipmentService.getById(equipmentId);
+ List<MaintenanceCycleVo> maintenanceCycles = super.baseMapper.getPeriodicMaintenanceCycle(equipment.getEquipmentImportanceId());
List<MaintenanceModeVo> maintenanceModes = super.baseMapper.getMaintenanceMode();
for (Map<String, Object> map : maintenanceStandardDetailList) {
map.put("maintenanceCycles",maintenanceCycles);
@@ -62,6 +69,16 @@
return super.baseMapper.getMaintenanceCycle();
}
+ /**
+ * 鍛ㄦ湡鎬т繚鍏� 鏍规嵁璁惧鍙拌处ABC鏍囪瘑鑾峰彇涓変繚淇濆吇鍛ㄦ湡
+ * @return
+ */
+ @Override
+ public List<MaintenanceCycleVo> getPeriodicMaintenanceCycle(String importanceFlag) {
+ return super.baseMapper.getPeriodicMaintenanceCycle(importanceFlag);
+ }
+
+
@Override
public List<MaintenanceModeVo> getMaintenanceMode() {
return super.baseMapper.getMaintenanceMode();
--
Gitblit v1.9.3