From dce5044043c3af93b84dae2804f2d54f779e7c1e Mon Sep 17 00:00:00 2001 From: XiaoRuby <3114200645@qq.com> Date: 星期二, 22 八月 2023 11:48:50 +0800 Subject: [PATCH] LIMS管理系统框架-开发8-22 --- inspection-server/src/main/resources/mapper/ReportMapper.xml | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/inspection-server/src/main/resources/mapper/ReportMapper.xml b/inspection-server/src/main/resources/mapper/ReportMapper.xml index 2beac5c..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,7 @@ 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> -- Gitblit v1.9.3