From e8d0a2f9375da4d04da4a06a0f9fa8ef448512c4 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 19 十一月 2024 15:58:49 +0800
Subject: [PATCH] 检验下单审核进行企业微信推送
---
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index a52c2d0..046862e 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -25,7 +25,8 @@
</resultMap>
<select id="findInsSampleAndOrder" resultType="com.yuanchu.mom.vo.InsOrderPlanVO">
- select * from(select * from(
+ select * from(
+ select * from(
SELECT
a.*,
ios.ins_state,
@@ -48,6 +49,7 @@
io.appointed,
io.send_time,
group_concat(distinct isa.sample,' ') sample,
+ group_concat(distinct isa.sample_code,' ') sampleCode,
userName,
checkName,
ip.son_laboratory,
@@ -114,6 +116,7 @@
io.appointed,
io.send_time,
group_concat(distinct isa.sample,' ') sampleType,
+ group_concat(distinct isa.sample_code,' ') sampleCode,
isu.user_id,
user.name userName,
ip.son_laboratory,
@@ -538,10 +541,12 @@
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=",">
@@ -854,6 +859,7 @@
<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"/>
--
Gitblit v1.9.3