From 84020add189b73e798113c4d3feaa978c75c71d7 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期二, 24 十月 2023 18:50:51 +0800
Subject: [PATCH] 验收单修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceThreeAcceptanceMapper.xml | 21 +++++++++++++--------
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceThreeAcceptanceController.java | 2 +-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceThreeAcceptance.java | 5 ++++-
3 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceThreeAcceptanceController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceThreeAcceptanceController.java
index 4486bae..fe37c56 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceThreeAcceptanceController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceThreeAcceptanceController.java
@@ -97,7 +97,7 @@
String maintenanceOrderId = maintenanceThreeAcceptance.getMaintenanceOrderId();
List<MaintenanceThreeAcceptance> maintenanceThreeAcceptances = maintenanceThreeAcceptance.getMaintenanceThreeAcceptances();
for (MaintenanceThreeAcceptance threeAcceptance : maintenanceThreeAcceptances) {
- threeAcceptance.setMaintenanceOrderId(maintenanceOrderId);
+ threeAcceptance.setId("");
maintenanceThreeAcceptanceService.saveOrUpdate(threeAcceptance);
}
DailyMaintenanceOrder maintenanceOrder = dailyMaintenanceOrderService.getById(maintenanceOrderId);
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceThreeAcceptance.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceThreeAcceptance.java
index 7a85557..18d2ff8 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceThreeAcceptance.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceThreeAcceptance.java
@@ -36,7 +36,7 @@
/**3淇濆伐鍗昳d*/
@Excel(name = "3淇濆伐鍗昳d", width = 15)
@ApiModelProperty(value = "3淇濆伐鍗昳d")
- private java.lang.String maintenanceOrderId;
+ private java.lang.String maintenanceOrderDetailId;
/**淇濆吇閮ㄤ綅*/
@Excel(name = "淇濆吇閮ㄤ綅", width = 15)
@ApiModelProperty(value = "淇濆吇閮ㄤ綅")
@@ -65,4 +65,7 @@
@TableField(exist = false)
private List<MaintenanceThreeAcceptance> maintenanceThreeAcceptances;
+
+ @TableField(exist = false)
+ private String maintenanceOrderId;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceThreeAcceptanceMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceThreeAcceptanceMapper.xml
index bfa4030..03b3e57 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceThreeAcceptanceMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceThreeAcceptanceMapper.xml
@@ -4,14 +4,19 @@
<select id="getMaintenanceThreeAcceptanceList" parameterType="Map" resultType="Map">
SELECT
- t1.id AS id,
- t1.position,
- t1.content,
- t1.standard,
- t1.first_inspect as firstInspect,
- t1.second_inspect as secondInspect
+ t1.id,
+ t1.id as maintenanceOrderDetailId,
+ t1.daily_maintenance_order_id AS maintenanceOrderId,
+ t2.location AS position,
+ t3.name AS content,
+ t3.standard,
+ t4.first_inspect AS firstInspect,
+ t4.second_inspect AS secondInspect
FROM
- mom_eam_maintenance_three_acceptance t1
- WHERE t1.del_flag = '0' AND t1.maintenance_order_id = #{maintenanceOrderId}
+ mom_eam_daily_maintenance_order_detail t1
+ LEFT JOIN mom_eam_maintenance_standard_detail t2 ON t1.maintenance_standard_detail_id = t2.id
+ LEFT JOIN mom_eam_maintenance_project t3 ON t1.maintenance_project_id = t3.id
+ LEFT JOIN mom_eam_maintenance_three_acceptance t4 ON t1.id = t4.maintenance_order_detail_id
+ WHERE t1.del_flag = '0' AND t1.daily_maintenance_order_id = #{maintenanceOrderId}
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3