Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	vetti-hotakes/src/main/java/com/vetti/hotake/domain/HotakeSysNoticeType.java
#	vetti-hotakes/src/main/java/com/vetti/hotake/domain/dto/HotakeSysNoticeTypeDto.java
#	vetti-hotakes/src/main/java/com/vetti/hotake/mapper/HotakeSysNoticeTypeMapper.java
#	vetti-hotakes/src/main/java/com/vetti/hotake/service/IHotakeSysNoticeTypeService.java
#	vetti-hotakes/src/main/java/com/vetti/hotake/service/impl/HotakeSysNoticeTypeServiceImpl.java
#	vetti-hotakes/src/main/resources/mapper/hotake/HotakeSysNoticeTypeMapper.xml
This commit is contained in:
2025-11-01 21:31:37 +08:00
7 changed files with 618 additions and 0 deletions

View File

@@ -0,0 +1,109 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.vetti.hotake.mapper.HotakeSysNoticeTypeMapper">
<resultMap type="HotakeSysNoticeType" id="HotakeSysNoticeTypeResult">
<result property="id" column="id"/>
<result property="typeName" column="type_name"/>
<result property="imagePath" column="image_path" typeHandler="com.vetti.common.handle.JsonTypeHandler"/>
<result property="isDel" column="is_del"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="remark" column="remark"/>
</resultMap>
<sql id="selectHotakeSysNoticeTypeVo">
select id,
type_name,
image_path,
is_del,
create_by,
create_time,
update_by,
update_time,
remark
from hotake_sys_notice_type
</sql>
<select id="selectHotakeSysNoticeTypeList" parameterType="HotakeSysNoticeType"
resultMap="HotakeSysNoticeTypeResult">
<include refid="selectHotakeSysNoticeTypeVo"/>
<where>
<if test="typeName != null and typeName != ''">and type_name like concat('%', #{typeName}, '%')</if>
<if test="imagePath != null and imagePath != ''">and image_path = #{imagePath}</if>
<if test="isDel != null and isDel != ''">and is_del = #{isDel}</if>
</where>
</select>
<select id="selectHotakeSysNoticeTypeById" parameterType="Long" resultMap="HotakeSysNoticeTypeResult">
<include refid="selectHotakeSysNoticeTypeVo"/>
where id = #{id}
</select>
<insert id="insertHotakeSysNoticeType" parameterType="HotakeSysNoticeType" useGeneratedKeys="true" keyProperty="id">
insert into hotake_sys_notice_type
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="typeName != null">type_name,</if>
<if test="imagePath != null">image_path,</if>
<if test="isDel != null">is_del,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="remark != null">remark,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="typeName != null">#{typeName},</if>
<if test="imagePath != null">#{imagePath, typeHandler=com.vetti.common.handle.JsonTypeHandler},</if>
<if test="isDel != null">#{isDel},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="remark != null">#{remark},</if>
</trim>
</insert>
<update id="updateHotakeSysNoticeType" parameterType="HotakeSysNoticeType">
update hotake_sys_notice_type
<trim prefix="SET" suffixOverrides=",">
<if test="typeName != null">type_name = #{typeName},</if>
<if test="imagePath != null">image_path =
#{imagePath, typeHandler=com.vetti.common.handle.JsonTypeHandler},
</if>
<if test="isDel != null">is_del = #{isDel},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="remark != null">remark = #{remark},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteHotakeSysNoticeTypeById" parameterType="Long">
delete
from hotake_sys_notice_type
where id = #{id}
</delete>
<delete id="deleteHotakeSysNoticeTypeByIds" parameterType="String">
delete from hotake_sys_notice_type where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
<insert id="batchInsertHotakeSysNoticeType">
insert into hotake_sys_notice_type( id, type_name, image_path, is_del, create_by, create_time, update_by,
update_time, remark,) values
<foreach item="item" index="index" collection="list" separator=",">
( #{item.id}, #{item.typeName}, #{item.imagePath, typeHandler=com.vetti.common.handle.JsonTypeHandler},
#{item.isDel}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.remark},)
</foreach>
</insert>
</mapper>