From 12e35c60f9be4403b5cdec5f0d87c2d0f7384dd3 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 18 六月 2024 10:28:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml | 62 ++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 14 deletions(-)
diff --git a/cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml b/cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml
index 428ec1f..44a1f3f 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,
+ select * from (select A.id,
inspection_item,
inspection_item_en,
- inspection_item_classify,
inspection_item_subclass,
inspection_item_subclass_en,
laboratory,
@@ -16,14 +18,12 @@
man_hour,
man_hour_group,
inspection_item_type,
- device_group,
checkout_number,
section,
- value_type,
- create_user,
- update_user,
- create_time,
- update_time,
+ A.create_user,
+ A.update_user,
+ A.create_time,
+ A.update_time,
method,
man_day,
bsm,
@@ -33,11 +33,28 @@
template_id,
son_laboratory,
ask,
- ask_tell
- from structure_item_parameter
+ ask_tell,
+ inspection_item_class,
+ inspection_item_class_en,
+ code
+ from (select *,
+ CASE
+ WHEN INSTR(sample, ',') > 0 THEN
+ SUBSTRING_INDEX(SUBSTRING_INDEX(sample, '","', 1), '"', -1)
+ when sample = '[""]' then null
+ ELSE
+ TRIM(BOTH '["]' FROM SUBSTRING_INDEX(REPLACE(sample, '[["', ''), '"]]', 1))
+ END AS samples
+ from structure_item_parameter) A
+ left join structure_test_object sto on samples = specimen_name
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
- </if>
+ </if>)B
+ order by CASE
+ WHEN code IS NULL THEN 1
+ ELSE 0
+ END,
+ CAST(code AS UNSIGNED) asc
</select>
<resultMap id="getInsProductions" type="map">
@@ -49,9 +66,26 @@
<result property="name" column="subclass"/>
</resultMap>
<select id="getInsProduction" resultMap="getInsProductions">
- select id, inspection_item,
- case when inspection_item_subclass='' then inspection_item
- else inspection_item_subclass end as subclass
+ select id,
+ inspection_item,
+ case
+ when inspection_item_subclass is null then inspection_item
+ 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