From ad5fa78540fdd7b5470072e0ead2b650afdca2fd Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 17 四月 2024 17:41:28 +0800
Subject: [PATCH] 统计报表-->每日业务统计
---
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 77a58f3..573ed0b 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -125,7 +125,8 @@
isa.sample,
isa.model,
c.price,
- ip.inspection_item,
+ c.cost,
+ c.inspection_item,
u.company,
u.`name`,
i.create_user,
@@ -133,20 +134,20 @@
FROM
ins_order i
LEFT JOIN ins_sample isa ON isa.ins_order_id = i.id
- LEFT JOIN ins_product ip ON ip.ins_sample_id = isa.id
LEFT JOIN `user` u ON u.id = i.user_id
- LEFT JOIN (select SUM(b.price) price,b.ins_sample_id from (select * 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 ip.state = 1
+ LEFT JOIN (select SUM(b.price) price, sum(b.man_hour) cost,b.ins_sample_id,GROUP_CONCAT(b.inspection_item SEPARATOR ',')
+ inspection_item from (select * 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
) a
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
</select>
- <select id="selectDeviceList" resultType="java.util.Map" parameterType="java.util.Set">
- select device_name,specification_model,factory_no,latest_traceability from device
+ <select id="selectDeviceList" resultType="java.util.Map">
+ select device_name,specification_model,factory_no,date_format(latest_traceability, '%Y-%m-%d') latest_traceability from device
where device_name in
- <foreach collection="array" open="(" separator="," close=")" item="val">
- ${val}
+ <foreach collection="names" index="index" open="(" separator="," close=")" item="val">
+ #{val}
</foreach>
</select>
--
Gitblit v1.9.3