From 51d7b5b62db52c8c80d0bac9d42c37e33ce48a5d Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 29 七月 2026 17:20:45 +0800
Subject: [PATCH] 1.手动下单：修复选择样品后查询的检测项缺失问题 2.人员考勤：修复同步ICC考勤数据报错问题
---
basic-server/src/main/resources/mapper/StandardProductListMapper.xml | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/basic-server/src/main/resources/mapper/StandardProductListMapper.xml b/basic-server/src/main/resources/mapper/StandardProductListMapper.xml
index 2f380a4..8822e34 100644
--- a/basic-server/src/main/resources/mapper/StandardProductListMapper.xml
+++ b/basic-server/src/main/resources/mapper/StandardProductListMapper.xml
@@ -110,6 +110,7 @@
where standard_method_list_id = #{standardMethodListId}
and state =#{state}
and model=#{model}
+ and tree=#{tree}
<if test="isCableTag != null and isCableTag != ''">
and (inspection_item_class like concat('%缁撴瀯灏哄%') or
inspection_item_class like concat('%鐢电紗鐢垫�ц兘%')or
@@ -154,4 +155,19 @@
from structure_test_object_part
where part_no = #{partNo}
</select>
+ <select id="selectStandardProductList" resultType="com.ruoyi.basic.vo.StandardProductListVO">
+ select
+ spl.*,
+ u1.name AS create_user_name,
+ u2.name AS update_user_name
+ from standard_product_list spl
+ left join user u1 on u1.id = spl.create_user
+ left join user u2 on u2.id = spl.update_user
+ where 1=1
+ and spl.standard_method_list_id = #{standardMethodListId}
+ and spl.tree like concat('%',#{tree},'%')
+ <if test="isDrag!=null and isDrag">
+ ORDER BY spl.sort
+ </if>
+ </select>
</mapper>
--
Gitblit v1.9.3