From aacbd7e7bfee3604d22388801b45955a26f746fa Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 21 八月 2023 13:39:38 +0800
Subject: [PATCH] 改bug
---
inspection-server/src/main/resources/mapper/ReportMapper.xml | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/inspection-server/src/main/resources/mapper/ReportMapper.xml b/inspection-server/src/main/resources/mapper/ReportMapper.xml
index 54d2f39..708ac38 100644
--- a/inspection-server/src/main/resources/mapper/ReportMapper.xml
+++ b/inspection-server/src/main/resources/mapper/ReportMapper.xml
@@ -3,7 +3,8 @@
<mapper namespace="com.yuanchu.limslaboratory.mapper.ReportMapper">
<!--鏌ヨ妫�楠屾姤鍛�-->
- <select id="selectAllReport" resultType="com.yuanchu.limslaboratory.pojo.vo.ReportVo">select im.code materialCode,
+ <select id="selectAllReport" resultType="com.yuanchu.limslaboratory.pojo.vo.ReportVo">
+ select im.code materialCode,
r.code reportCode,
i.code inspectionCode,
r.approver approver,
@@ -15,6 +16,7 @@
join user u on i.user_id = u.id
join inspection_material im on i.id = im.inspection_id
<where>
+ r.state = 1
<if test="status != null">
and r.status = #{status}
</if>
@@ -39,6 +41,10 @@
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>
--
Gitblit v1.9.3