From 7f2f54e5ae3d3bf09172e1520d8d9dfb556d57c4 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 27 五月 2024 17:23:41 +0800
Subject: [PATCH] 功能调整
---
inspect-server/src/main/resources/mapper/StandardTreeMapper.xml | 227 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 187 insertions(+), 40 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
index 12edc0e..ce4a5cc 100644
--- a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
+++ b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
@@ -5,16 +5,16 @@
<mapper namespace="com.yuanchu.mom.mapper.StandardTreeMapper">
<resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.StandardTree">
- <id property="id" column="id" jdbcType="INTEGER"/>
- <result property="factory" column="factory" jdbcType="VARCHAR"/>
- <result property="laboratory" column="laboratory" jdbcType="VARCHAR"/>
- <result property="sampleType" column="sample_type" jdbcType="VARCHAR"/>
- <result property="sample" column="sample" jdbcType="VARCHAR"/>
- <result property="model" column="model" jdbcType="VARCHAR"/>
- <result property="createUser" column="create_user" jdbcType="INTEGER"/>
- <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
- <result property="updateUser" column="update_user" jdbcType="INTEGER"/>
- <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+ <id property="id" column="id" jdbcType="INTEGER"/>
+ <result property="factory" column="factory" jdbcType="VARCHAR"/>
+ <result property="laboratory" column="laboratory" jdbcType="VARCHAR"/>
+ <result property="sampleType" column="sample_type" jdbcType="VARCHAR"/>
+ <result property="sample" column="sample" jdbcType="VARCHAR"/>
+ <result property="model" column="model" jdbcType="VARCHAR"/>
+ <result property="createUser" column="create_user" jdbcType="INTEGER"/>
+ <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+ <result property="updateUser" column="update_user" jdbcType="INTEGER"/>
+ <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
</resultMap>
<resultMap id="FactoryDto" type="com.yuanchu.mom.dto.FactoryDto">
@@ -47,36 +47,23 @@
</resultMap>
<select id="selectStandardTreeList" resultMap="FactoryDto">
- select factory,laboratory,sample_type,sample,model from standard_tree
+ select '涓ぉ绉戞妧妫�娴嬩腑蹇�' factory,
+ l.laboratory_name laboratory,
+ sto.specimen_name sample_type,
+ p.name sample,
+ st.model,
+ sto.code
+ from laboratory l
+ left join structure_test_object sto on sto.laboratory_id = l.id
+ left join product p on p.object_id = sto.id
+ left join standard_tree st on st.laboratory = l.laboratory_name
+ and st.sample_type = sto.specimen_name
+ and st.sample = p.name
+ order by l.id,CAST(sto.code AS DECIMAL),p.id,ISNULL(st.id),st.id
</select>
<select id="selectStandardProductById" resultType="com.yuanchu.mom.pojo.StandardProductList">
- select
- inspection_item,
- inspection_item_classify,
- inspection_item_subclass,
- laboratory,
- son_laboratory,
- unit,
- price,
- man_hour,
- man_hour_group,
- inspection_item_type,
- inspection_value_type,
- device_group,
- checkout_number,
- section,
- value_type,
- method,
- man_day,
- bsm,
- template_id
- from structure_item_parameter
- where id = #{id}
- </select>
- <select id="getStandardProductListBySample" resultType="com.yuanchu.mom.pojo.StandardProductList">
select inspection_item,
- inspection_item_classify,
inspection_item_subclass,
laboratory,
son_laboratory,
@@ -86,16 +73,176 @@
man_hour_group,
inspection_item_type,
inspection_value_type,
- device_group,
checkout_number,
section,
- value_type,
+ method,
+ man_day,
+ bsm,
+ template_id
+ from structure_item_parameter
+ where id = #{id}
+ </select>
+ <select id="getStandardProductListBySample" resultType="com.yuanchu.mom.pojo.StandardProductList">
+ select inspection_item,
+ inspection_item_subclass,
+ laboratory,
+ son_laboratory,
+ unit,
+ price,
+ man_hour,
+ man_hour_group,
+ inspection_item_type,
+ inspection_value_type,
+ checkout_number,
+ section,
method,
man_day,
sample,
bsm,
- template_id
+ template_id,
+ dic,
+ ask,
+ ask_tell as tell
+ from structure_item_parameter sp
+ where sp.sample = #{sampleType}
+ or sp.sample = ''
+ or sp.sample = '[]'
+ </select>
+ <select id="getStandardMethodListBySample" resultType="com.yuanchu.mom.pojo.StandardMethodList">
+ select sm.code,sm.name,sm.remark from standard_method sm
+ left join structure_test_object sto on sm.structure_test_object_id = sto.id
+ where is_use = 1
+ and is_product = 1
+ <if test="sampleType != null">
+ and sto.specimen_name = #{sampleType}
+ </if>
+ </select>
+ <select id="selectStandardTreeList2" resultType="com.yuanchu.mom.pojo.StandardTree">
+ select '涓ぉ绉戞妧妫�娴嬩腑蹇�' factory,
+ l.laboratory_name laboratory,
+ sto.specimen_name sample_type,
+ p.name sample
+ from laboratory l
+ left join structure_test_object sto on sto.laboratory_id = l.id
+ left join product p on p.object_id = sto.id
+ left join standard_tree st on st.laboratory = l.laboratory_name
+ and st.sample_type = sto.specimen_name
+ and st.sample = p.name
+ where sto.specimen_name = #{sampleType}
+ group by sto.specimen_name
+ </select>
+ <select id="selectStandardProductListByTree" resultType="com.yuanchu.mom.pojo.StandardProductList">
+ select sample sample2,
+ inspection_item,
+ inspection_item_en,
+ inspection_item_subclass,
+ inspection_item_subclass_en,
+ method,
+ son_laboratory,
+ unit,
+ ask_tell tell,
+ ask,
+ price,
+ man_hour,
+ man_hour_group,
+ man_day,
+ inspection_item_type,
+ inspection_value_type,
+ bsm,
+ template_id,
+ laboratory,
+ checkout_number,
+ section,
+ dic,
+ 0 state,
+ #{model} model,
+ #{sample} sample,
+ #{trees} tree,
+ id structure_item_parameter_id
from structure_item_parameter
- where sample = #{sample}
+ where (
+ sample is NULL
+ OR sample = ''
+ or sample = '[]'
+ OR sample LIKE CONCAT('%[', #{tree}, ']%')
+ )
+ </select>
+
+ <select id="selectStandardProductListByTree2" resultType="com.yuanchu.mom.pojo.StandardProductList">
+ select sample sample2,
+ inspection_item,
+ inspection_item_en,
+ inspection_item_subclass,
+ inspection_item_subclass_en,
+ method,
+ son_laboratory,
+ unit,
+ ask_tell tell,
+ ask,
+ price,
+ man_hour,
+ man_hour_group,
+ man_day,
+ inspection_item_type,
+ inspection_value_type,
+ bsm,
+ template_id,
+ laboratory,
+ checkout_number,
+ section,
+ dic,
+ 0 state,
+ #{model} model,
+ #{sample} sample,
+ #{trees} tree,
+ id structure_item_parameter_id
+ from structure_item_parameter
+ where sample LIKE CONCAT('%[', #{tree}, ']%')
+ </select>
+
+ <select id="getStandardTree2" resultMap="SampleTypeDto">
+ select sto.specimen_name sample_type,
+ p.name sample,
+ st.model
+ from structure_test_object sto
+ left join product p on p.object_id = sto.id
+ left join standard_tree st on st.sample_type = sto.specimen_name
+ and st.sample = p.name
+ </select>
+ <select id="selectStandardProductListByTree3" resultType="com.yuanchu.mom.pojo.StandardProductList">
+ select sample sample2,
+ inspection_item,
+ inspection_item_en,
+ inspection_item_subclass,
+ inspection_item_subclass_en,
+ method,
+ son_laboratory,
+ unit,
+ ask_tell tell,
+ ask,
+ price,
+ man_hour,
+ man_hour_group,
+ man_day,
+ inspection_item_type,
+ inspection_value_type,
+ bsm,
+ template_id,
+ laboratory,
+ checkout_number,
+ section,
+ dic,
+ 0 state,
+ #{model} model,
+ #{sample} sample,
+ #{trees} tree,
+ id structure_item_parameter_id
+ from structure_item_parameter
+ where (
+ sample is NULL
+ OR sample = ''
+ or sample = '[]'
+ OR sample LIKE CONCAT('%', #{tree}, '%')
+ )
</select>
</mapper>
--
Gitblit v1.9.3