From 53da067c76ca7d4406b57c1a78565bd7b990868d Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期五, 22 三月 2024 17:58:50 +0800
Subject: [PATCH] 功能大调整
---
inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml | 41 ++++++++++++++++++++++++++++++++++-------
1 files changed, 34 insertions(+), 7 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml b/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml
index f3e6d1d..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
@@ -31,7 +26,7 @@
where id = #{id}
</select>
<select id="selectStandardMethodLists" resultType="com.yuanchu.mom.pojo.StandardMethodList">
- select sml.id, code, sml.name,sml.remark, sml.create_time, u.name create_user_name
+ 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}
@@ -46,6 +41,18 @@
</if>
<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">
@@ -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