From 14c7f8f9ab3dfca1a8759482a9b3e16cd5d9856f Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期六, 20 四月 2024 00:06:03 +0800
Subject: [PATCH] 标准刷新增加一个条件
---
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index d168a3a..573ed0b 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -117,17 +117,39 @@
</if>
</select>
<select id="selectCostStatistics" resultType="com.yuanchu.mom.dto.CostStatisticsDto">
- select * from {
- SELECT io.id,io.entrust_code,io.create_time,isa.sample,isa.model,ip.price,ip.inspection_item,u.company,u.`name`,io.create_user from ins_order io
- LEFT JOIN ins_sample isa ON isa.ins_order_id = io.id
- LEFT JOIN ins_product ip ON ip.ins_sample_id = isa.id
- LEFT JOIN `user` u ON u.id = io.user_id
-# where (io.state = 3 OR io.state = 4)
- } a
+ 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_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">
+ select device_name,specification_model,factory_no,date_format(latest_traceability, '%Y-%m-%d') latest_traceability from device
+ where device_name in
+ <foreach collection="names" index="index" open="(" separator="," close=")" item="val">
+ #{val}
+ </foreach>
+ </select>
<update id="upInsOrderParameter" parameterType="com.yuanchu.mom.pojo.InsOrder">
UPDATE ins_order
--
Gitblit v1.9.3