From 95e69381eeb4a589e9ab7b8e3b967ceb36d13b1d Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 18 七月 2024 18:20:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 53 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 49 insertions(+), 4 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index 0138951..e822231 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -25,7 +25,7 @@
</resultMap>
<select id="findInsSampleAndOrder" resultType="com.yuanchu.mom.vo.InsOrderPlanVO">
- select * from(
+ select * from(select * from(
SELECT
a.*,ios.ins_state,ios.verify_tell,isu2.order_user_id,(ios.verify_user = #{userId}) verify_user
FROM
@@ -63,6 +63,7 @@
a.type DESC,
a.id
) b
+ where ins_state is not null)A
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
@@ -141,6 +142,7 @@
man_day,
bsm,
ask,
+ tell,
`last_value`,
ip.ins_result ip_ins_result,
state,
@@ -161,6 +163,7 @@
and state = 1
and ins_fiber_id is null
and ins_fibers_id is null
+ and isa.sample_code NOT REGEXP '/'
</select>
<select id="getInsOrderAndSample" resultMap="sampleDto">
select isa.*,
@@ -206,7 +209,9 @@
ipr.equip_name,
ip.method_s,
ip.tell,
- ip.dic
+ ip.dic,
+ ip.temperature,
+ ip.humidity
from ins_sample isa
left join ins_product ip on isa.id = ip.ins_sample_id
left join ins_product_result ipr on ip.id = ipr.ins_product_id
@@ -249,7 +254,7 @@
method,
man_day,
bsm,
- ask,
+ tell as ask,
`last_value`,
ip.ins_result ip_ins_result,
state,
@@ -267,6 +272,7 @@
left join ins_product ip on isa.id = ip.ins_sample_id
left join ins_product_result ipr on ip.id = ipr.ins_product_id
where ins_order_id = #{id}
+ and template_id is not null
and state = 1
</select>
@@ -289,7 +295,7 @@
left join ins_product ip on isa.id = ip.ins_sample_id
left join ins_product_result ipr on ip.id = ipr.ins_product_id
left join ins_order io on io.id = ins_order_id
- where ip.state = 1
+ where ip.state = 1
and ins_order_id in
<foreach collection="ids" open="(" close=")" item="id" separator=",">
#{id}
@@ -300,6 +306,8 @@
select ip.id ip_id,
inspection_item,
inspection_item_en,
+ inspection_item_class,
+ inspection_item_class_en,
inspection_item_subclass,
inspection_item_subclass_en,
ip.factory ip_factory,
@@ -446,6 +454,8 @@
and state = 1
and ins_fibers_id is null
</select>
+ <select id="getReportModel" resultType="java.util.Map">
+ </select>
<resultMap id="sampleDto" type="com.yuanchu.mom.dto.SampleProductDto">
<id property="id" column="id" jdbcType="INTEGER"/>
@@ -499,6 +509,7 @@
<result property="manDay" column="man_day" jdbcType="INTEGER"/>
<result property="bsm" column="bsm" jdbcType="VARCHAR"/>
<result property="ask" column="ask" jdbcType="VARCHAR"/>
+ <result property="tell" column="tell" jdbcType="VARCHAR"/>
<result property="lastValue" column="last_value" jdbcType="VARCHAR"/>
<result property="insResult" column="ip_ins_result" jdbcType="INTEGER"/>
<result property="state" column="state" jdbcType="INTEGER"/>
@@ -511,6 +522,8 @@
<result property="methodS" column="method_s"/>
<result property="tell" column="tell"/>
<result property="dic" column="dic"/>
+ <result property="temperature" column="temperature"/>
+ <result property="humidity" column="humidity"/>
<collection property="insProductResult" resultMap="insProductResult"/>
</resultMap>
@@ -547,4 +560,36 @@
<result property="equipValue" column="equip_value" jdbcType="VARCHAR"/>
<result property="equipName" column="equip_name" jdbcType="VARBINARY"/>
</resultMap>
+
+ <resultMap id="sampleVo" type="com.yuanchu.mom.vo.SampleVo">
+ <id property="id" column="id" jdbcType="INTEGER"/>
+ <result property="insResult" column="ins_result" jdbcType="INTEGER"/>
+ <result property="insOrderId" column="ins_order_id" jdbcType="INTEGER"/>
+ <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="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="insState" column="ins_state" jdbcType="INTEGER"/>
+ <result property="joinNum" column="join_num" jdbcType="INTEGER"/>
+ <result property="remark" column="remark" jdbcType="VARCHAR"/>
+ <result property="createUser" column="create_user" jdbcType="INTEGER"/>
+ <result property="updateUser" column="update_user" jdbcType="INTEGER"/>
+ <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+ <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+ <result property="standardMethodListId" column="standard_method_list_id"/>
+ <result property="methodName" column="methodName" jdbcType="VARCHAR"/>
+ <result property="unit" column="unit"/>
+ </resultMap>
+
+ <select id="getDetailById" resultMap="sampleVo">
+ select is2.*,
+ code methodName
+ from ins_sample is2
+ inner join standard_method sm on standard_method_list_id = sm.id
+ where is2.id=#{sampleId}
+ </select>
</mapper>
--
Gitblit v1.9.3