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/StandardProductListMapper.xml |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml b/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml
index 7931dcd..3202056 100644
--- a/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml
+++ b/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml
@@ -61,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
@@ -78,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