From 68b27795ae929f5300fc6fb301b31aada74a2e2f Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期二, 10 三月 2026 15:26:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
tms/src/main/resources/mapper/tms/TmsDispatchOrderImportLogMapper.xml | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 101 insertions(+), 0 deletions(-)
diff --git a/tms/src/main/resources/mapper/tms/TmsDispatchOrderImportLogMapper.xml b/tms/src/main/resources/mapper/tms/TmsDispatchOrderImportLogMapper.xml
new file mode 100644
index 0000000..9e04af9
--- /dev/null
+++ b/tms/src/main/resources/mapper/tms/TmsDispatchOrderImportLogMapper.xml
@@ -0,0 +1,101 @@
+<?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.ruoyi.tms.mapper.TmsDispatchOrderImportLogMapper">
+
+ <resultMap type="com.ruoyi.tms.domain.TmsDispatchOrderImportLog" id="TmsDispatchOrderImportLogResult">
+ <result property="id" column="id" />
+ <result property="importTime" column="import_time" />
+ <result property="fileName" column="file_name" />
+ <result property="operator" column="operator" />
+ <result property="successCount" column="success_count" />
+ <result property="failureCount" column="failure_count" />
+ <result property="failureDescription" column="failure_description" />
+ <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="selectTmsDispatchOrderImportLogVo">
+ select id, import_time, file_name, operator, success_count, failure_count, failure_description, create_by, create_time, update_by, update_time, remark from tms_dispatch_order_import_log
+ </sql>
+
+ <select id="selectTmsDispatchOrderImportLogList" parameterType="com.ruoyi.tms.domain.TmsDispatchOrderImportLog" resultMap="TmsDispatchOrderImportLogResult">
+ <include refid="selectTmsDispatchOrderImportLogVo"/>
+ <where>
+ <if test="fileName != null and fileName != ''"> and file_name like concat('%', #{fileName}, '%')</if>
+ <if test="operator != null and operator != ''"> and operator like concat('%', #{operator}, '%')</if>
+ <if test="successCount != null "> and success_count = #{successCount}</if>
+ <if test="failureCount != null "> and failure_count = #{failureCount}</if>
+ <if test="failureDescription != null and failureDescription != ''"> and failure_description like concat('%', #{failureDescription}, '%')</if>
+ <if test="importTime != null"> and import_time = #{importTime}</if>
+
+ </where>
+ order by import_time desc
+ </select>
+
+ <select id="selectTmsDispatchOrderImportLogById" parameterType="Integer" resultMap="TmsDispatchOrderImportLogResult">
+ <include refid="selectTmsDispatchOrderImportLogVo"/>
+ where id = #{id}
+ </select>
+
+ <insert id="insertTmsDispatchOrderImportLog" parameterType="com.ruoyi.tms.domain.TmsDispatchOrderImportLog" useGeneratedKeys="true" keyProperty="id">
+ insert into tms_dispatch_order_import_log
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="importTime != null">import_time,</if>
+ <if test="fileName != null and fileName != ''">file_name,</if>
+ <if test="operator != null and operator != ''">operator,</if>
+ <if test="successCount != null">success_count,</if>
+ <if test="failureCount != null">failure_count,</if>
+ <if test="failureDescription != null">failure_description,</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="importTime != null">#{importTime},</if>
+ <if test="fileName != null and fileName != ''">#{fileName},</if>
+ <if test="operator != null and operator != ''">#{operator},</if>
+ <if test="successCount != null">#{successCount},</if>
+ <if test="failureCount != null">#{failureCount},</if>
+ <if test="failureDescription != null">#{failureDescription},</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="updateTmsDispatchOrderImportLog" parameterType="com.ruoyi.tms.domain.TmsDispatchOrderImportLog">
+ update tms_dispatch_order_import_log
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="importTime != null">import_time = #{importTime},</if>
+ <if test="fileName != null and fileName != ''">file_name = #{fileName},</if>
+ <if test="operator != null and operator != ''">operator = #{operator},</if>
+ <if test="successCount != null">success_count = #{successCount},</if>
+ <if test="failureCount != null">failure_count = #{failureCount},</if>
+ <if test="failureDescription != null">failure_description = #{failureDescription},</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="deleteTmsDispatchOrderImportLogById" parameterType="Integer">
+ delete from tms_dispatch_order_import_log where id = #{id}
+ </delete>
+
+ <delete id="deleteTmsDispatchOrderImportLogByIds" parameterType="String">
+ delete from tms_dispatch_order_import_log where id in
+ <foreach item="id" collection="array" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </delete>
+</mapper>
\ No newline at end of file
--
Gitblit v1.8.0