From 14c7f8f9ab3dfca1a8759482a9b3e16cd5d9856f Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期六, 20 四月 2024 00:06:03 +0800
Subject: [PATCH] 标准刷新增加一个条件

---
 inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml |   39 +++++++++++++++++++++++++++++++++------
 1 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml b/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml
index 03a9f53..1966378 100644
--- a/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml
+++ b/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml
@@ -15,11 +15,6 @@
         <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
     </resultMap>
 
-    <sql id="Base_Column_List">
-        id,code,name,
-        remark,standard_tree_id,create_user,
-        create_time,update_user,update_time
-    </sql>
     <select id="selectStandardMethodById" resultType="java.util.Map">
         select code, name, remark
         from standard_method
@@ -47,6 +42,18 @@
         <if test="data5 != null">
             and model = #{data5}
         </if>
+        <if test="data2 == null">
+            and laboratory is null
+        </if>
+        <if test="data3 == null">
+            and sample_type is null
+        </if>
+        <if test="data4 == null">
+            and sample is null
+        </if>
+        <if test="data5 == null">
+            and model is null 
+        </if>
     </select>
     <select id="selectParameterList" resultType="standardProductList">
         select
@@ -66,8 +73,28 @@
                value_type,
                method,
                man_day,
-               bsm
+               bsm,
+               template_id,
+               son_laboratory
         from structure_item_parameter
         where method = #{code}
     </select>
+    <select id="selectStandardMethodLists2" resultType="com.yuanchu.mom.pojo.StandardMethodList">
+        select sml.id, sml.code, sml.name,sml.remark, sml.create_time, u.name create_user_name
+        from standard_method_list sml
+        left join user u on u.id = sml.create_user
+        where factory = #{data1}
+        <if test="data2 != null">
+            and laboratory = #{data2}
+        </if>
+        <if test="data3 != null">
+            and sample_type = #{data3}
+        </if>
+        <if test="data4 != null">
+            and sample = #{data4}
+        </if>
+        <if test="data5 != null">
+            and model = #{data5}
+        </if>
+    </select>
 </mapper>

--
Gitblit v1.9.3