From b434c283d2a4787b6eb840a0289d6adc62fba132 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 14 五月 2024 15:07:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml b/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml
index c59fe21..721b82c 100644
--- a/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml
+++ b/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml
@@ -30,17 +30,10 @@
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}, '%')
- )
+ and 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,
@@ -49,10 +42,8 @@
man_hour_group,
inspection_item_type,
inspection_value_type,
- device_group,
checkout_number,
section,
- value_type,
method,
man_day,
bsm,
@@ -79,4 +70,27 @@
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 LIKE CONCAT('%', #{tree}, '%')
+ </select>
+ <select id="selectListEnum" resultType="com.yuanchu.mom.pojo.StandardMethodList">
+ select id,code,name from standard_method
+ where is_product = 1
+ and is_use = 1
+ </select>
+ <select id="selectStandardMethodListsByNull" 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 = '[]'
+ )
+ </select>
</mapper>
--
Gitblit v1.9.3