From d000f6408f4baa0a0f87d4eda39bc8b9b543ed5b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期五, 30 五月 2025 09:51:01 +0800
Subject: [PATCH] 设备管理后端修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/QuanlityConfirm.java | 1
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java | 57 ++++++++++++++++++++++++----
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/MaintenanceStandardMapper.java | 5 ++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml | 4 +-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java | 5 ++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IMaintenanceStandardService.java | 3 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/MaintenanceStandardServiceImpl.java | 10 ++++-
7 files changed, 71 insertions(+), 14 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java
index 598a690..db5a03c 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java
@@ -781,6 +781,8 @@
inspectionResultVo.setWeekOfMonth((Integer)r.get("weekOfMonth"));
inspectionResultVo.setInsResult((String)r.get("insResult"));
listS.add(inspectionResultVo);
+
+ hashMap.put("dataList",listS);//----
maps.add(hashMap);
}
}else{
@@ -833,6 +835,7 @@
inspectionResultVo.setInspectionUserName((String)map.get("inspectionUserName"));
inspectionResultVo.setWeekOfMonth((Integer)map.get("weekOfMonth"));
listIn.add(inspectionResultVo);
+ hashMap.put("dataList",listIn);//---
hashMap.put("dataList",listIn);
}
}else{
@@ -884,6 +887,8 @@
inspectionResultVo.setWeekOfMonth((Integer)map.get("weekOfMonth"));
listRe.add(inspectionResultVo);
hashMap.put("dataList",listRe);
+
+ maps3.add(hashMap);//---
}
}else{
HashMap<String, Object> hashMap = new HashMap<>();
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..ed5a195 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());
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/QuanlityConfirm.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/QuanlityConfirm.java
index ad6ef94..4120bf5 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/QuanlityConfirm.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/QuanlityConfirm.java
@@ -42,6 +42,7 @@
/**浜у搧鎹熷け鎯呭喌*/
@Excel(name = "浜у搧鎹熷け鎯呭喌", width = 15)
@ApiModelProperty(value = "浜у搧鎹熷け鎯呭喌")
+ @Dict(dicCode = "is_product")
private String condition;
/**鎹熷け鎯呭喌鍒嗘瀽*/
@Excel(name = "鎹熷け鎯呭喌鍒嗘瀽", width = 15)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/MaintenanceStandardMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/MaintenanceStandardMapper.java
index 06169b8..8ecbae5 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/MaintenanceStandardMapper.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/MaintenanceStandardMapper.java
@@ -25,6 +25,9 @@
IPage<Map<String, Object>> getMaintenanceStandard3List(IPage<Map> pageData, @Param("params") Map<String,Object> params);
+ @Select("select t1.id as value,t1.name as text,t1.name as title from mom_eam_maintenance_cycle t1 where t1.del_flag = '0' and t1.version_status = '2' and t1.maintenance_type = #{maintenanceType}")
+ List<MaintenanceCycleVo> getPeriodic2MaintenanceCycle(String maintenanceType);
+
@Select("select t1.id as value,t1.name as text,t1.name as title from mom_eam_maintenance_cycle t1 where t1.del_flag = '0' and t1.version_status = '2' and t1.maintenance_type = #{maintenanceType} and t1.equipment_importance_id = #{importanceFlag}")
- List<MaintenanceCycleVo> getPeriodicMaintenanceCycle(String importanceFlag,String maintenanceType);
+ List<MaintenanceCycleVo> getPeriodic3MaintenanceCycle(String importanceFlag,String maintenanceType);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml
index 0f066c3..ae2d1f5 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml
@@ -332,7 +332,7 @@
<if test="dataTime == null and dataTime == ''">
AND SUBSTRING ( CONVERT ( VARCHAR ( 10 ), t1.create_time, 120 ), 1, 7 ) = SUBSTRING ( CONVERT ( VARCHAR ( 10 ), GETDATE( ), 120 ), 1, 7 )
</if>
- and t3.name = #{name} and t3.detection_standard = #{detectionStandard}
+ and t3.name = #{name} and t3.detection_standard = #{detectionStandard} order by t2.create_time desc
</select>
<!-- <if test="dataTime != null and dataTime != ''">-->
<!-- AND SUBSTRING ( CONVERT ( VARCHAR ( 10 ), t1.create_time, 120 ), 1, 7 ) = SUBSTRING ( CONVERT ( VARCHAR ( 10 ), #{dataTime}, 120 ), 2, 7 )-->
@@ -361,7 +361,7 @@
<if test="dataTime == null and dataTime == ''">
AND SUBSTRING ( CONVERT ( VARCHAR ( 10 ), t1.create_time, 120 ), 1, 7 ) = SUBSTRING ( CONVERT ( VARCHAR ( 10 ), GETDATE( ), 120 ), 1, 7 )
</if>
- and t3.cycle_unit = #{cycleUnit}
+ and t3.cycle_unit = #{cycleUnit} order by t1.create_time desc
</select>
<!-- <if test="dataTime != null and dataTime != ''">-->
<!-- AND SUBSTRING ( CONVERT ( VARCHAR ( 10 ), t1.create_time, 120 ), 1, 7 ) = SUBSTRING ( CONVERT ( VARCHAR ( 10 ), #{dataTime}, 120 ), 2, 7 )-->
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IMaintenanceStandardService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IMaintenanceStandardService.java
index 7e41efd..1beeb40 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IMaintenanceStandardService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IMaintenanceStandardService.java
@@ -22,5 +22,6 @@
IPage<Map<String, Object>> getMaintenanceStandard3List(Integer pageNo, Integer pageSize, Map<String, Object> params);
- List<MaintenanceCycleVo> getPeriodicMaintenanceCycle(String importanceFlag,String maintenanceType);
+ List<MaintenanceCycleVo> getPeriodic2MaintenanceCycle(String maintenanceType);
+ List<MaintenanceCycleVo> getPeriodic3MaintenanceCycle(String importanceFlag,String maintenanceType);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/MaintenanceStandardServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/MaintenanceStandardServiceImpl.java
index e3174e8..775a23b 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/MaintenanceStandardServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/MaintenanceStandardServiceImpl.java
@@ -66,7 +66,13 @@
* @return
*/
@Override
- public List<MaintenanceCycleVo> getPeriodicMaintenanceCycle(String importanceFlag, String maintenanceType) {
- return super.baseMapper.getPeriodicMaintenanceCycle(importanceFlag,maintenanceType);
+ public List<MaintenanceCycleVo> getPeriodic3MaintenanceCycle(String importanceFlag, String maintenanceType) {
+ return super.baseMapper.getPeriodic3MaintenanceCycle(importanceFlag,maintenanceType);
}
+
+ @Override
+ public List<MaintenanceCycleVo> getPeriodic2MaintenanceCycle(String maintenanceType) {
+ return super.baseMapper.getPeriodic2MaintenanceCycle(maintenanceType);
+ }
+
}
--
Gitblit v1.9.3