From df20214207804ba2fffc601f20284b26e800ffef Mon Sep 17 00:00:00 2001
From: dy <dingyang@lnfxkj.tech>
Date: 星期三, 16 四月 2025 18:19:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml | 6 +++++-
1 files changed, 5 insertions(+), 1 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 a291648..dfd139d 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
@@ -160,9 +160,12 @@
work_order_type as workOrderType,
classification,
sum(total_weld_seam) as total
- FROM aps_weld_seam
+ FROM aps_weld_seam where del_flag='0'
GROUP BY produce_year, produce_month, production_base, work_order_type, classification
</select>
+ <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">
@@ -180,6 +183,7 @@
LEFT JOIN sys_dict_data classification ON seam.classification = classification.dict_value
AND classification.dict_type = 'aps_weld_classification'
<where>
+ seam.del_flag = '0'
<if test="produceYears != null "> and produce_year in
<foreach item="produceYear" collection="produceYears" open="(" separator="," close=")">
#{produceYear}
--
Gitblit v1.9.3