From b8045b11ca8af95cb5aeba464bff589e0b9f53b8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 30 五月 2024 18:08:13 +0800
Subject: [PATCH] 光纤配置三层架构+辅助工时的审核与批准逻辑修改
---
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 5355d6b..d5affd3 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -102,12 +102,14 @@
where ios2.ins_order_id = io.id) * 100, 2), '%') insProgress,
group_concat(distinct isa.sample_code,' ') sample_code,
group_concat(distinct isa.sample,' ') sample_name,
- group_concat(distinct isa.model,' ') sample_model
+ group_concat(distinct isa.model,' ') sample_model,
+ u.name
FROM
ins_order io
LEFT JOIN ins_sample isa ON io.id = isa.ins_order_id
LEFT JOIN ( SELECT id, ins_order_id, is_ratify, url,url_s FROM ins_report WHERE is_ratify = 1 ) ir ON io.id =
ir.ins_order_id
+ left join user u on io.create_user = u.id
GROUP BY
io.id
) a
@@ -159,6 +161,7 @@
inspection_item from (select *,GROUP_CONCAT(inspection_item
SEPARATOR ',') inspection_item2 from ins_product where state = 1 GROUP BY ins_sample_id,man_hour_group) b GROUP
BY b.ins_sample_id) c ON c.ins_sample_id = isa.id
+ where (i.state = 1 or i.state = 3 or i.state = 4)
) a
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
@@ -195,6 +198,9 @@
id=#{id}
</where>
</update>
+ <update id="updateStatus">
+ update ins_order set state=3 where id=#{id}
+ </update>
<select id="selectSampleDefects" resultMap="selectSampleDefectsMap">
SELECT io.entrust_code,sam.sample,ip.inspection_item,u.name,b.create_time, sam.id
--
Gitblit v1.9.3