From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentMaintenancePlanServiceImpl.java | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 47 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentMaintenancePlanServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentMaintenancePlanServiceImpl.java
index bbd193c..caa319d 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentMaintenancePlanServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentMaintenancePlanServiceImpl.java
@@ -1,7 +1,11 @@
package org.jeecg.modules.eam.service.impl;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import org.jeecg.modules.eam.entity.Equipment;
import org.jeecg.modules.eam.entity.EquipmentMaintenancePlan;
+import org.jeecg.modules.eam.entity.MaintenanceStandard;
import org.jeecg.modules.eam.entity.MaintenanceStandardDetail;
+import org.jeecg.modules.eam.mapper.EamEquipmentMapper;
import org.jeecg.modules.eam.mapper.EquipmentMaintenancePlanDetailMapper;
import org.jeecg.modules.eam.mapper.EquipmentMaintenancePlanMapper;
import org.jeecg.modules.eam.service.IEquipmentMaintenancePlanService;
@@ -10,8 +14,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import java.io.Serializable;
-import java.util.Collection;
-import java.util.List;
+import java.util.*;
/**
* @Description: 淇濆吇璁″垝
@@ -26,6 +29,8 @@
private EquipmentMaintenancePlanMapper equipmentMaintenancePlanMapper;
@Autowired
private EquipmentMaintenancePlanDetailMapper equipmentMaintenancePlanDetailMapper;
+ @Autowired
+ private EamEquipmentMapper equipmentMapper;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -48,4 +53,44 @@
return baseMapper.getCycle(mainId,type);
}
+ @Override
+ public Map<String,Object> getStandards(List<String> equipmentIds, String maintenanceType) {
+ String msg = "";
+ Map<String,Object> map = new HashMap<>(2);
+ List<MaintenanceStandard> maintenanceStandards = new ArrayList<>();
+ for(String equipmentId:equipmentIds){
+ Equipment equipment = equipmentMapper.selectById(equipmentId);
+ List<MaintenanceStandard> list = baseMapper.getStandards(equipmentId,maintenanceType);
+ if(list.size()==0){
+ msg = msg+"缁熶竴缂栫爜涓�"+equipment.getNum()+"鐨勮澶囦笉瀛樺湪鐢熸晥淇濆吇鏍囨敞;";
+ }else if(list.size()>1){
+ msg = msg+"缁熶竴缂栫爜涓�"+equipment.getNum()+"鐨勮澶囧瓨鍦ㄥ鏉＄敓鏁堜繚鍏绘爣娉�;";
+ }else {
+ if(equipment.getIsLineEquip().equals("yes")&&maintenanceType.equals("3")){
+ String lineId = equipment.getLineId();
+ if(StringUtils.isNotBlank(lineId)){
+ List<MaintenanceStandard> lineStandard = baseMapper.getStandards(lineId,maintenanceType);
+ if(lineStandard.size()==0){
+ msg = msg+"缁熶竴缂栫爜涓�"+equipment.getNum()+"鐨勮澶囦笉瀛樺湪鐢熸晥淇濆吇鏍囨敞;";
+ }else if(list.size()>1){
+ msg = msg+"缁熶竴缂栫爜涓�"+equipment.getNum()+"鐨勮澶囧瓨鍦ㄥ鏉＄敓鏁堜繚鍏绘爣娉�;";
+ }else{
+ maintenanceStandards.add(lineStandard.get(0));
+ }
+ }else {
+ msg = msg+"缁熶竴缂栫爜涓�"+equipment.getNum()+"鐨勮澶囦笉瀛樺湪鐢熸晥淇濆吇鏍囨敞;";
+ }
+ }else{
+ maintenanceStandards.add(list.get(0));
+ }
+ }
+
+ }
+ map.put("records",maintenanceStandards);
+ map.put("message",msg);
+ return map ;
+ }
+
+
+
}
--
Gitblit v1.9.3