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/StandardProductListMapper.xml | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml b/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml
index d0c1aa7..565d5fc 100644
--- a/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml
+++ b/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml
@@ -61,10 +61,16 @@
<if test="model!=null">
and model = #{model}
</if>
+ <if test="inspectionItemClass != null and inspectionItemClass != ''">
+ and inspection_item_class = #{inspectionItemClass}
+ </if>
</select>
<select id="selectDetail" resultType="com.yuanchu.mom.pojo.StandardProductList">
select * from standard_product_list
- where standard_method_list_id = #{standardMethodListId}
+ where standard_method_list_id in
+ <foreach item="id" index="index" collection="ids" open="(" separator="," close=")">
+ #{id}
+ </foreach>
and state =#{state}
and model=#{model}
order by case when man_hour_group is NULL then 1
@@ -76,9 +82,12 @@
</select>
<select id="selectDetail2" resultType="com.yuanchu.mom.pojo.StandardProductList">
select * from standard_product_list
- where standard_method_list_id = #{standardMethodListId}
+ where standard_method_list_id in
+ <foreach item="id" index="index" collection="ids" open="(" separator="," close=")">
+ #{id}
+ </foreach>
and state =#{state}
- and tree like #{tree}
+ and tree =#{tree}
order by case when man_hour_group is NULL then 1
when man_hour_group ='' then 1 else 0 end,
CASE
@@ -86,4 +95,7 @@
WHEN man_hour_group REGEXP '[0-9]+' THEN CAST(SUBSTRING(man_hour_group, 2)AS UNSIGNED) END -- 鎻愬彇瀛楁瘝鍚庨潰鐨勬暟瀛楅儴鍒�
,id asc
</select>
+ <select id="selectStandardMethodById" resultType="java.lang.String">
+ select code from standard_method where id=#{standardMethodListId}
+ </select>
</mapper>
--
Gitblit v1.9.3