From d9505757da1a789c4bb9f7c05e8bfd1f09b77ba1 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 28 八月 2023 09:25:33 +0800
Subject: [PATCH] 修改报告预览数据接口
---
inspection-server/src/main/resources/mapper/ReportMapper.xml | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/inspection-server/src/main/resources/mapper/ReportMapper.xml b/inspection-server/src/main/resources/mapper/ReportMapper.xml
index 7a1cea7..25a09a3 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
@@ -39,6 +40,10 @@
<result property="supplier" column="supplier"/>
<result property="insCode" column="ins_code"/>
<result property="type" column="type"/>
+ <result property="imCode" column="im_code"/>
+ <result property="createTime" column="create_time"/>
+ <result property="checkTime" column="check_time"/>
+ <result property="inspectionStatus" column="inspection_status"/>
<collection property="products" resultMap="products" javaType="java.util.List"/>
</resultMap>
@@ -52,7 +57,7 @@
</resultMap>
<select id="getReportContext" resultMap="report">
- SELECT r.`code` rcode,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.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