From c0e7f848236e1ab5f945b98c32d12c81e3e9c991 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 24 八月 2023 18:04:09 +0800
Subject: [PATCH] 角色管理
---
inspection-server/src/main/resources/mapper/ReportMapper.xml | 45 ++++++++++++++-------------------------------
1 files changed, 14 insertions(+), 31 deletions(-)
diff --git a/inspection-server/src/main/resources/mapper/ReportMapper.xml b/inspection-server/src/main/resources/mapper/ReportMapper.xml
index 54d2f39..8c53688 100644
--- a/inspection-server/src/main/resources/mapper/ReportMapper.xml
+++ b/inspection-server/src/main/resources/mapper/ReportMapper.xml
@@ -3,18 +3,23 @@
<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 r.id,
+ im.code materialCode,
r.code reportCode,
i.code inspectionCode,
+ im.name materialName,
+ r.conclusion ,
+ r.status ,
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
+ 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">
and r.status = #{status}
</if>
@@ -24,29 +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>
- <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