From 9f19d3a24f8474bf6f9eb9401888c44b34b381e6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 21 十一月 2024 14:29:50 +0800
Subject: [PATCH] 第一次改动(检验任务与样品关联,附件与样品关联,报告与样品关联)
---
inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml | 80 ++++++++++++++++++++++++++-------------
1 files changed, 53 insertions(+), 27 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml b/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml
index f3e6d1d..54caf1b 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,34 @@
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 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="selectParameterList" resultType="standardProductList">
+ select inspection_item,
+ inspection_item_subclass,
+ laboratory,
+ unit,
+ price,
+ man_hour,
+ man_hour_group,
+ inspection_item_type,
+ inspection_value_type,
+ checkout_number,
+ section,
+ method,
+ man_day,
+ 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}
@@ -48,26 +70,30 @@
and model = #{data5}
</if>
</select>
- <select id="selectParameterList" resultType="standardProductList">
- select
- inspection_item,
- inspection_item_classify,
- inspection_item_subclass,
- laboratory,
- unit,
- price,
- man_hour,
- man_hour_group,
- inspection_item_type,
- inspection_value_type,
- device_group,
- checkout_number,
- section,
- value_type,
- method,
- man_day,
- bsm
- from structure_item_parameter
- where method = #{code}
+ <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>
+ <select id="getStandardMethodId" resultType="java.lang.Integer">
+ select id from standard_method where code = #{code}
</select>
</mapper>
--
Gitblit v1.9.3