From 82fbcce60ae86965441ae045df1f864d10005d35 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 21 八月 2023 17:59:46 +0800
Subject: [PATCH] 检验计划
---
inspection-server/src/main/resources/mapper/ReportMapper.xml | 49 +++++++++++++------------------------------------
1 files changed, 13 insertions(+), 36 deletions(-)
diff --git a/inspection-server/src/main/resources/mapper/ReportMapper.xml b/inspection-server/src/main/resources/mapper/ReportMapper.xml
index 708ac38..7634937 100644
--- a/inspection-server/src/main/resources/mapper/ReportMapper.xml
+++ b/inspection-server/src/main/resources/mapper/ReportMapper.xml
@@ -4,17 +4,20 @@
<!--鏌ヨ妫�楠屾姤鍛�-->
<select id="selectAllReport" resultType="com.yuanchu.limslaboratory.pojo.vo.ReportVo">
- select im.code materialCode,
+ select r.id,
+ im.code materialCode,
r.code reportCode,
i.code inspectionCode,
- r.approver approver,
- r.status status,
- r.conclusion conclusion,
- u.name name
- from report r
- join inspection i on r.inspection_id = i.id
- join user u on i.user_id = u.id
- join inspection_material im on i.id = im.inspection_id
+ im.name materialName,
+ r.conclusion ,
+ r.status ,
+ r.approver ,
+ check_time,
+ u.name
+ from lims_laboratory.report r
+ join lims_laboratory.inspection i on r.inspection_id = i.id
+ join lims_laboratory.user u on i.user_id = u.id
+ join lims_laboratory.inspection_material im on i.id = im.inspection_id
<where>
r.state = 1
<if test="status != null">
@@ -26,33 +29,7 @@
or r.code like concat('%', #{name}, '%')
</if>
</where>
+ order by r.id
</select>
- <!--鏌ヨ鎶ュ憡瀹℃牳-->
- <select id="selectAllReportAuditing" resultType="com.yuanchu.limslaboratory.pojo.vo.ReportAuditingVo">
- select im.code materialCode,
- r.code reportCode,
- im.name materialName,
- r.status status,
- r.approver approver,
- DATE_FORMAT(r.`create_time`, '%Y-%m-%d') submitTime,
- DATE_FORMAT(r.`check_time`, '%Y-%m-%d') checkTime
- from report r
- join inspection i on r.inspection_id = i.id
- join inspection_material im on i.id = im.inspection_id
- <where>
- r.state = 1
- <if test="status == null">
- and r.status in (0, 1)
- </if>
- <if test="status != null">
- and r.status = #{status}
- </if>
- <if test="name != null and name != ''">
- and im.code like concat('%', #{name}, '%')
- or i.code like concat('%', #{name}, '%')
- or im.name like concat('%', #{name}, '%')
- </if>
- </where>
- </select>
</mapper>
--
Gitblit v1.9.3