From 5325dfb2fda7bd21bcbcf3c8c10be1ac95793d86 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期一, 05 八月 2024 20:40:48 +0800 Subject: [PATCH] 检验下单的委托人如果制单人的委托单位与选择的委托单位不一致,则委托人必须要进行填写,如果一致那么委托人就默认是制单人+.检验设备第一次进来直接所有样品的这个项目全部使用该设备,第二次修改就只针对当前样品 --- inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 deletions(-) diff --git a/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml b/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml index b0f5bc6..54caf1b 100644 --- a/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml +++ b/inspect-server/src/main/resources/mapper/StandardMethodListMapper.xml @@ -30,12 +30,7 @@ from standard_method where is_use = 1 and is_product = 1 - and ( - structure_test_object_id is null - OR structure_test_object_id = '' - OR structure_test_object_id = '[]' - or structure_test_object_id LIKE CONCAT('%[', #{tree}, ']%') - ) + and structure_test_object_id LIKE CONCAT('%[', #{tree}, ']%') </select> <select id="selectParameterList" resultType="standardProductList"> select inspection_item, @@ -80,11 +75,25 @@ from standard_method where is_use = 1 and is_product = 1 + and structure_test_object_id LIKE CONCAT('%', #{tree}, '%') + </select> + <select id="selectListEnum" resultType="com.yuanchu.mom.pojo.StandardMethodList"> + select id,code,name from standard_method + where is_product = 1 + and is_use = 1 + </select> + <select id="selectStandardMethodListsByNull" resultType="com.yuanchu.mom.pojo.StandardMethodList"> + select id, code, name, remark + from standard_method + where is_use = 1 + and is_product = 1 and ( structure_test_object_id is null OR structure_test_object_id = '' OR structure_test_object_id = '[]' - or structure_test_object_id LIKE CONCAT('%', #{tree}, '%') ) </select> + <select id="getStandardMethodId" resultType="java.lang.Integer"> + select id from standard_method where code = #{code} + </select> </mapper> -- Gitblit v1.9.3