From 7ea524a6d99e7c1d9be17c88e24b2e860e5ba351 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 21 六月 2024 15:49:52 +0800
Subject: [PATCH] 设备的检测项目多加一层检验对象
---
cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml b/cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml
index 031e9e2..02911c3 100644
--- a/cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml
+++ b/cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml
@@ -58,7 +58,7 @@
END,
CAST(code AS UNSIGNED),
case when man_hour_group is NULL then 1
- when man_hour_group ='' then 1 else 0 end,
+ when man_hour_group ='' then 1 else 0 end,
CASE
WHEN man_hour_group REGEXP '^[0-9]' THEN CAST(man_hour_group AS UNSIGNED) -- 濡傛灉浠ユ暟瀛楀紑澶达紝鍒欐寜鐓ф暟瀛楀ぇ灏忔帓搴�
WHEN man_hour_group REGEXP '[0-9]+' THEN CAST(SUBSTRING(man_hour_group, 2)AS UNSIGNED) END -- 鎻愬彇瀛楁瘝鍚庨潰鐨勬暟瀛楅儴鍒�
@@ -66,15 +66,27 @@
</select>
<resultMap id="getInsProductions" type="map">
- <result property="name" column="inspection_item"/>
+ <result property="name" column="sample"/>
<collection property="children" resultMap="seProInsListByIdmaps" javaType="List"/>
</resultMap>
<resultMap id="seProInsListByIdmaps" type="map">
+ <result property="name" column="inspection_item"/>
+ <collection property="children" resultMap="seProInsListByIdmaps2" javaType="List"/>
+ </resultMap>
+ <resultMap id="seProInsListByIdmaps2" type="map">
<id property="id" column="id"/>
<result property="name" column="subclass"/>
</resultMap>
<select id="getInsProduction" resultMap="getInsProductions">
- select id,
+ select distinct id,
+ CASE
+ WHEN INSTR(sample, ',') > 0 THEN
+ SUBSTRING_INDEX(SUBSTRING_INDEX(sample, '","', 1), '"', -1)
+ when sample = '[""]' then '*'
+ ELSE
+ TRIM(BOTH '["]' FROM SUBSTRING_INDEX(REPLACE(sample, '[["', ''), '"]]', 1))
+ END
+ as sample,
inspection_item,
case
when inspection_item_subclass is null then inspection_item
--
Gitblit v1.9.3