From 71f44d71edeabfdcc83366127a2f1f40f5a8de3e Mon Sep 17 00:00:00 2001
From: 123456 <123456>
Date: 星期三, 17 七月 2024 16:08:32 +0800
Subject: [PATCH] 费用统计分页查询功能修改
---
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index e391586..658c793 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -96,7 +96,7 @@
ir.url,
ir.url_s,
(select count(*) from ins_sample isa2
- where isa2.ins_order_id = io.id) sample_num,
+ 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
@@ -300,4 +300,35 @@
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>
</mapper>
--
Gitblit v1.9.3