From f747fddabf9195706eef73c4ca233c881b7dfe75 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 15 十月 2024 15:38:45 +0800
Subject: [PATCH] 工时调整+标签打印调整+特殊项的保存
---
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 51 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 44 insertions(+), 7 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index b03de3c..31aa13f 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,
@@ -518,6 +536,7 @@
ip.sample ip_sample,
ip.model ip_model,
ip.state,
+ io.issue_time,
ins_sample_id
from ins_sample isa
left join ins_product ip on isa.id = ip.ins_sample_id
@@ -576,6 +595,8 @@
ipr.com_value,
ipr.equip_value,
ipr.equip_name,
+ ipr.before_check,
+ ipr.after_check,
ipr2.frequency,
ipr2.often,
ipr2.port,
@@ -599,7 +620,7 @@
and ios.laboratory = #{laboratory}
and (ipr2.num = ios.num or ipr2.num is null)
and (ipr.num = ios.num or ipr.num is null)
- order by ipr.id, ipr2.id
+ order by ip.id, ipr.id, ipr2.id
</select>
<select id="getIns2Product1" resultMap="product">
select ip.id ip_id,
@@ -642,6 +663,8 @@
ipr.com_value,
ipr.equip_value,
ipr.equip_name,
+ ipr.before_check,
+ ipr.after_check,
ipr2.frequency,
ipr2.often,
ipr2.port,
@@ -663,7 +686,7 @@
and ip.son_laboratory = #{laboratory}
and ip.standard_method_list_id is not null
and ios.laboratory = #{laboratory}
- order by ipr.id, ipr2.id
+ order by ip.id, ipr.id, ipr2.id
</select>
<select id="get2InsProduct1" resultMap="product">
select ip.id ip_id,
@@ -706,6 +729,8 @@
ipr.com_value,
ipr.equip_value,
ipr.equip_name,
+ ipr.before_check,
+ ipr.after_check,
ipr2.frequency,
ipr2.often,
ipr2.port,
@@ -728,7 +753,7 @@
and ip.standard_method_list_id is not null
and ios.laboratory = #{laboratory}
and (ipr2.num = #{num} or ipr.num = #{num})
- order by ipr.id, ipr2.id
+ order by ip.id, ipr.id, ipr2.id
</select>
<select id="getReportModel" resultType="java.util.Map">
@@ -827,6 +852,7 @@
<result property="insState" column="ins_state" jdbcType="INTEGER"/>
<result property="joinNum" column="join_num" jdbcType="INTEGER"/>
<result property="remark" column="remark" jdbcType="VARCHAR"/>
+ <result property="issueTime" column="issue_time" />
<result property="createUser" column="create_user" jdbcType="INTEGER"/>
<result property="updateUser" column="update_user" jdbcType="INTEGER"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
@@ -840,6 +866,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">
@@ -905,7 +933,8 @@
and ip.id is not null
</select>
<select id="selectInsSample" resultType="com.yuanchu.mom.pojo.InsSample">
- select isa.*,entrust_code
+ select isa.*,
+ case when entrust_code is null then out_entrust_code else entrust_code end as entrust_code
from ins_sample isa
left join ins_order io on isa.ins_order_id = io.id
where ins_order_id in
@@ -913,4 +942,12 @@
#{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