From c3e4a95cc4ada32b0ac7f14fcd5469bd1bbd1c09 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 28 六月 2024 09:53:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/resources/mapper/StandardTreeMapper.xml | 62 ++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 14 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
index b461dc1..d7fcdae 100644
--- a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
+++ b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
@@ -161,13 +161,24 @@
id structure_item_parameter_id
from structure_item_parameter
where (
- sample is NULL
- OR sample = ''
- or sample = '[]'
- OR sample LIKE CONCAT('%[', #{tree}, ']%')
- )
- order by case when man_hour_group is NULL then 1 else 0 end, CAST(man_hour_group as UNSIGNED),
- man_hour_group REGEXP '^[0-9]', id asc
+ sample is NULL
+ OR sample = ''
+ or sample = '[]'
+ OR sample LIKE CONCAT('%[', #{tree}, ']%')
+ )
+ and (laboratory is null
+ or laboratory=''
+ or laboratory = #{laboratory})
+ order by case
+ when man_hour_group is NULL then 1
+ 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 -- 鎻愬彇瀛楁瘝鍚庨潰鐨勬暟瀛楅儴鍒�
+
+ , id asc
</select>
<select id="selectStandardProductListByTree2" resultType="com.yuanchu.mom.pojo.StandardProductList">
@@ -202,8 +213,19 @@
id structure_item_parameter_id
from structure_item_parameter
where sample LIKE CONCAT('%[', #{tree}, ']%')
- order by case when man_hour_group is NULL then 1 else 0 end, CAST(man_hour_group as UNSIGNED),
- man_hour_group REGEXP '^[0-9]', id asc
+ and (laboratory is null
+ or laboratory=''
+ or laboratory = #{laboratory})
+ order by case
+ when man_hour_group is NULL then 1
+ 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 -- 鎻愬彇瀛楁瘝鍚庨潰鐨勬暟瀛楅儴鍒�
+
+ , id asc
</select>
<select id="getStandardTree2" resultMap="SampleTypeDto">
@@ -252,11 +274,22 @@
or sample = '[]'
OR sample LIKE CONCAT('%', #{tree}, '%')
)
- order by case when man_hour_group is NULL then 1 else 0 end, CAST(man_hour_group as UNSIGNED),
- man_hour_group REGEXP '^[0-9]', id asc
+ and (laboratory is null
+ or laboratory=''
+ or laboratory = #{laboratory})
+ order by case
+ when man_hour_group is NULL then 1
+ 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 -- 鎻愬彇瀛楁瘝鍚庨潰鐨勬暟瀛楅儴鍒�
+
+ , id asc
</select>
<select id="getStandardTree3" resultType="com.yuanchu.mom.dto.SampleDto">
- select model label,
+ select model label,
model value
from standard_tree
where sample_type = #{sampleType}
@@ -280,8 +313,9 @@
</if>
</select>
<select id="selectPList" resultType="com.yuanchu.mom.dto.ProductDto">
- select p.name from structure_test_object sto
- left join product p on p.object_id = sto.id
+ select p.name
+ from structure_test_object sto
+ left join product p on p.object_id = sto.id
where sto.specimen_name = #{name}
order by p.id
</select>
--
Gitblit v1.9.3