From d86a37f36ec375f8aa3d3eaee18ea1ad323eba0b Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期五, 26 四月 2024 09:13:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml | 62 +++++++++++++++++++++++++++---
1 files changed, 55 insertions(+), 7 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml b/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml
index 7b812d4..1966378 100644
--- a/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml
+++ b/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml
@@ -9,18 +9,12 @@
<result property="code" column="code" jdbcType="VARCHAR"/>
<result property="name" column="name" jdbcType="VARCHAR"/>
<result property="remark" column="remark" jdbcType="VARCHAR"/>
- <result property="standardTreeId" column="standard_tree_id" jdbcType="INTEGER"/>
<result property="createUser" column="create_user" jdbcType="INTEGER"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="updateUser" column="update_user" jdbcType="INTEGER"/>
<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
@@ -32,7 +26,61 @@
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}
+ <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>
+ <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,
+ 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}
--
Gitblit v1.9.3