From cddc46a1ba318426cf01ae3fd354807c3b3b2465 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期三, 17 四月 2024 13:44:14 +0800
Subject: [PATCH] 调整模板功能；生成检验人员的三层架构文件
---
inspect-server/src/main/resources/mapper/StandardTreeMapper.xml | 77 ++++++++++++++++++++++----------------
1 files changed, 44 insertions(+), 33 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
index fc7e938..34c8d68 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,38 @@
</resultMap>
<select id="selectStandardTreeList" resultMap="FactoryDto">
- select factory, laboratory, sample_type, sample, model
- from standard_tree
+ select factory,laboratory,sample_type,sample,model from standard_tree
</select>
<select id="selectStandardProductById" resultType="com.yuanchu.mom.pojo.StandardProductList">
- select inspection_item,
- inspection_item_classify,
- inspection_item_subclass,
- 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
+ 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,
unit,
price,
man_hour,
@@ -90,8 +92,17 @@
method,
man_day,
sample,
- bsm
- from structure_item_parameter
- where sample = #{sample}
+ bsm,
+ template_id,
+ dic
+ from structure_item_parameter sp
+ left join structure_test_object sto on sto.id = sp.sample
+ where sto.specimen_name = #{sampleType}
+ </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 sto.specimen_name = #{sampleType}
+ and is_product = 1
</select>
</mapper>
--
Gitblit v1.9.3