From ea7654c0cdb21ec7e8f854df6d0a7367b5e5d6ac Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 04 六月 2024 11:58:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml b/cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml
index 428ec1f..143913e 100644
--- a/cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml
+++ b/cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml
@@ -3,11 +3,13 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.StructureItemParameterMapper">
+ <delete id="removeNoSample">
+ delete from structure_item_parameter where sample like concat('%',#{sample},'%')
+ </delete>
<select id="selectItemParameterList" resultType="com.yuanchu.mom.pojo.StructureItemParameter">
select id,
inspection_item,
inspection_item_en,
- inspection_item_classify,
inspection_item_subclass,
inspection_item_subclass_en,
laboratory,
@@ -16,10 +18,8 @@
man_hour,
man_hour_group,
inspection_item_type,
- device_group,
checkout_number,
section,
- value_type,
create_user,
update_user,
create_time,
@@ -54,4 +54,18 @@
else inspection_item_subclass end as subclass
from structure_item_parameter
</select>
+ <select id="getItemTree" resultMap="itemDto">
+ select sto.id sId,sto.specimen_name sName,p.id pId,p.name pName from structure_test_object sto
+ left join product p on p.object_id = sto.id
+ </select>
+
+ <resultMap id="itemDto" type="com.yuanchu.mom.dto.TestItemDto">
+ <result column="sId" property="id"/>
+ <result column="sName" property="name"/>
+ <collection property="children" resultMap="productDto"/>
+ </resultMap>
+ <resultMap id="productDto" type="com.yuanchu.mom.dto.ProductDto">
+ <result column="pId" property="id"/>
+ <result column="pName" property="name"/>
+ </resultMap>
</mapper>
--
Gitblit v1.9.3