From 8ce50189f0b00d62390d67fd27f859ca7831616b Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 23 五月 2024 17:32:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/resources/mapper/StandardProductListMapper.xml | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml b/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml
index dfdbe58..5735cfd 100644
--- a/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml
+++ b/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml
@@ -16,10 +16,8 @@
<result property="manHourGroup" column="man_hour_group" jdbcType="VARCHAR"/>
<result property="inspectionItemType" column="inspection_item_type" jdbcType="VARCHAR"/>
<result property="inspectionValueType" column="inspection_value_type" jdbcType="VARCHAR"/>
- <result property="deviceGroup" column="device_group" jdbcType="VARCHAR"/>
<result property="checkoutNumber" column="checkout_number" jdbcType="INTEGER"/>
<result property="section" column="section" jdbcType="VARCHAR"/>
- <result property="valueType" column="value_type" jdbcType="VARCHAR"/>
<result property="method" column="method" jdbcType="VARCHAR"/>
<result property="manDay" column="man_day" jdbcType="INTEGER"/>
<result property="bsm" column="bsm" jdbcType="VARCHAR"/>
@@ -31,14 +29,18 @@
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
</resultMap>
- <sql id="Base_Column_List">
- id,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,
- ask,standard_method_list_id,create_user,
- update_user,create_time,update_time
- </sql>
+ <select id="standardProductListIPage" resultType="com.yuanchu.mom.pojo.StandardProductList">
+ select * from `center-lims`.standard_product_list
+ where standard_method_list_id = #{id}
+ and tree like concat('%',#{tree},'%')
+ <if test="laboratory != ''">
+ and son_laboratory = #{laboratory}
+ </if>
+ <if test="item != ''">
+ and inspection_item = #{item}
+ </if>
+ <if test="items != ''">
+ and inspection_item_subclass = #{items}
+ </if>
+ </select>
</mapper>
--
Gitblit v1.9.3