From 4e5d5dbb194f097a19ad8ed0ebb8b0d2247230f3 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 08 四月 2025 15:35:28 +0800
Subject: [PATCH] 成品下单检验项查询修改
---
basic-server/src/main/resources/mapper/StandardProductListMapper.xml | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/basic-server/src/main/resources/mapper/StandardProductListMapper.xml b/basic-server/src/main/resources/mapper/StandardProductListMapper.xml
index 0760977..a85d156 100644
--- a/basic-server/src/main/resources/mapper/StandardProductListMapper.xml
+++ b/basic-server/src/main/resources/mapper/StandardProductListMapper.xml
@@ -29,12 +29,12 @@
</resultMap>
<!-- 鎵归噺娣诲姞妫�娴嬫爣鍑� -->
- <insert id="saveBatchProductLists" keyProperty="id" useGeneratedKeys="true">
- INSERT INTO standard_product_list (id, inspection_item, inspection_item_en, inspection_item_subclass, inspection_item_subclass_en, factory, laboratory, sample_type, sample, model, son_laboratory, unit, price, man_hour, man_hour_group, inspection_item_type, inspection_value_type, checkout_number, section, cores, method, method_s, man_day, bsm, ask, tell, standard_method_list_id, template_id, state, dic, tree, structure_item_parameter_id, inspection_item_class, inspection_item_class_en, radius, radius_list, rates, sort, conductor_material, conductor_type)
+ <insert id="saveBatchProductLists">
+ INSERT INTO standard_product_list (id, inspection_item, inspection_item_en, inspection_item_subclass, inspection_item_subclass_en, factory, laboratory, sample_type, sample, model, son_laboratory, unit, price, man_hour, man_hour_group, inspection_item_type, inspection_value_type, checkout_number, section, cores, method, method_s, man_day, bsm, ask, tell, standard_method_list_id, template_id, state, dic, tree, structure_item_parameter_id, inspection_item_class, inspection_item_class_en, radius, radius_list, rates, sort, conductor_material, conductor_type, check_status)
VALUES
<foreach item="item" collection="productLists" open="(" separator="),(" close=")">
#{item.id}, #{item.inspectionItem}, #{item.inspectionItemEn}, #{item.inspectionItemSubclass}, #{item.inspectionItemSubclassEn}, #{item.factory}, #{item.sonLaboratory}, #{item.sampleType}, #{item.sample}, #{item.model}, #{item.sonLaboratory}, #{item.unit}, #{item.price}, #{item.manHour}, #{item.manHourGroup}, #{item.inspectionItemType}, #{item.inspectionValueType}, #{item.checkoutNumber}, #{item.section}, #{item.cores}, #{item.method}, #{item.methodS}, #{item.manDay}, #{item.bsm}, #{item.ask}, #{item.tell}, #{item.standardMethodListId}, #{item.templateId}, #{item.state}, #{item.dic}, #{item.tree}, #{item.structureItemParameterId},
- #{item.inspectionItemClass}, #{item.inspectionItemClassEn}, #{item.radius}, #{item.radiusList}, #{item.rates}, #{item.sort}, #{item.conductorMaterial}, #{item.conductorType}
+ #{item.inspectionItemClass}, #{item.inspectionItemClassEn}, #{item.radius}, #{item.radiusList}, #{item.rates}, #{item.sort}, #{item.conductorMaterial}, #{item.conductorType}, #{item.checkStatus}
</foreach>
</insert>
@@ -51,7 +51,8 @@
ask=#{productList.ask},
tell=#{productList.tell},
update_user=#{productList.updateUser},
- update_time=#{productList.updateTime}
+ update_time=#{productList.updateTime},
+ check_status=#{productList.checkStatus}
WHERE id = #{productList.id}
</update>
<update id="updateSortUp">
@@ -154,4 +155,31 @@
from structure_test_object_part
where part_no = #{partNo}
</select>
+
+ <update id="updateProductListCheckStatus">
+ UPDATE standard_product_list SET check_status = #{checkStatus}
+ WHERE ID IN
+ <foreach collection="ids" open="(" close=")" item="item" separator=",">
+ #{item}
+ </foreach>
+ </update>
+
+ <select id="standardProductListNoPage" resultType="com.ruoyi.basic.pojo.StandardProductList">
+ SELECT * FROM standard_product_list
+ <where>
+ <if test="standardProductListDto.standardMethodListIds != null">
+ AND standard_method_list_id IN
+ <foreach collection="standardProductListDto.standardMethodListIds" open="(" close=")" separator="," item="item">
+ #{item}
+ </foreach>
+ </if>
+ <if test="standardProductListDto.tree != null and standardProductListDto.tree != '' ">
+ AND tree = #{standardProductListDto.tree}
+ </if>
+ <if test="standardProductListDto.state != null ">
+ AND state = #{standardProductListDto.state}
+ </if>
+ </where>
+ ORDER BY standard_method_list_id ASC
+ </select>
</mapper>
--
Gitblit v1.9.3