From 0644a19b927f4cd40ce45552b01064bb9b6521ad Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 31 十月 2024 13:53:22 +0800
Subject: [PATCH] 培训后优化
---
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index 46551d7..3aceb0e 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -367,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
@@ -536,10 +537,13 @@
ip.sample ip_sample,
ip.model ip_model,
ip.state,
+ io.issue_time,
+ u.name issueName,
ins_sample_id
from ins_sample isa
left join ins_product ip on isa.id = ip.ins_sample_id
left join ins_order io on io.id = ins_order_id
+ left join user u on io.issue_user = u.id
where ip.state = 1
and ins_order_id in
<foreach collection="ids" open="(" close=")" item="id" separator=",">
@@ -619,7 +623,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,
@@ -685,7 +689,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,
@@ -752,7 +756,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">
@@ -851,6 +855,8 @@
<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="issueName" column="issueName" />
<result property="createUser" column="create_user" jdbcType="INTEGER"/>
<result property="updateUser" column="update_user" jdbcType="INTEGER"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
@@ -931,7 +937,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
@@ -947,4 +954,8 @@
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