From d337c8e2e21df8ff7d2ecae493fa7a65627fedea Mon Sep 17 00:00:00 2001
From: Zhu Zhonghua <zhonghua@qq.com>
Date: 星期四, 22 五月 2025 14:52:48 +0800
Subject: [PATCH] 处理焊缝大数据插入异常问题
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 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..af28ae3 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
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsWeldSeamMapper">
- <resultMap type="ApsWeldSeam" id="ApsWeldSeamResult">
+ <resultMap type="com.aps.core.domain.ApsWeldSeam" id="ApsWeldSeamResult">
<result property="id" column="id" />
<result property="workOrderType" column="work_order_type" />
<result property="materialCode" column="material_code" />
@@ -32,7 +32,7 @@
select id, work_order_type, material_code, customer_drawing_number, organize_number, production_base, classification, produce_year, produce_month, production_quantity, customer, single_weld_seam, total_weld_seam, this_feedback_day, materials_requirement_day, sale_order_no, sale_order_line, main_work_order_no, superior_work_order_no, work_order_no, plant from aps_weld_seam
</sql>
- <select id="selectApsWeldSeamList" parameterType="ApsWeldSeam" resultMap="ApsWeldSeamResult">
+ <select id="selectApsWeldSeamList" parameterType="com.aps.core.domain.ApsWeldSeam" resultMap="ApsWeldSeamResult">
<include refid="selectApsWeldSeamVo"/>
<where>
<if test="workOrderType != null and workOrderType != ''"> and work_order_type = #{workOrderType}</if>
@@ -66,7 +66,7 @@
<include refid="selectApsWeldSeamVo"/>
where work_order_no = #{workOrderNo}
</select>
- <insert id="insertApsWeldSeam" parameterType="ApsWeldSeam">
+ <insert id="insertApsWeldSeam" parameterType="com.aps.core.domain.ApsWeldSeam">
insert into aps_weld_seam
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
@@ -116,7 +116,7 @@
</trim>
</insert>
- <update id="updateApsWeldSeam" parameterType="ApsWeldSeam">
+ <update id="updateApsWeldSeam" parameterType="com.aps.core.domain.ApsWeldSeam">
update aps_weld_seam
<trim prefix="SET" suffixOverrides=",">
<if test="workOrderType != null">work_order_type = #{workOrderType},</if>
@@ -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