From 9f19d3a24f8474bf6f9eb9401888c44b34b381e6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 21 十一月 2024 14:29:50 +0800
Subject: [PATCH] 第一次改动(检验任务与样品关联,附件与样品关联,报告与样品关联)
---
inspect-server/src/main/resources/mapper/StandardTreeMapper.xml | 113 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 95 insertions(+), 18 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
index b461dc1..ddcab1d 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">
@@ -247,13 +269,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="getStandardTree3" resultType="com.yuanchu.mom.dto.SampleDto">
select model label,
@@ -275,14 +308,58 @@
<if test="itemChild != null and itemChild != ''">
and inspection_item_subclass = #{itemChild}
</if>
+ <if test="inspectionItemClass != null and inspectionItemClass != ''">
+ and inspection_item_class = #{inspectionItemClass}
+ </if>
<if test="itemChild == null or itemChild == ''">
and (inspection_item_subclass is null or inspection_item_subclass = '')
</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>
+ <select id="selSample" resultType="java.lang.String">
+ select name
+ from product
+ where name = #{name}
+ </select>
+
+ <select id="exportStandTree" resultType="com.yuanchu.mom.dto.standardTreeDto">
+ select
+ inspection_item,
+ inspection_item_en,
+ inspection_item_subclass,
+ inspection_item_subclass_en,
+ laboratory,
+ sample_type,
+ sample,
+ model,
+ son_laboratory,
+ unit,
+ price,
+ man_hour,
+ man_hour_group,
+ case when inspection_item_type='1' then '閲囬泦绫诲瀷'
+ else '闈為噰闆嗙被鍨�' end as inspection_item_type ,
+ case when inspection_value_type='1' then '鏁板��'
+ when inspection_value_type='2' then '鏂囨湰'
+ when inspection_value_type='5' then '涓嬫媺'
+ else '/' end as inspection_value_type,
+ method_s,
+ man_day,
+ bsm,
+ ask,
+ tell,
+ st.name templateName,
+ sml.code standardMethodNo
+ from standard_product_list spl
+ left join standard_template st on spl.template_id = st.id
+ left join standard_method sml on spl.standard_method_list_id = sml.id
+ where spl.state = 1
+ order by spl.sample_type
+ </select>
</mapper>
--
Gitblit v1.9.3