From 2a64b537e8e3bce9ce030585a3da17d48379c0ad Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期一, 26 五月 2025 15:04:45 +0800
Subject: [PATCH] 修改json类型转换错误
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamStatisticsMapper.xml | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamStatisticsMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamStatisticsMapper.xml
index 0fa48b1..8d5459f 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamStatisticsMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamStatisticsMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsWeldSeamStatisticsMapper">
- <resultMap type="ApsWeldSeamStatistics" id="ApsWeldSeamStatisticsResult">
+ <resultMap type="com.aps.core.domain.ApsWeldSeamStatistics" id="ApsWeldSeamStatisticsResult">
<result property="id" column="id" />
<result property="year" column="year" />
<result property="month" column="month" />
@@ -30,23 +30,15 @@
select id, year, month, production_base, piping_order_requirement, gas_order_requirement, piping_prediction_requirement, gas_prediction_requirement, reserve_emergency_order_output, total, days, requirement_day_weld_seam, production_day_weld_seam, is_satisfy, del_flag, create_by, create_time, update_by, update_time from aps_weld_seam_statistics
</sql>
- <select id="selectApsWeldSeamStatisticsList" parameterType="ApsWeldSeamStatistics" resultMap="ApsWeldSeamStatisticsResult">
+ <select id="selectApsWeldSeamStatisticsList" parameterType="com.aps.core.domain.ApsWeldSeamStatistics" resultMap="ApsWeldSeamStatisticsResult">
<include refid="selectApsWeldSeamStatisticsVo"/>
<where>
<if test="params.beginYear != null and params.beginYear != '' and params.endYear != null and params.endYear != ''"> and year between #{params.beginYear} and #{params.endYear}</if>
<if test="params.beginMonth != null and params.beginMonth != '' and params.endMonth != null and params.endMonth != ''"> and month between #{params.beginMonth} and #{params.endMonth}</if>
- <if test="productionBase != null and productionBase != ''"> and production_base like concat('%', #{productionBase}, '%')</if>
- <if test="pipingOrderRequirement != null "> and piping_order_requirement = #{pipingOrderRequirement}</if>
- <if test="gasOrderRequirement != null "> and gas_order_requirement = #{gasOrderRequirement}</if>
- <if test="pipingPredictionRequirement != null "> and piping_prediction_requirement = #{pipingPredictionRequirement}</if>
- <if test="gasPredictionRequirement != null "> and gas_prediction_requirement = #{gasPredictionRequirement}</if>
- <if test="reserveEmergencyOrderOutput != null "> and reserve_emergency_order_output = #{reserveEmergencyOrderOutput}</if>
- <if test="total != null "> and total = #{total}</if>
- <if test="days != null "> and days = #{days}</if>
- <if test="requirementDayWeldSeam != null "> and requirement_day_weld_seam = #{requirementDayWeldSeam}</if>
- <if test="productionDayWeldSeam != null "> and production_day_weld_seam = #{productionDayWeldSeam}</if>
- <if test="isSatisfy != null and isSatisfy != ''"> and is_satisfy = #{isSatisfy}</if>
+ <if test="productionBase != null and productionBase != ''"> and production_base like '%'|| #{productionBase}|| '%'</if>
+ and del_flag='0'
</where>
+ order by year, month ,production_base
</select>
<select id="selectApsWeldSeamStatisticsById" parameterType="String" resultMap="ApsWeldSeamStatisticsResult">
@@ -54,7 +46,7 @@
where id = #{id}
</select>
- <insert id="insertApsWeldSeamStatistics" parameterType="ApsWeldSeamStatistics">
+ <insert id="insertApsWeldSeamStatistics" parameterType="com.aps.core.domain.ApsWeldSeamStatistics">
insert into aps_weld_seam_statistics
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
@@ -100,7 +92,7 @@
</trim>
</insert>
- <update id="updateApsWeldSeamStatistics" parameterType="ApsWeldSeamStatistics">
+ <update id="updateApsWeldSeamStatistics" parameterType="com.aps.core.domain.ApsWeldSeamStatistics">
update aps_weld_seam_statistics
<trim prefix="SET" suffixOverrides=",">
<if test="year != null">year = #{year},</if>
@@ -135,4 +127,8 @@
#{id}
</foreach>
</delete>
+ <update id="removeLastBatch" parameterType="String">
+ update aps_weld_seam_statistics set del_flag='1' where del_flag='0'
+ </update>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3