From ede49ec7133b86d9db9dc1f0328418dcdaaef8aa Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 28 二月 2025 15:16:55 +0800
Subject: [PATCH] 报告修改+实验结果
---
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 74 +++++++++++++++++++++++--------------
1 files changed, 46 insertions(+), 28 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index 673b974..cfae4bb 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -23,7 +23,6 @@
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
</resultMap>
-
<select id="findInsSampleAndOrder" resultType="com.yuanchu.mom.vo.InsOrderPlanVO">
select * from(
select * from(
@@ -151,7 +150,7 @@
</if>
OR isu.user_id is NULL
) a
- ON ios.ins_order_id = a.id AND ios.laboratory = #{sonLaboratory} and a.sampleId=ios.ins_sample_id
+ ON ios.ins_order_id = a.id AND ios.laboratory = #{sonLaboratory} and a.sampleId=ios.ins_sample_id
left join
(SELECT td.user_id order_user_id, td.ins_sample_id FROM ins_sample_user td,(SELECT max(id) id FROM
ins_sample_user where son_laboratory=#{sonLaboratory} GROUP BY ins_sample_id) md where td.id = md.id
@@ -181,6 +180,7 @@
inspection_item_class_en,
inspection_item_subclass,
inspection_item_subclass_en,
+
ip.factory ip_factory,
ip.laboratory ip_laboratory,
ip.sample_type ip_sample_type,
@@ -267,7 +267,10 @@
ipr.equip_value,
ipr.equip_name,
ipr.before_check,
+ ipr.before_note,
ipr.after_check,
+ ipr.after_note,
+ ipr.test_result,
ipr2.frequency,
ipr2.often,
ipr2.port,
@@ -337,7 +340,10 @@
ipr.equip_value,
ipr.equip_name,
ipr.before_check,
+ ipr.before_note,
ipr.after_check,
+ ipr.after_note,
+ ipr.test_result,
ipr2.frequency,
ipr2.often,
ipr2.port,
@@ -370,21 +376,21 @@
</select>
<select id="selectSampleProductListByOrderId2" resultMap="sampleDto">
select isa.*,
- ios.num num1,
- ip.id ip_id,
+ ios.num num1,
+ ip.id ip_id,
inspection_item,
inspection_item_en,
inspection_item_subclass,
inspection_item_subclass_en,
inspection_item_class,
inspection_item_class_en,
- ip.factory ip_factory,
- ip.laboratory ip_laboratory,
- ip.sample_type ip_sample_type,
- ip.sample ip_sample,
- ip.model ip_model,
+ ip.factory ip_factory,
+ ip.laboratory ip_laboratory,
+ ip.sample_type ip_sample_type,
+ ip.sample ip_sample,
+ ip.model ip_model,
son_laboratory,
- ip.unit ip_unit,
+ ip.unit ip_unit,
price,
man_hour,
man_hour_group,
@@ -400,13 +406,13 @@
ask,
tell,
`last_value`,
- ip.ins_result ip_ins_result,
+ ip.ins_result ip_ins_result,
state,
ip.ins_sample_id,
- ip.create_user ip_create_user,
- ip.update_user ip_update_user,
- ip.create_time ip_create_time,
- ip.update_time ip_update_time,
+ ip.create_user ip_create_user,
+ ip.update_user ip_update_user,
+ ip.create_time ip_create_time,
+ ip.update_time ip_update_time,
template_id,
ip.method_s
@@ -419,21 +425,21 @@
</select>
<select id="selectSampleProductListByOrder2Id2" resultMap="sampleDto">
select isa.*,
- ios.num num1,
- ip.id ip_id,
+ ios.num num1,
+ ip.id ip_id,
inspection_item,
inspection_item_en,
inspection_item_subclass,
inspection_item_subclass_en,
inspection_item_class,
inspection_item_class_en,
- ip.factory ip_factory,
- ip.laboratory ip_laboratory,
- ip.sample_type ip_sample_type,
- ip.sample ip_sample,
- ip.model ip_model,
+ ip.factory ip_factory,
+ ip.laboratory ip_laboratory,
+ ip.sample_type ip_sample_type,
+ ip.sample ip_sample,
+ ip.model ip_model,
son_laboratory,
- ip.unit ip_unit,
+ ip.unit ip_unit,
price,
man_hour,
man_hour_group,
@@ -449,13 +455,13 @@
ask,
tell,
`last_value`,
- ip.ins_result ip_ins_result,
+ ip.ins_result ip_ins_result,
state,
ip.ins_sample_id,
- ip.create_user ip_create_user,
- ip.update_user ip_update_user,
- ip.create_time ip_create_time,
- ip.update_time ip_update_time,
+ ip.create_user ip_create_user,
+ ip.update_user ip_update_user,
+ ip.create_time ip_create_time,
+ ip.update_time ip_update_time,
template_id,
ip.method_s
from ins_sample isa
@@ -537,7 +543,10 @@
ipr.equip_value,
ipr.equip_name,
ipr.before_check,
+ ipr.before_note,
ipr.after_check,
+ ipr.after_note,
+ ipr.test_result,
ipr2.frequency,
ipr2.often,
ipr2.port,
@@ -605,7 +614,10 @@
ipr.equip_value,
ipr.equip_name,
ipr.before_check,
+ ipr.before_note,
ipr.after_check,
+ ipr.after_note,
+ ipr.test_result,
ipr2.frequency,
ipr2.often,
ipr2.port,
@@ -671,7 +683,10 @@
ipr.equip_value,
ipr.equip_name,
ipr.before_check,
+ ipr.before_note,
ipr.after_check,
+ ipr.after_note,
+ ipr.test_result,
ipr2.frequency,
ipr2.often,
ipr2.port,
@@ -809,7 +824,10 @@
<result property="comValue" column="com_value" jdbcType="VARCHAR"/>
<result property="equipValue" column="equip_value" jdbcType="VARCHAR"/>
<result property="beforeCheck" column="before_check" jdbcType="VARCHAR"/>
+ <result property="beforeNote" column="before_note" jdbcType="VARCHAR"/>
<result property="afterCheck" column="after_check" jdbcType="VARCHAR"/>
+ <result property="afterNote" column="after_note" jdbcType="VARCHAR"/>
+ <result property="testResult" column="test_result" jdbcType="VARCHAR"/>
<result property="equipName" column="equip_name" jdbcType="VARBINARY"/>
</resultMap>
<resultMap id="insProductResult2" type="com.yuanchu.mom.pojo.InsProductResult2">
--
Gitblit v1.9.3