From 30f6da8bf0143906b42fa600f6a604cea6c81f71 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 26 七月 2023 09:16:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/resources/mapper/InspectionMapper.xml | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/inspection-server/src/main/resources/mapper/InspectionMapper.xml b/inspection-server/src/main/resources/mapper/InspectionMapper.xml
index 8ba9919..41ca226 100644
--- a/inspection-server/src/main/resources/mapper/InspectionMapper.xml
+++ b/inspection-server/src/main/resources/mapper/InspectionMapper.xml
@@ -2,8 +2,9 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.limslaboratory.mapper.InspectionMapper">
<select id="selectAllInspection" resultType="com.yuanchu.limslaboratory.pojo.dto.InspectionDto">
- select i.id, type, inspection_status, qualified_state, i.create_time, user_name, inspect_start_time, inspect_end_time, u.name inspectUserName
- from inspection i left join user u
+ select i.id, type, inspection_status, qualified_state, i.state, i.create_time, user_name, inspect_user_id,
+ inspect_start_time, inspect_end_time, u.name inspectUserName
+ from lims_laboratory.inspection i left join lims_laboratory.user u
on i.inspect_user_id = u.id
<if test="state!=null">
where state = #{state}
@@ -11,13 +12,4 @@
order by i.create_time desc
limit #{pageSize},#{countSize}
</select>
- <select id="selectInspectToCount" resultType="java.lang.Integer">
- select count(*)
- from inspection i left join user u
- on i.inspect_user_id = u.id
- <if test="state!=null">
- where state = #{state}
- </if>
- </select>
-
</mapper>
--
Gitblit v1.9.3