From a080d67b9964cd632f52c481c0f20ef2e3e7073a Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期五, 09 五月 2025 10:19:07 +0800
Subject: [PATCH] 放开权限
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 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..5770b88 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,16 +183,10 @@
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>
+ seam.del_flag = '0'
+ <foreach item="item" index="index" collection="list" separator=" OR " open="and (" close=") ">
+ produce_year = #{item.produceYear} and produce_month = #{item.produceMonth}
+ </foreach>
</where>
GROUP BY
seam.produce_year,
--
Gitblit v1.9.3