From 1214b18558c19b09c02161b1dbbef342ad2c1e8f Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 12 十月 2024 17:14:46 +0800
Subject: [PATCH] 试验前后样品检查+开始结束时间
---
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 52 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 49 insertions(+), 3 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index 780e279..46551d7 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -27,8 +27,18 @@
<select id="findInsSampleAndOrder" resultType="com.yuanchu.mom.vo.InsOrderPlanVO">
select * from(select * from(
SELECT
- a.*,ios.ins_state,ios.verify_tell,verify_user,ios.id
- orderStateId,ios.create_time,ios.sort,sort_time,version,ios.num-1 num1
+ a.*,
+ ios.ins_state,
+ ios.verify_tell,
+ verify_user,
+ ios.id orderStateId,
+ ios.create_time,
+ (SELECT ins_time FROM ins_order_state WHERE ins_order_id = a.id AND laboratory = a.son_laboratory ORDER BY ins_time DESC LIMIT 1) AS ins_time ,
+ iou.submit_time ,
+ ios.sort,
+ sort_time,
+ version,
+ ios.num-1 num1
FROM
(
SELECT
@@ -41,7 +51,6 @@
userName,
checkName,
ip.son_laboratory,
- io.ins_time,
io.laboratory
FROM
ins_order io
@@ -74,6 +83,7 @@
io.id
) a
LEFT JOIN ins_order_state ios ON ios.ins_order_id = a.id AND ios.laboratory = a.son_laboratory
+ LEFT JOIN ins_order_user iou ON ios.id = iou.ins_order_state_id and ios.num=iou.num
ORDER BY
ios.sort,
sort_time desc,
@@ -263,6 +273,8 @@
ipr.com_value,
ipr.equip_value,
ipr.equip_name,
+ ipr.before_check,
+ ipr.after_check,
ipr2.frequency,
ipr2.often,
ipr2.port,
@@ -331,6 +343,8 @@
ipr.com_value,
ipr.equip_value,
ipr.equip_name,
+ ipr.before_check,
+ ipr.after_check,
ipr2.frequency,
ipr2.often,
ipr2.port,
@@ -403,6 +417,8 @@
ipr.ins_value,
ipr.com_value,
ipr.equip_value,
+ ipr.before_check,
+ ipr.after_check,
ipr2.frequency,
ipr2.often,
ipr2.port,
@@ -475,6 +491,8 @@
ipr.ins_value,
ipr.com_value,
ipr.equip_value,
+ ipr.before_check,
+ ipr.after_check,
ipr2.frequency,
ipr2.often,
ipr2.port,
@@ -505,6 +523,7 @@
<select id="selectSampleProductListByOrderId3" resultMap="sampleDto3">
select isa.id,
sample_code,
+ motor_number,
isa.sample,
entrust_code,
is_leave,
@@ -575,6 +594,8 @@
ipr.com_value,
ipr.equip_value,
ipr.equip_name,
+ ipr.before_check,
+ ipr.after_check,
ipr2.frequency,
ipr2.often,
ipr2.port,
@@ -641,6 +662,8 @@
ipr.com_value,
ipr.equip_value,
ipr.equip_name,
+ ipr.before_check,
+ ipr.after_check,
ipr2.frequency,
ipr2.often,
ipr2.port,
@@ -705,6 +728,8 @@
ipr.com_value,
ipr.equip_value,
ipr.equip_name,
+ ipr.before_check,
+ ipr.after_check,
ipr2.frequency,
ipr2.often,
ipr2.port,
@@ -740,6 +765,7 @@
<result property="joinModel" column="join_model" jdbcType="VARCHAR"/>
<result property="joinName" column="join_name" jdbcType="VARCHAR"/>
<result property="sampleCode" column="sample_code" jdbcType="VARCHAR"/>
+ <result property="motorNumber" column="motor_number" jdbcType="VARCHAR"/>
<result property="testRequirements" column="test_requirements" jdbcType="VARCHAR"/>
<result property="factory" column="factory" jdbcType="VARCHAR"/>
<result property="laboratory" column="laboratory" jdbcType="VARCHAR"/>
@@ -816,6 +842,7 @@
<result property="code" column="entrust_code" jdbcType="VARCHAR"/>
<result property="isLeave" column="is_leave" jdbcType="VARCHAR"/>
<result property="sampleCode" column="sample_code" jdbcType="VARCHAR"/>
+ <result property="motorNumber" column="motor_number" jdbcType="VARCHAR"/>
<result property="factory" column="factory" jdbcType="VARCHAR"/>
<result property="laboratory" column="laboratory" jdbcType="VARCHAR"/>
<result property="sampleType" column="sample_type" jdbcType="VARCHAR"/>
@@ -837,6 +864,8 @@
<result property="insValue" column="ins_value" jdbcType="VARCHAR"/>
<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="afterCheck" column="after_check" jdbcType="VARCHAR"/>
<result property="equipName" column="equip_name" jdbcType="VARBINARY"/>
</resultMap>
<resultMap id="insProductResult2" type="com.yuanchu.mom.pojo.InsProductResult2">
@@ -901,4 +930,21 @@
where ins_order_id = #{orderId}
and ip.id is not null
</select>
+ <select id="selectInsSample" resultType="com.yuanchu.mom.pojo.InsSample">
+ select isa.*,entrust_code
+ from ins_sample isa
+ left join ins_order io on isa.ins_order_id = io.id
+ where ins_order_id in
+ <foreach collection="ids" open="(" close=")" item="id" separator=",">
+ #{id}
+ </foreach>
+ </select>
+ <select id="selectSample" resultType="com.yuanchu.mom.pojo.InsSample">
+ select distinct isa.*
+ from ins_sample isa
+ left join ins_product ip on isa.id = ip.ins_sample_id
+ where son_laboratory = '鐢佃矾璇曢獙'
+ and state = 1
+ and ins_order_id = #{insOrderId}
+ </select>
</mapper>
--
Gitblit v1.9.3