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/InsOrderMapper.xml | 112 +++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 78 insertions(+), 34 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 8d270b4..a0b49ae 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -56,6 +56,42 @@
<association property="children" resultMap="SampleDefectsChildrenMap" javaType="java.util.List"/>
</resultMap>
+ <select id="selectInsOrderPage" resultType="com.yuanchu.mom.dto.SampleOrderDto">
+ select *
+ from (
+ SELECT
+ io.*,
+ ir.id report_id,
+ ir.url,
+ ir.url_s,
+ (select count(*) from ins_sample isa2
+ where isa2.ins_order_id = io.id and isa2.sample_code NOT REGEXP '/') sample_num,
+ concat(ROUND((select count(*) from ins_product ip
+ where state = 1 and ins_result is not null and ip.ins_sample_id in (select id from ins_sample where
+ ins_sample.ins_order_id= io.id )) / (select count(*) from ins_product ip2
+ where state = 1 and ip2.ins_sample_id in (select id from ins_sample where ins_sample.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,
+ 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
+ where 1=1
+ <if test="laboratory!=null and laboratory!=''">
+ and io.laboratory=#{laboratory}
+ </if>
+ GROUP BY
+ io.id
+ ) a
+ <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+ ${ew.customSqlSegment}
+ </if>
+ </select>
<resultMap id="SampleDefectsChildrenMap" type="com.yuanchu.mom.vo.SampleDefectsChildrenVo">
<result column="entrust_code" property="entrust_code"/>
<result column="inspection_item" property="inspection_item"/>
@@ -82,38 +118,6 @@
create_time,
state
from ins_order
- ) a
- <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
- ${ew.customSqlSegment}
- </if>
- </select>
- <select id="selectInsOrderPage" resultType="com.yuanchu.mom.dto.SampleOrderDto">
- select *
- from (
- SELECT
- io.*,
- ir.id report_id,
- ir.url,
- ir.url_s,
- (select count(*) from ins_sample isa2
- where isa2.ins_order_id = io.id and isa2.sample_code NOT REGEXP '/' ) sample_num,
- concat(ROUND((select count(*) from ins_product ip
- where state = 1 and ins_result is not null and ip.ins_sample_id in (select id from ins_sample where
- ins_sample.ins_order_id= io.id )) / (select count(*) from ins_product ip2
- where state = 1 and ip2.ins_sample_id in (select id from ins_sample where ins_sample.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,
- 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
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
@@ -151,7 +155,7 @@
c.price,
c.cost,
c.inspection_item,
- u.company,
+ cus.company,
u.`name`,
i.create_user,
c.ins_sample_id
@@ -159,6 +163,7 @@
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 custom cus on cus.id = u.company
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 *,GROUP_CONCAT(inspection_item
@@ -232,7 +237,9 @@
</where>
</update>
<update id="updateStatus">
- update ins_order set state=3 where id=#{id}
+ update ins_order
+ set state=3
+ where id = #{id}
</update>
<select id="selectSampleDefects" resultMap="selectSampleDefectsMap">
@@ -300,4 +307,41 @@
and ins_sample_id in
(select id from ins_sample where ins_order_id = #{id}))
</select>
+
+ <select id="selectCostStatistics2" resultType="com.yuanchu.mom.dto.CostStatisticsDto">
+ select * from (
+ SELECT
+ i.id,
+ i.entrust_code,
+ i.create_time,
+ isa.sample,
+ isa.model,
+ c.price,
+ c.cost,
+ c.inspection_item,
+ u.company,
+ u.`name`,
+ i.create_user,
+ c.ins_sample_id
+ FROM
+ 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_item2
+ SEPARATOR ',')
+ 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}
+ </if>
+ </select>
+
+ <select id="seldepLimsId" resultType="java.lang.String">
+ select name
+ from department_lims
+ where id = #{depLimsId}
+ </select>
</mapper>
--
Gitblit v1.9.3