From 664f02f7f00e475508ea088c588739373700b436 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 18 七月 2024 20:53:49 +0800
Subject: [PATCH] 费用统计更改+工时+检验查看权限
---
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 108 insertions(+), 4 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index a0b49ae..1c16c0b 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -146,7 +146,7 @@
</select>
<select id="selectCostStatistics" resultType="com.yuanchu.mom.dto.CostStatisticsDto">
select * from (
- SELECT
+ <!--SELECT
i.id,
i.entrust_code,
i.create_time,
@@ -170,7 +170,55 @@
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
+ ) a-->
+ SELECT A.id,
+ A.entrust_code,
+ A.create_time,
+ A.sample,
+ A.model,
+ A.inspection_item,
+ A.company,
+ A.`name`,
+ COUNT(1) num,
+ SUM(A.price) price,
+ SUM(A.cost) cost
+ FROM
+ (SELECT
+ i.id,
+ i.entrust_code,
+ i.create_time,
+ isa.sample,
+ isa.sample_code,
+ isa.model,
+ c.price,
+ c.cost,
+ c.inspection_item,
+ cus.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 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(CONCAT(inspection_item,'',inspection_item_subclass) SEPARATOR ',')inspection_item2 from ins_product where state = 1 and template_id IS NOT NULL 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) and c.ins_sample_id IS not NULL)A
+ GROUP BY
+ A.id,
+ A.entrust_code,
+ A.create_time,
+ A.sample,
+ A.model,
+ A.inspection_item,
+ A.company,
+ A.`name`
+ ) B
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
@@ -310,7 +358,7 @@
<select id="selectCostStatistics2" resultType="com.yuanchu.mom.dto.CostStatisticsDto">
select * from (
- SELECT
+ <!--SELECT
i.id,
i.entrust_code,
i.create_time,
@@ -333,7 +381,63 @@
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
+ ) a-->
+ SELECT A.id,
+ A.entrust_code,
+ A.create_time,
+ A.sample,
+ A.model,
+ A.inspection_item,
+ A.company,
+ A.`name`,
+ COUNT(1) num,
+ SUM(A.price) price,
+ SUM(A.cost) cost
+ FROM
+ (SELECT
+ i.id,
+ i.entrust_code,
+ i.create_time,
+ isa.sample,
+ isa.sample_code,
+ isa.model,
+ c.price,
+ c.cost,
+ c.inspection_item,
+ cus.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 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(CONCAT(inspection_item,'',inspection_item_subclass) SEPARATOR ',')inspection_item2 from ins_product where state = 1 and template_id IS NOT NULL 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) and c.ins_sample_id IS not NULL)A
+ GROUP BY
+ A.id,
+ A.entrust_code,
+ A.create_time,
+ A.sample,
+ A.model,
+ A.inspection_item,
+ A.company,
+ A.`name`
+ ORDER BY
+ A.id,
+ A.entrust_code,
+ A.create_time,
+ A.sample,
+ A.model,
+ A.inspection_item,
+ A.company,
+ A.`name`) B
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
--
Gitblit v1.9.3