From 7a90b194a7d1a213d01c323fd90ef5afbdeb4ea7 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期二, 10 六月 2025 16:21:02 +0800
Subject: [PATCH] 保养修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderDetailMapper.xml | 6 ++++--
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java | 10 +++++-----
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml | 9 ++++++---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java | 10 ++++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 18 ++++++++++++++++--
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java | 2 ++
6 files changed, 43 insertions(+), 12 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java
index 5b678e1..8e13fa6 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java
@@ -158,8 +158,8 @@
String id = (String) record.get("id");
String equipmentId = (String) record.get("equipmentId");
String maintenanceStandardId = (String) record.get("maintenanceStandardId");
-// List<MaintenanceCycleVo> maintenanceCycles = dailyMaintenanceOrderService.getMaintenanceCycleByStandardId(maintenanceStandardId);
-// record.put("maintenanceCycles", maintenanceCycles);
+ List<MaintenanceCycleVo> maintenanceCycles = dailyMaintenanceOrderService.getMaintenanceCycleByStandardId(maintenanceStandardId);
+ record.put("maintenanceCycles", maintenanceCycles);
List<Map<String, Object>> dailyMaintenanceDetails = dailyMaintenanceOrderService.getDailyMaintenanceDetailByOrderId(id);
record.put("dailyMaintenanceDetails", dailyMaintenanceDetails);
@@ -239,9 +239,9 @@
for (Map<String, Object> record : records) {
String id = (String) record.get("id");
// String equipmentId = (String) record.get("equipmentId");
-// String maintenanceStandardId = (String) record.get("maintenanceStandardId");
-// List<MaintenanceCycleVo> maintenanceCycles = dailyMaintenanceOrderService.getMaintenanceCycleByStandardId(maintenanceStandardId);
-// record.put("maintenanceCycles", maintenanceCycles);
+ String maintenanceStandardId = (String) record.get("maintenanceStandardId");
+ List<MaintenanceCycleVo> maintenanceCycles = dailyMaintenanceOrderService.getMaintenanceCycleByStandardId(maintenanceStandardId);
+ record.put("maintenanceCycles", maintenanceCycles);
List<Map<String, Object>> dailyMaintenanceDetails = dailyMaintenanceOrderService.getDailyMaintenanceDetailByOrderId(id);
//缁熻宸ユ椂瀹氶
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
index d38e4e2..dcdbd49 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
@@ -1315,13 +1315,27 @@
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
- QueryWrapper<Equipment> queryWrapper = QueryGenerator.initQueryWrapper(equipment, req.getParameterMap());
+// QueryWrapper<Equipment> queryWrapper = QueryGenerator.initQueryWrapper(equipment, req.getParameterMap());
+ QueryWrapper<Equipment> queryWrapper = new QueryWrapper<>();
+ String num = equipment.getNum();
+ if(StringUtils.isNotBlank(num)){
+ queryWrapper.like("num",num);
+ }
+ String name = equipment.getName();
+ if(StringUtils.isNotBlank(name)){
+ queryWrapper.like("name",name);
+ }
+ String workCenterId = equipment.getWorkCenterId();
+ if(StringUtils.isNotBlank(workCenterId)){
+ queryWrapper.eq("work_center_id",workCenterId);
+ }
//鏍规嵁涓嬫涓変繚鏃堕棿鎺掑簭
- queryWrapper.orderByAsc("next_third_maintenance_time");
+
//濡傛灉startTime鍜宔ndTime涓嶄负绌猴紝鍒欐煡璇笅娆′笁淇濇椂闂村湪杩欎釜鏃堕棿娈靛唴鐨勮澶�
if(equipment.getStartTime()!=null && equipment.getEndTime()!=null){
queryWrapper.between("next_third_maintenance_time",equipment.getStartTime(),equipment.getEndTime());
}
+ queryWrapper.orderByAsc("next_third_maintenance_time");
Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
IPage<Equipment> pageList = equipmentService.page(page, queryWrapper);
return Result.OK(pageList);
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 ed5a195..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
@@ -775,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());
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
index 7dfe3be..4435ed5 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
@@ -409,10 +409,12 @@
/**宸ユ*/
@Dict(dicCode = "id",dictTable = "mom_base_area",dicText = "name")
private String areaId;
+
@TableField(exist = false)
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date startTime;
+
@TableField(exist = false)
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderDetailMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderDetailMapper.xml
index 243797d..73af39c 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderDetailMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderDetailMapper.xml
@@ -28,7 +28,7 @@
LEFT JOIN mom_eam_maintenance_specialty t5 ON t3.maintenance_specialty_id = t5.id
LEFT JOIN mom_eam_maintenance_cycle t6 ON t2.maintenance_cycle_id = t6.id
LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_role' ) t7 ON t7.item_value = t2.maintenance_role
- WHERE t1.del_flag = 0 and t2.del_flag = 0 and t3.del_flag = 0
+ WHERE t1.del_flag = 0
<if test="params.dailyMaintenanceOrderId != null and params.dailyMaintenanceOrderId != ''">
and t1.daily_maintenance_order_id = #{params.dailyMaintenanceOrderId}
</if>
@@ -37,6 +37,7 @@
</if>
ORDER BY t1.create_time desc
</select>
+<!-- and t2.del_flag = 0 and t3.del_flag = 0 -->
<select id="get3MaintenanceOrderDetailList" parameterType="Map" resultType="Map">
SELECT
@@ -63,10 +64,11 @@
LEFT JOIN mom_eam_maintenance_specialty t5 ON t3.maintenance_specialty_id = t5.id
LEFT JOIN mom_eam_maintenance_cycle t6 ON t2.maintenance_cycle_id = t6.id
LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_role' ) t7 ON t7.item_value = t2.maintenance_role
- WHERE t1.del_flag = 0 and t2.del_flag = 0 and t3.del_flag = 0
+ WHERE t1.del_flag = 0
<if test="params.dailyMaintenanceOrderId != null and params.dailyMaintenanceOrderId != ''">
and t1.daily_maintenance_order_id = #{params.dailyMaintenanceOrderId}
</if>
ORDER BY t1.create_time desc
</select>
+<!-- and t2.del_flag = 0 and t3.del_flag = 0 -->
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml
index 928009c..7ab68b1 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml
@@ -276,10 +276,11 @@
LEFT JOIN mom_eam_maintenance_standard t2 ON tt.maintenance_standard_id = t2.id
LEFT JOIN mom_eam_maintenance_project t3 ON tt.maintenance_project_id = t3.id
LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_project_method' ) t4 ON t4.item_value = t3.maintenance_method
- WHERE t1.del_flag = '0' AND t2.del_flag = '0' AND t3.del_flag = '0' AND t2.type = 'daily'
+ WHERE t1.del_flag = '0' AND t2.type = 'daily'
<if test="dailyMaintenanceOrderId != null and dailyMaintenanceOrderId != ''">
and tt.daily_maintenance_order_id = #{dailyMaintenanceOrderId}
</if>
+-- AND t2.del_flag = '0' AND t3.del_flag = '0'
</select>
<select id="getRepairUser" parameterType="Map" resultType="map">
@@ -305,10 +306,11 @@
LEFT JOIN mom_eam_maintenance_standard t2 ON tt.maintenance_standard_id = t2.id
LEFT JOIN mom_eam_maintenance_project t3 ON tt.maintenance_project_id = t3.id
LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_project_method' ) t4 ON t4.item_value = t3.maintenance_method
- WHERE t1.del_flag = '0' AND t2.del_flag = '0' AND t3.del_flag = '0' AND t2.type = 'daily' and t1.maintenance_role = 'maintenance'
+ WHERE 1=1 AND t2.type = 'daily' and t1.maintenance_role = 'maintenance'
<if test="dailyMaintenanceOrderId != null and dailyMaintenanceOrderId != ''">
and tt.daily_maintenance_order_id = #{dailyMaintenanceOrderId}
</if>
+-- t1.del_flag = '0' AND t2.del_flag = '0' AND t3.del_flag = '0'
</select>
<select id="getOperationUser" parameterType="Map" resultType="map">
@@ -334,9 +336,10 @@
LEFT JOIN mom_eam_maintenance_standard t2 ON tt.maintenance_standard_id = t2.id
LEFT JOIN mom_eam_maintenance_project t3 ON tt.maintenance_project_id = t3.id
LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_project_method' ) t4 ON t4.item_value = t3.maintenance_method
- WHERE t1.del_flag = '0' AND t2.del_flag = '0' AND t3.del_flag = '0' AND t2.type = 'daily' and t1.maintenance_role = 'operator'
+ WHERE 1=1 AND t2.type = 'daily' and t1.maintenance_role = 'operator'
<if test="dailyMaintenanceOrderId != null and dailyMaintenanceOrderId != ''">
and tt.daily_maintenance_order_id = #{dailyMaintenanceOrderId}
</if>
+ -- t1.del_flag = '0' AND t2.del_flag = '0' AND t3.del_flag = '0'
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3