From a92b6f6175b1401071e5fb3bd9fab8a2a3b72011 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 01 九月 2023 14:34:28 +0800
Subject: [PATCH] version
---
inspection-server/src/main/resources/mapper/ReportMapper.xml | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/inspection-server/src/main/resources/mapper/ReportMapper.xml b/inspection-server/src/main/resources/mapper/ReportMapper.xml
index d6730a0..096359e 100644
--- a/inspection-server/src/main/resources/mapper/ReportMapper.xml
+++ b/inspection-server/src/main/resources/mapper/ReportMapper.xml
@@ -9,9 +9,10 @@
r.code reportCode,
i.code inspectionCode,
im.name materialName,
- r.conclusion ,
- r.status ,
+ r.conclusion,
+ r.status,
r.approver approver,
+ i.type,
check_time,
u.name
from lims_laboratory.report r
@@ -35,6 +36,7 @@
<resultMap id="report" type="map">
<id property="rcode" column="rcode"/>
<result property="name" column="name"/>
+ <result property="num" column="num"/>
<result property="specifications" column="specifications"/>
<result property="supplier" column="supplier"/>
<result property="insCode" column="ins_code"/>
@@ -56,7 +58,7 @@
</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.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
+ 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
--
Gitblit v1.9.3