From feddd20a4323e49ef9f424d07e53c12e715203fc Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期二, 13 五月 2025 14:45:20 +0800
Subject: [PATCH] 修改冲突
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireErrorMapper.xml | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireErrorMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireErrorMapper.xml
index a59df7c..7b5f031 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireErrorMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateStandardRequireErrorMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsPlateStandardRequireErrorMapper">
- <resultMap type="ApsPlateStandardRequireError" id="ApsPlateStandardRequireErrorResult">
+ <resultMap type="com.aps.core.domain.ApsPlateStandardRequireError" id="ApsPlateStandardRequireErrorResult">
<result property="id" column="id" />
<result property="batchNumber" column="batch_number" />
<result property="requireId" column="require_id" />
@@ -23,7 +23,7 @@
select id, batch_number, require_id, doc_num, item_num, org_code, message, del_flag, create_by, create_time, update_by, update_time from aps_plate_standard_require_error
</sql>
- <select id="selectApsPlateStandardRequireErrorList" parameterType="ApsPlateStandardRequireError" resultMap="ApsPlateStandardRequireErrorResult">
+ <select id="selectApsPlateStandardRequireErrorList" parameterType="com.aps.core.domain.ApsPlateStandardRequireError" resultMap="ApsPlateStandardRequireErrorResult">
<include refid="selectApsPlateStandardRequireErrorVo"/>
<where>
<if test="batchNumber != null and batchNumber != ''"> and batch_number = #{batchNumber}</if>
@@ -32,7 +32,9 @@
<if test="itemNum != null and itemNum != ''"> and item_num = #{itemNum}</if>
<if test="orgCode != null and orgCode != ''"> and org_code = #{orgCode}</if>
<if test="message != null and message != ''"> and message = #{message}</if>
+ and del_flag = '0'
</where>
+
</select>
<select id="selectApsPlateStandardRequireErrorById" parameterType="Long" resultMap="ApsPlateStandardRequireErrorResult">
@@ -40,7 +42,7 @@
where id = #{id}
</select>
- <insert id="insertApsPlateStandardRequireError" parameterType="ApsPlateStandardRequireError">
+ <insert id="insertApsPlateStandardRequireError" parameterType="com.aps.core.domain.ApsPlateStandardRequireError">
insert into aps_plate_standard_require_error
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
@@ -72,7 +74,7 @@
</trim>
</insert>
- <update id="updateApsPlateStandardRequireError" parameterType="ApsPlateStandardRequireError">
+ <update id="updateApsPlateStandardRequireError" parameterType="com.aps.core.domain.ApsPlateStandardRequireError">
update aps_plate_standard_require_error
<trim prefix="SET" suffixOverrides=",">
<if test="batchNumber != null">batch_number = #{batchNumber},</if>
--
Gitblit v1.9.3