From 461fb02ec8264079f73fd2b6f937ad4f40754cb9 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期三, 19 六月 2024 23:39:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 inspect-server/src/main/resources/mapper/StandardProductListMapper.xml |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml b/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml
index e4eba45..a9102ca 100644
--- a/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml
+++ b/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml
@@ -60,4 +60,20 @@
             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