From ec6c3bc0b778178b2518302ffc9099ac8f6cc8a2 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 30 四月 2024 00:54:34 +0800
Subject: [PATCH] 标准库修复
---
inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml | 56 +++++++++++++++++++++++---------------------------------
1 files changed, 23 insertions(+), 33 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml b/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml
index 1966378..b0f5bc6 100644
--- a/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml
+++ b/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml
@@ -26,39 +26,19 @@
where id = #{id}
</select>
<select id="selectStandardMethodLists" 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>
- <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 id, code, name, remark
+ from standard_method
+ where is_use = 1
+ and is_product = 1
+ and (
+ structure_test_object_id is null
+ OR structure_test_object_id = ''
+ OR structure_test_object_id = '[]'
+ or structure_test_object_id LIKE CONCAT('%[', #{tree}, ']%')
+ )
</select>
<select id="selectParameterList" resultType="standardProductList">
- select
- inspection_item,
- inspection_item_classify,
+ select inspection_item,
inspection_item_subclass,
laboratory,
unit,
@@ -67,10 +47,8 @@
man_hour_group,
inspection_item_type,
inspection_value_type,
- device_group,
checkout_number,
section,
- value_type,
method,
man_day,
bsm,
@@ -97,4 +75,16 @@
and model = #{data5}
</if>
</select>
+ <select id="selectStandardMethodLists3" resultType="com.yuanchu.mom.pojo.StandardMethodList">
+ select id, code, name, remark
+ from standard_method
+ where is_use = 1
+ and is_product = 1
+ and (
+ structure_test_object_id is null
+ OR structure_test_object_id = ''
+ OR structure_test_object_id = '[]'
+ or structure_test_object_id LIKE CONCAT('%', #{tree}, '%')
+ )
+ </select>
</mapper>
--
Gitblit v1.9.3