From 1f15333b0a97a327865f7aab8f1e3f9ba8fc16f8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 18 十月 2024 12:45:59 +0800
Subject: [PATCH] 电路站点报告调试+总报告ing
---
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 66 ++++++++++++++++++++++++++++++---
1 files changed, 60 insertions(+), 6 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index 780e279..a52c2d0 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,
@@ -353,6 +367,7 @@
and state = 1
and ip.son_laboratory = #{laboratory}
and ios.laboratory = #{laboratory}
+ and (ipr2.num is null or ipr.num is null)
</select>
<select id="getSampleEn" resultType="java.lang.String">
select name_en
@@ -403,6 +418,8 @@
ipr.ins_value,
ipr.com_value,
ipr.equip_value,
+ ipr.before_check,
+ ipr.after_check,
ipr2.frequency,
ipr2.often,
ipr2.port,
@@ -475,6 +492,8 @@
ipr.ins_value,
ipr.com_value,
ipr.equip_value,
+ ipr.before_check,
+ ipr.after_check,
ipr2.frequency,
ipr2.often,
ipr2.port,
@@ -505,6 +524,7 @@
<select id="selectSampleProductListByOrderId3" resultMap="sampleDto3">
select isa.id,
sample_code,
+ motor_number,
isa.sample,
entrust_code,
is_leave,
@@ -517,6 +537,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
@@ -575,6 +596,8 @@
ipr.com_value,
ipr.equip_value,
ipr.equip_name,
+ ipr.before_check,
+ ipr.after_check,
ipr2.frequency,
ipr2.often,
ipr2.port,
@@ -598,7 +621,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,
@@ -641,6 +664,8 @@
ipr.com_value,
ipr.equip_value,
ipr.equip_name,
+ ipr.before_check,
+ ipr.after_check,
ipr2.frequency,
ipr2.often,
ipr2.port,
@@ -662,7 +687,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,
@@ -705,6 +730,8 @@
ipr.com_value,
ipr.equip_value,
ipr.equip_name,
+ ipr.before_check,
+ ipr.after_check,
ipr2.frequency,
ipr2.often,
ipr2.port,
@@ -727,7 +754,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">
@@ -740,6 +767,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 +844,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"/>
@@ -824,6 +853,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"/>
@@ -837,6 +867,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 +933,26 @@
where ins_order_id = #{orderId}
and ip.id is not null
</select>
+ <select id="selectInsSample" resultType="com.yuanchu.mom.pojo.InsSample">
+ 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
+ <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>
+ <select id="selectList1" resultType="com.yuanchu.mom.dto.SampleProductDto">
+ select * from ins_sample where ins_order_id=#{id
+}
+ </select>
</mapper>
--
Gitblit v1.9.3