From 533bccb991763a5c2db8a958fa5003b90b196cfc Mon Sep 17 00:00:00 2001
From: hongjli <3117313295@qq.com>
Date: 星期三, 14 五月 2025 18:05:11 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev_lhj
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsWorkEventMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsWorkEventMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsWorkEventMapper.xml
index a6592c4..067dab1 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsWorkEventMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsWorkEventMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsWorkEventMapper">
- <resultMap type="ApsWorkEvent" id="ApsWorkEventResult">
+ <resultMap type="com.aps.core.domain.ApsWorkEvent" id="ApsWorkEventResult">
<result property="id" column="id" />
<result property="description" column="description" />
<result property="duration" column="duration" />
@@ -26,7 +26,7 @@
select id, description, duration, start_date, end_date, start_time, end_time, applicable_factory, applicable_workshop, applicable_process, applicable_calendar, create_by, create_time, update_by, update_time from aps_work_event
</sql>
- <select id="selectApsWorkEventList" parameterType="ApsWorkEvent" resultMap="ApsWorkEventResult">
+ <select id="selectApsWorkEventList" parameterType="com.aps.core.domain.ApsWorkEvent" resultMap="ApsWorkEventResult">
<include refid="selectApsWorkEventVo"/>
<where>
<if test="description != null and description != ''"> and description like '%' || #{description} || '%'</if>
@@ -47,7 +47,7 @@
where id = #{id}
</select>
- <insert id="insertApsWorkEvent" parameterType="ApsWorkEvent">
+ <insert id="insertApsWorkEvent" parameterType="com.aps.core.domain.ApsWorkEvent">
insert into aps_work_event
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
@@ -85,7 +85,7 @@
</trim>
</insert>
- <update id="updateApsWorkEvent" parameterType="ApsWorkEvent">
+ <update id="updateApsWorkEvent" parameterType="com.aps.core.domain.ApsWorkEvent">
update aps_work_event
<trim prefix="SET" suffixOverrides=",">
<if test="description != null and description != ''">description = #{description},</if>
--
Gitblit v1.9.3