From 480af1ab454d6c13bc94a5ec4919095dd4b880b0 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期三, 16 四月 2025 17:48:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 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 d41ffe4..5b9b3fa 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
@@ -166,4 +166,40 @@
<update id="removeLastBatch" parameterType="String">
update aps_weld_seam set del_flag='1' where del_flag='0'
</update>
+
+ <select id="weldSeamEcharts" parameterType="java.util.List" resultType="map">
+
+ SELECT
+ seam.produce_year,
+ seam.produce_month,
+ seam.production_base,
+ workOrderType.dict_label AS work_order_name,
+ classification.dict_label AS classification_name,
+ SUM ( seam.total_weld_seam ) AS total_weld_seam
+ FROM
+ aps_weld_seam seam
+ LEFT JOIN sys_dict_data workOrderType ON seam.work_order_type = workOrderType.dict_value
+ AND workOrderType.dict_type = 'aps_weld_work_order_type'
+ LEFT JOIN sys_dict_data classification ON seam.classification = classification.dict_value
+ AND classification.dict_type = 'aps_weld_classification'
+ <where>
+ <if test="produceYears != null "> and produce_year in
+ <foreach item="produceYear" collection="produceYears" open="(" separator="," close=")">
+ #{produceYear}
+ </foreach>
+ </if>
+ <if test="produceMonths != null "> and produce_month in
+ <foreach item="produceMonth" collection="produceMonths" open="(" separator="," close=")">
+ #{produceMonth}
+ </foreach>
+ </if>
+ </where>
+ GROUP BY
+ seam.produce_year,
+ seam.produce_month,
+ seam.production_base,
+ workOrderType.dict_label,
+ classification.dict_label
+
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3