From 929c6698f4d7598997fc233e09c39c3bdce9fcf8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 14 八月 2025 10:23:15 +0800
Subject: [PATCH] 判断合格绝对值的问题
---
inspect-server/src/main/resources/mapper/StandardTreeMapper.xml | 69 ++++++++++++++++++++++++++++------
1 files changed, 56 insertions(+), 13 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
index d7fcdae..ddcab1d 100644
--- a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
+++ b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
@@ -167,7 +167,7 @@
OR sample LIKE CONCAT('%[', #{tree}, ']%')
)
and (laboratory is null
- or laboratory=''
+ or laboratory = ''
or laboratory = #{laboratory})
order by case
when man_hour_group is NULL then 1
@@ -213,9 +213,9 @@
id structure_item_parameter_id
from structure_item_parameter
where sample LIKE CONCAT('%[', #{tree}, ']%')
- and (laboratory is null
- or laboratory=''
- or laboratory = #{laboratory})
+ 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
@@ -269,14 +269,14 @@
id structure_item_parameter_id
from structure_item_parameter
where (
- sample is NULL
- OR sample = ''
- or sample = '[]'
- OR sample LIKE CONCAT('%', #{tree}, '%')
- )
- and (laboratory is null
- or laboratory=''
- or laboratory = #{laboratory})
+ 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
@@ -289,7 +289,7 @@
, 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}
@@ -308,6 +308,9 @@
<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>
@@ -319,4 +322,44 @@
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