From 5325dfb2fda7bd21bcbcf3c8c10be1ac95793d86 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 05 八月 2024 20:40:48 +0800
Subject: [PATCH] 检验下单的委托人如果制单人的委托单位与选择的委托单位不一致,则委托人必须要进行填写,如果一致那么委托人就默认是制单人+.检验设备第一次进来直接所有样品的这个项目全部使用该设备，第二次修改就只针对当前样品
---
cnas-server/src/main/resources/mapper/DeviceMapper.xml | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/cnas-server/src/main/resources/mapper/DeviceMapper.xml b/cnas-server/src/main/resources/mapper/DeviceMapper.xml
index be1391a..b9f80a9 100644
--- a/cnas-server/src/main/resources/mapper/DeviceMapper.xml
+++ b/cnas-server/src/main/resources/mapper/DeviceMapper.xml
@@ -118,9 +118,32 @@
</select>
<select id="getInspectionItemSubclass" resultType="map">
- SELECT ip.inspection_item, if(ip.inspection_item_subclass is not null and ip.inspection_item_subclass != '',
- ip.inspection_item_subclass, ip.inspection_item) inspection_item_subclass
+ SELECT ip.inspection_item,
+ if(ip.inspection_item_subclass is not null and ip.inspection_item_subclass != '',
+ ip.inspection_item_subclass, ip.inspection_item) inspection_item_subclass
FROM ins_product ip
where ip.ins_sample_id = #{id}
</select>
+
+
+ <resultMap id="treeDeviceDto" type="map">
+ <result property="largeCategory" column="large_category"/>
+ <collection property="children" resultMap="DeviceDto" javaType="List"/>
+ </resultMap>
+
+ <resultMap id="DeviceDto" type="map">
+ <id property="id" column="id"/>
+ <result property="deviceName" column="device_name"/>
+ </resultMap>
+ <select id="treeDevice" resultMap="treeDeviceDto">
+ select id,
+ case when large_category is null || large_category ='' then '鍏朵粬'
+ else large_category end as large_category, device_name
+ from device
+ <where>
+ <if test="deviceName!=null and deviceName!=''">
+ and device_name like concat('%',#{deviceName},'%')
+ </if>
+ </where>
+ </select>
</mapper>
--
Gitblit v1.9.3