From db1be72e80a9532ceda5000d79c153eb859caa05 Mon Sep 17 00:00:00 2001
From: bluejay <253316343@qq.com>
Date: 星期一, 14 四月 2025 16:46:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml
index f0564b2..5cf207c 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml
@@ -153,7 +153,23 @@
#{id}
</foreach>
</delete>
- <select id="weldSeamStat" >
-
+ <select id="weldSeamStat" parameterType="java.util.List" resultType="com.aps.core.domain.ApsWeldSeamStatistics">
+ SELECT produce_year as year,
+ produce_month as month,
+ production_base as productionBase,
+ SUM ( CASE WHEN work_order_type = '0' AND classification = '1' THEN production_quantity ELSE 0 END ) AS pipingOrderRequirement,
+ SUM ( CASE WHEN work_order_type = '0' AND classification = '0' THEN production_quantity ELSE 0 END ) AS gasOrderRequirement,
+ SUM ( CASE WHEN work_order_type = '1' AND classification = '1' THEN production_quantity ELSE 0 END ) AS pipingPredictionRequirement,
+ SUM ( CASE WHEN work_order_type = '1' AND classification = '0' THEN production_quantity ELSE 0 END ) AS gasPredictionRequirement
+ FROM
+ "aps_weld_seam"
+ where 1=1
+ <foreach item="item" index="index" collection="list" separator=",">
+ or ( produce_year=#{item.produceYear} and produce_month=#{item.produceMonth} and production_base=#{item.productionBase})
+ </foreach>
+ GROUP BY
+ produce_year,
+ produce_month,
+ production_base
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3