From ad7151b14f2721b0fa40a903c6e65a2c511dd4c5 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 27 七月 2023 15:08:13 +0800
Subject: [PATCH] LIMS管理系统框架-开发7-27第二次标准库完成修改

---
 inspection-server/src/main/resources/mapper/PlanMapper.xml |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/inspection-server/src/main/resources/mapper/PlanMapper.xml b/inspection-server/src/main/resources/mapper/PlanMapper.xml
index 23b2b8b..8234fc3 100644
--- a/inspection-server/src/main/resources/mapper/PlanMapper.xml
+++ b/inspection-server/src/main/resources/mapper/PlanMapper.xml
@@ -1,5 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yuanchu.limslaboratory.mapper.PlanMapper">
+    <select id="selectAllPlan" resultType="Map">
+        select p.id,results,p.state,p.create_time,p.inspection_id,user_id,results,type,user_name
+        from lims_laboratory.plan p left join lims_laboratory.inspection i
+        on i.id=p.inspection_id
+        <if test="state!=null">
+            where p.state = #{state}
+        </if>
+        order by p.create_time desc
+        limit #{pageSize},#{countSize}
+    </select>
 
+    <select id="selectInspection" resultType="com.yuanchu.limslaboratory.pojo.dto.PlanDto">
+        select i.mid , p.inspection_id , p.state, p.create_time, p.name userName, i.name inspectUserName
+        from (select inspection_id, state, plan.create_time, name
+              from lims_laboratory.plan
+                       left join lims_laboratory.user on plan.user_id = user.id) p
+                 left join (select inspection.id, name, iml.id mid
+                            from lims_laboratory.inspection
+                                     left join lims_laboratory.user on user.id = inspection.inspect_user_id
+                                     left join lims_laboratory.inspection_material_list iml on inspection.id = iml.inspection_id) i
+                           on p.inspection_id = i.id
+        <if test="state!=null">
+            where p.state = #{state}
+        </if>
+        order by p.create_time desc
+        limit #{pageSize},#{countSize}
+    </select>
 </mapper>

--
Gitblit v1.9.3