From 375a541c825729247ace6a7ebe8722755436c1e0 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期一, 21 八月 2023 16:47:49 +0800
Subject: [PATCH] 维修
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderActualMaterialMapper.xml | 6 +++---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml | 13 +++++++------
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/ReportAfterRepairMapper.xml | 8 ++++----
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/ProjectMaintenanceOrderMapper.java | 2 +-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderActualWorkHoursMapper.xml | 6 +++---
5 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/ProjectMaintenanceOrderMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/ProjectMaintenanceOrderMapper.java
index d577d77..acc448c 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/ProjectMaintenanceOrderMapper.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/ProjectMaintenanceOrderMapper.java
@@ -17,7 +17,7 @@
public interface ProjectMaintenanceOrderMapper extends BaseMapper<ProjectMaintenanceOrder> {
- @Select("select t1.id as value,t1.name as text, t1.name as title from mom_base_supplier t1 where t1.del_flag = '0' GROUP by t1.name ORDER BY t1.create_time desc")
+ @Select("select t1.id as value,t1.name as text, t1.name as title from mom_base_supplier t1 where t1.del_flag = '0' ORDER BY t1.create_time desc")
List<SupplierVo> getSupplier();
@Select("select t1.id as value,t1.name as text, t1.name as title from mom_base_team t1 where t1.del_flag = '0' ORDER BY t1.create_time desc")
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderActualMaterialMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderActualMaterialMapper.xml
index 642410e..94fd7e8 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderActualMaterialMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderActualMaterialMapper.xml
@@ -28,9 +28,9 @@
t1.outbound_order_detail_id outboundOrderDetailId,
t8.id equipmentId,
t1.is_lock isLock,
- IFNULL(t5.use_quantity,0) useQuantity,
- IFNULL(t5.outbound_main_quantity,0) mainQuantity,
- (IFNULL(t5.outbound_main_quantity,0)-IFNULL(t5.use_quantity,0)) as availableQuantity
+ ISNULL(t5.use_quantity,0) useQuantity,
+ ISNULL(t5.outbound_main_quantity,0) mainQuantity,
+ (ISNULL(t5.outbound_main_quantity,0)-ISNULL(t5.use_quantity,0)) as availableQuantity
FROM mom_eam_repair_order_actual_material t1
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderActualWorkHoursMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderActualWorkHoursMapper.xml
index 224f262..090a2f0 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderActualWorkHoursMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderActualWorkHoursMapper.xml
@@ -18,12 +18,12 @@
t1.actual_hour,
t2.username username,
t2.realname as realname,
- t4.name as teamName,
+-- t4.name as teamName,
concat(t6.num, '/', t6.name, '/', t6.model) as equipmentId
FROM mom_eam_repair_order_actual_work_hours t1
LEFT JOIN sys_user t2 on t2.id = t1.user_id
- LEFT JOIN mom_base_team_class t3 on t3.id = t2.team_class_id
- LEFT JOIN mom_base_team t4 on t4.id = t3.team_id
+-- LEFT JOIN mom_base_team_class t3 on t3.id = t2.team_class_id
+-- LEFT JOIN mom_base_team t4 on t4.id = t3.team_id
LEFT JOIN mom_eam_repair_order t5 on t5.id = t1.repair_order_id
LEFT JOIN mom_eam_equipment t6 on t6.id = t5.equipment_id
WHERE t1.repair_order_id = #{mainId}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml
index 1abdcd8..d135d5c 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml
@@ -38,7 +38,7 @@
t3.depart_name departName,
t4.name outsourcingUnitName,
t5.realname responsibilityName,
- t6.`name` teamName
+ t6.name teamName
from mom_eam_repair_order t1
left join(select * from mom_eam_equipment where del_flag = 0 and status = 1) t2 on t1.equipment_id= t2.id
left join sys_depart t3 on t3.id = t1.depart_id
@@ -58,7 +58,8 @@
<if test="status != null and status != ''">
and t1.status = #{status}
</if>
- and t1.repair_order_type = #{repairOrderType} order by t1.create_time desc
+ and t1.repair_order_type = #{repairOrderType}
+ order by t1.create_time desc
</select>
@@ -85,11 +86,11 @@
select
t1.id,
t1.spare_part_id as sparePartId,
- IFNULL(t1.use_quantity,0) as useQuantity,
+ ISNULL(t1.use_quantity,0) as useQuantity,
t2.num,
t2.id as outboundOrderId,
- IFNULL(t1.outbound_main_quantity,0) as mainQuantity,
- (IFNULL(t1.outbound_main_quantity,0)-IFNULL(t1.use_quantity,0)) as availableQuantity,
+ ISNULL(t1.outbound_main_quantity,0) as mainQuantity,
+ (ISNULL(t1.outbound_main_quantity,0)-ISNULL(t1.use_quantity,0)) as availableQuantity,
t3.num as spareNum,
t3.name as spareName,
t3.model,
@@ -103,7 +104,7 @@
LEFT JOIN mom_eam_spare_part t3 on t3.id =t1.spare_part_id
LEFT JOIN mom_base_constructor t4 on t4.id =t3.constructor_id
LEFT JOIN mom_base_unit t5 on t5.id =t1.main_unit_id
- where t1.del_flag = 0 and t1.outbound_main_quantity != 0 and (IFNULL(t1.outbound_main_quantity,0)-IFNULL(t1.use_quantity,0)) != 0
+ where t1.del_flag = 0 and t1.outbound_main_quantity != 0 and (ISNULL(t1.outbound_main_quantity,0)-ISNULL(t1.use_quantity,0)) != 0
<if test="status != null and status != ''">
and t1.status = #{status}
</if>
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/ReportAfterRepairMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/ReportAfterRepairMapper.xml
index 85dfa42..d60612b 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/ReportAfterRepairMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/ReportAfterRepairMapper.xml
@@ -23,7 +23,7 @@
t1.actual_start_time actualStartTime,
t1.actual_end_time actualEndTime,
t1.remark remark,
- t1.`status` status,
+ t1.status status,
t1.audit_status auditStatus,
t1.create_by createBy,
t1.create_time createTime,
@@ -36,9 +36,9 @@
t3.depart_name departName,
t4.item_text maintenanceMethodName,
t5.item_text auditStatusName,
- t6.`name` teamName,
+ t6.name teamName,
t7.realname responsibilityName,
- t8.`name` outsourcingUnitName,
+ t8.name outsourcingUnitName,
t9.realname reportUserName
FROM
mom_eam_report_after_repair t1
@@ -65,4 +65,4 @@
</if>
ORDER BY t1.create_time desc
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3