From 4800caf0bc511a26624da1b9a9cf34275b6c2c4a Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期五, 01 九月 2023 17:10:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/resources/mapper/ReportMapper.xml | 44 ++++++++++++++++++++++++++++++++------------
1 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/inspection-server/src/main/resources/mapper/ReportMapper.xml b/inspection-server/src/main/resources/mapper/ReportMapper.xml
index 096359e..7cd6cc6 100644
--- a/inspection-server/src/main/resources/mapper/ReportMapper.xml
+++ b/inspection-server/src/main/resources/mapper/ReportMapper.xml
@@ -58,18 +58,38 @@
</resultMap>
<select id="getReportContext" resultMap="report">
- SELECT r.`code` rcode,date_format(r.create_time, '%Y-%m-%d') create_time,date_format(r.check_time, '%Y-%m-%d') check_time,i.inspection_status,im.`name`,im.num,im.specifications,im.supplier,im.`code` im_code,i.`code` ins_code,i.type,ip.id,ip.`name` ip_name,ip.unit,ip.required,ip.test_value,ip.test_state
- FROM report r
- LEFT JOIN inspection i
- ON r.inspection_id = i.id
- LEFT JOIN inspection_material im
- ON im.inspection_id = i.id
- LEFT JOIN inspection_product ip
- ON ip.inspection_material_id = im.id
- WHERE ip.state != 0
- and im.state != 0
- and i.state != 0
- and r.`code` = #{code}
+ SELECT
+ r.`code` rcode,
+ date_format( r.create_time, '%Y-%m-%d' ) create_time,
+ date_format( r.check_time, '%Y-%m-%d' ) check_time,
+ i.inspection_status,
+ im.`name`,
+ im.num,
+ im.specifications,
+ im.supplier,
+ im.`code` im_code,
+ i.`code` ins_code,
+ i.type,
+ ip.id,
+ ip.`name` ip_name,
+ im.form_time formTime,
+ ip.unit,
+ ip.required,
+ ip.test_value,
+ ip.test_state,
+ u.`name` ipName,
+ im.notes
+ FROM
+ report r
+ LEFT JOIN inspection i ON r.inspection_id = i.id
+ LEFT JOIN inspection_material im ON im.inspection_id = i.id
+ LEFT JOIN inspection_product ip ON ip.inspection_material_id = im.id
+ LEFT JOIN `user` u on ip.user_id =u.id
+ WHERE
+ ip.state != 0
+ AND im.state != 0
+ AND i.state != 0
+ AND r.`code` = #{code}
</select>
</mapper>
--
Gitblit v1.9.3