From 3e219e03bbcaf1f37004efc5be8691e4bdc76de6 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 13 十二月 2023 11:01:35 +0800
Subject: [PATCH] 二级保养标准 三级保养标准 通过类型区分
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java
index 36c6cdd..5426b62 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java
@@ -21,6 +21,7 @@
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.eam.entity.*;
+import org.jeecg.modules.eam.model.MaintenanceCycleVo;
import org.jeecg.modules.eam.service.*;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.springframework.beans.factory.annotation.Autowired;
@@ -170,9 +171,16 @@
// maintenanceStandard.setType("daily");
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
maintenanceStandard.setWritePerson(sysUser.getRealname());
+ maintenanceStandard.setAssignMode("1");
maintenanceStandardService.save(maintenanceStandard);
+
+ Equipment equipment = equipmentService.getById(maintenanceStandard.getEquipmentId());
+ List<MaintenanceCycleVo> maintenanceCycle = maintenanceStandardService.getPeriodicMaintenanceCycle(equipment.getEquipmentImportanceId(), maintenanceStandard.getMaintenanceType());
List<MaintenanceStandardDetail> maintenanceStandardDetaillist = maintenanceStandard.getMaintenanceStandardDetaillist();
for (MaintenanceStandardDetail maintenanceStandardDetail : maintenanceStandardDetaillist) {
+ if(maintenanceCycle.size() > 0){
+ maintenanceStandardDetail.setMaintenanceCycleId(maintenanceCycle.get(0).getValue());
+ }
maintenanceStandardDetail.setMaintenanceStandardId(maintenanceStandard.getId());
maintenanceStandardDetail.setPhoto(maintenanceStandardDetail.getPhoto());
maintenanceStandardDetailService.saveOrUpdate(maintenanceStandardDetail);
@@ -200,8 +208,13 @@
maintenanceStandardDetailService.updateById(dailyInspectionStandardDetail);
}
//2.閲嶆柊鎸佷箙淇濆吇椤圭洰
+ Equipment equipment = equipmentService.getById(maintenanceStandard.getEquipmentId());
+ List<MaintenanceCycleVo> maintenanceCycle = maintenanceStandardService.getPeriodicMaintenanceCycle(equipment.getEquipmentImportanceId(), maintenanceStandard.getMaintenanceType());
List<MaintenanceStandardDetail> maintenanceStandardDetails = maintenanceStandard.getMaintenanceStandardDetaillist();
for (MaintenanceStandardDetail maintenanceStandardDetail : maintenanceStandardDetails) {
+ if(maintenanceCycle.size() > 0){
+ maintenanceStandardDetail.setMaintenanceCycleId(maintenanceCycle.get(0).getValue());
+ }
maintenanceStandardDetail.setMaintenanceStandardId(maintenanceStandard.getId());
maintenanceStandardDetailService.saveOrUpdate(maintenanceStandardDetail);
}
@@ -545,15 +558,20 @@
//鏄庣粏淇℃伅
List<MaintenanceStandardDetail> maintenanceStandardDetailList = maintenanceStandard.getMaintenanceStandardDetaillist();
MaintenanceStandardDetail isd = null;
+ Equipment equipment = equipmentService.getById(maintenanceStandard.getEquipmentId());
+ List<MaintenanceCycleVo> maintenanceCycle = maintenanceStandardService.getPeriodicMaintenanceCycle(equipment.getEquipmentImportanceId(), maintenanceStandard.getMaintenanceType());
for (MaintenanceStandardDetail maintenanceStandardDetail : maintenanceStandardDetailList) {
isd = new MaintenanceStandardDetail();
isd.setMaintenanceStandardId(maintenanceStandard.getId());
isd.setLocation(maintenanceStandardDetail.getLocation());
isd.setPhoto(maintenanceStandardDetail.getPhoto());
isd.setMaintenanceProjectId(maintenanceStandardDetail.getMaintenanceProjectId());
- isd.setMaintenanceCycleId(maintenanceStandardDetail.getMaintenanceCycleId());
+// isd.setMaintenanceCycleId(maintenanceStandardDetail.getMaintenanceCycleId());
isd.setMaintenanceMode(maintenanceStandardDetail.getMaintenanceMode());
isd.setMaintenanceRequire(maintenanceStandardDetail.getMaintenanceRequire());
+ if(maintenanceCycle.size() > 0){
+ isd.setMaintenanceCycleId(maintenanceCycle.get(0).getValue());
+ }
maintenanceStandardDetailService.save(isd);
}
if(CollectionUtils.isNotEmpty(maintenanceStandardPlanningMaterialList)){
--
Gitblit v1.9.3