From b5baef17219976dffdb791fb0860685ae06bf0a2 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 19 六月 2024 11:49:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/resources/mapper/StandardProductListMapper.xml | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml b/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml
index a696171..a9102ca 100644
--- a/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml
+++ b/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml
@@ -53,8 +53,27 @@
<if test="inspectionItemSubclass!=null">
and inspection_item_subclass = #{inspectionItemSubclass}
</if>
+ <if test="inspectionItemSubclass == null">
+ and (inspection_item_subclass is null or inspection_item_subclass = '')
+ </if>
<if test="model!=null">
and model = #{model}
</if>
</select>
+ <select id="selectDetail" resultType="com.yuanchu.mom.pojo.StandardProductList">
+ select * from standard_product_list
+ where standard_method_list_id = #{standardMethodListId}
+ and state =#{state}
+ and model=#{model}
+ order by case when man_hour_group is NULL then 1 else 0 end, CAST(man_hour_group as UNSIGNED),
+ man_hour_group REGEXP '^[0-9]', id asc
+ </select>
+ <select id="selectDetail2" resultType="com.yuanchu.mom.pojo.StandardProductList">
+ select * from standard_product_list
+ where standard_method_list_id = #{standardMethodListId}
+ and state =#{state}
+ and tree=#{tree}
+ order by case when man_hour_group is NULL then 1 else 0 end, CAST(man_hour_group as UNSIGNED),
+ man_hour_group REGEXP '^[0-9]', id asc
+ </select>
</mapper>
--
Gitblit v1.9.3