From 9183a9a18a910d5b099119240a86a3a87ce42106 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 05 八月 2024 20:41:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/resources/mapper/StandardProductListMapper.xml | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml b/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml
index 1a649df..3202056 100644
--- a/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml
+++ b/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml
@@ -42,6 +42,7 @@
<if test="insItems != ''">
and inspection_item_subclass = #{insItems}
</if>
+ group by spl.id
order by p.id
</select>
<select id="getOne" resultType="com.yuanchu.mom.pojo.StandardProductList">
@@ -60,6 +61,9 @@
<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
@@ -77,7 +81,7 @@
select * from standard_product_list
where standard_method_list_id = #{standardMethodListId}
and state =#{state}
- and tree=#{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
--
Gitblit v1.9.3