From 7f2f54e5ae3d3bf09172e1520d8d9dfb556d57c4 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 27 五月 2024 17:23:41 +0800
Subject: [PATCH] 功能调整
---
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index b520a2e..d5affd3 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -95,17 +95,21 @@
ir.id report_id,
ir.url,
ir.url_s,
- concat(ROUND((select count(*) from ins_sample isa2
- where ins_state = 5 and isa2.ins_order_id = io.id) / (select count(*) from ins_sample isa2
- where isa2.ins_order_id = io.id) * 100, 2), '%') insProgress,
+ (select count(*) from ins_sample isa2
+ where isa2.ins_order_id = io.id) sample_num,
+ concat(ROUND((select count(*) from ins_order_state ios
+ where ins_state = 5 and ios.ins_order_id = io.id) / (select count(*) from ins_order_state ios2
+ 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
@@ -152,10 +156,12 @@
ins_order i
LEFT JOIN ins_sample isa ON isa.ins_order_id = i.id
LEFT JOIN `user` u ON u.id = i.user_id
- LEFT JOIN (select SUM(b.price) price, sum(b.man_hour) cost,b.ins_sample_id,GROUP_CONCAT(b.inspection_item
+ LEFT JOIN (select SUM(b.price) price, sum(b.man_hour) cost,b.ins_sample_id,GROUP_CONCAT(b.inspection_item2
SEPARATOR ',')
- inspection_item from (select * from ins_product where state = 1 GROUP BY ins_sample_id,man_hour_group) b GROUP
+ 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}
@@ -191,6 +197,9 @@
<where>
id=#{id}
</where>
+ </update>
+ <update id="updateStatus">
+ update ins_order set state=3 where id=#{id}
</update>
<select id="selectSampleDefects" resultMap="selectSampleDefectsMap">
@@ -238,4 +247,8 @@
select label from `center-lims`.enums
where value = #{value}
</select>
+ <select id="getStandardMethodCode" resultType="java.lang.String">
+ select code from `center-lims`.standard_method
+ where id = #{id}
+ </select>
</mapper>
--
Gitblit v1.9.3