From be8a6f171bd41aa50fb7310b2ccbe753dac20b89 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期二, 10 六月 2025 16:47:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java | 67 +++++++++++++++++++++++++++++----
1 files changed, 59 insertions(+), 8 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 30aaa10..f0a7b70 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
@@ -199,11 +199,21 @@
maintenanceStandard.setAssignMode("1");
maintenanceStandardService.save(maintenanceStandard);
- Equipment equipment = equipmentService.getById(maintenanceStandard.getEquipmentId());
- List<MaintenanceCycleVo> maintenanceCycle = maintenanceStandardService.getPeriodicMaintenanceCycle(equipment.getEquipmentImportanceId(), maintenanceStandard.getMaintenanceType());
- if(maintenanceCycle.size()==0){
- return Result.OK("娌℃湁鎵惧埌鐨勪繚鍏诲懆鏈燂紝璇峰厛缁存姢淇濆吇鍛ㄦ湡!");
+ List<MaintenanceCycleVo> maintenanceCycle = null;
+ if("2".equals(maintenanceType)){
+
+ maintenanceCycle = maintenanceStandardService.getPeriodic2MaintenanceCycle(maintenanceStandard.getMaintenanceType());
+ if(maintenanceCycle.size()==0){
+ return Result.error("娌℃湁鎵惧埌鐨勪簩淇濅繚鍏诲懆鏈燂紝璇峰厛缁存姢淇濆吇鍛ㄦ湡!");
+ }
+ }else{
+ Equipment equipment = equipmentService.getById(maintenanceStandard.getEquipmentId());
+ maintenanceCycle = maintenanceStandardService.getPeriodic3MaintenanceCycle(equipment.getEquipmentImportanceId(), maintenanceStandard.getMaintenanceType());
+ if(maintenanceCycle.size()==0){
+ return Result.error("娌℃湁鎵惧埌鐨勪笁淇濅繚鍏诲懆鏈燂紝璇峰厛缁存姢淇濆吇鍛ㄦ湡!");
+ }
}
+
List<MaintenanceStandardDetail> maintenanceStandardDetaillist = maintenanceStandard.getMaintenanceStandardDetaillist();
for (MaintenanceStandardDetail maintenanceStandardDetail : maintenanceStandardDetaillist) {
if(maintenanceCycle.size() > 0){
@@ -241,8 +251,24 @@
maintenanceStandardDetailService.updateById(dailyInspectionStandardDetail);
}
//2.閲嶆柊鎸佷箙淇濆吇椤圭洰
- Equipment equipment = equipmentService.getById(maintenanceStandard.getEquipmentId());
- List<MaintenanceCycleVo> maintenanceCycle = maintenanceStandardService.getPeriodicMaintenanceCycle(equipment.getEquipmentImportanceId(), maintenanceStandard.getMaintenanceType());
+// Equipment equipment = equipmentService.getById(maintenanceStandard.getEquipmentId());
+// List<MaintenanceCycleVo> maintenanceCycle = maintenanceStandardService.getPeriodicMaintenanceCycle(equipment.getEquipmentImportanceId(), maintenanceStandard.getMaintenanceType());
+ List<MaintenanceCycleVo> maintenanceCycle = null;
+ if("2".equals(maintenanceStandard.getMaintenanceType())){
+
+ maintenanceCycle = maintenanceStandardService.getPeriodic2MaintenanceCycle(maintenanceStandard.getMaintenanceType());
+ if(maintenanceCycle.size()==0){
+ return Result.error("娌℃湁鎵惧埌鐨勪簩淇濅繚鍏诲懆鏈燂紝璇峰厛缁存姢淇濆吇鍛ㄦ湡!");
+ }
+ }else{
+ Equipment equipment = equipmentService.getById(maintenanceStandard.getEquipmentId());
+ maintenanceCycle = maintenanceStandardService.getPeriodic3MaintenanceCycle(equipment.getEquipmentImportanceId(), maintenanceStandard.getMaintenanceType());
+ if(maintenanceCycle.size()==0){
+ return Result.error("娌℃湁鎵惧埌鐨勪笁淇濅繚鍏诲懆鏈燂紝璇峰厛缁存姢淇濆吇鍛ㄦ湡!");
+ }
+ }
+
+
if(maintenanceCycle.size()==0){
return Result.OK("娌℃湁鎵惧埌鐨勪繚鍏诲懆鏈燂紝璇峰厛缁存姢淇濆吇鍛ㄦ湡!");
}
@@ -622,8 +648,23 @@
//鏄庣粏淇℃伅
List<MaintenanceStandardDetail> maintenanceStandardDetailList = maintenanceStandard.getMaintenanceStandardDetaillist();
MaintenanceStandardDetail isd = null;
- Equipment equipment = equipmentService.getById(maintenanceStandard.getEquipmentId());
- List<MaintenanceCycleVo> maintenanceCycle = maintenanceStandardService.getPeriodicMaintenanceCycle(equipment.getEquipmentImportanceId(), maintenanceStandard.getMaintenanceType());
+
+// Equipment equipment = equipmentService.getById(maintenanceStandard.getEquipmentId());
+ List<MaintenanceCycleVo> maintenanceCycle = null;
+ if("2".equals(maintenanceStandard.getMaintenanceType())){
+
+ maintenanceCycle = maintenanceStandardService.getPeriodic2MaintenanceCycle(maintenanceStandard.getMaintenanceType());
+ if(maintenanceCycle.size()==0){
+ return Result.error("娌℃湁鎵惧埌鐨勪簩淇濅繚鍏诲懆鏈燂紝璇峰厛缁存姢淇濆吇鍛ㄦ湡!");
+ }
+ }else{
+ Equipment equipment = equipmentService.getById(maintenanceStandard.getEquipmentId());
+ maintenanceCycle = maintenanceStandardService.getPeriodic3MaintenanceCycle(equipment.getEquipmentImportanceId(), maintenanceStandard.getMaintenanceType());
+ if(maintenanceCycle.size()==0){
+ return Result.error("娌℃湁鎵惧埌鐨勪笁淇濅繚鍏诲懆鏈燂紝璇峰厛缁存姢淇濆吇鍛ㄦ湡!");
+ }
+ }
+// List<MaintenanceCycleVo> maintenanceCycle = maintenanceStandardService.getPeriodicMaintenanceCycle(equipment.getEquipmentImportanceId(), maintenanceStandard.getMaintenanceType());
for (MaintenanceStandardDetail maintenanceStandardDetail : maintenanceStandardDetailList) {
isd = new MaintenanceStandardDetail();
isd.setMaintenanceStandardId(maintenanceStandard.getId());
@@ -734,6 +775,16 @@
dailyMaintenanceStandard.setLoseEfficacyPerson(sysUser.getRealname());
maintenanceStandardService.updateById(dailyMaintenanceStandard);
}
+
+ List<MaintenanceStandard> standards = maintenanceStandardService.lambdaQuery()
+ .eq(MaintenanceStandard::getEquipmentId, maintenanceStandard.getEquipmentId())
+ .eq(MaintenanceStandard::getVersionStatus, "2").list();
+ for (MaintenanceStandard standard : standards) {
+ standard.setVersionStatus("3");
+ standard.setLoseEfficacyTime(new Date());
+ standard.setLoseEfficacyPerson(sysUser.getRealname());
+ maintenanceStandardService.updateById(standard);
+ }
maintenanceStandard.setApprovalPerson(sysUser.getRealname());
maintenanceStandard.setVersionStatus("2");
maintenanceStandard.setTakeEffectTime(new Date());
--
Gitblit v1.9.3