From c1d20b425b10e8ba59f102dd1ab413055883eed0 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Mon, 14 Jul 2025 16:57:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xin' into pxb
---
oying-system/src/main/resources/mapper/sh/OrderReturnOperationLogMapper.xml | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 47 insertions(+), 0 deletions(-)
diff --git a/oying-system/src/main/resources/mapper/sh/OrderReturnOperationLogMapper.xml b/oying-system/src/main/resources/mapper/sh/OrderReturnOperationLogMapper.xml
new file mode 100644
index 0000000..34006bf
--- /dev/null
+++ b/oying-system/src/main/resources/mapper/sh/OrderReturnOperationLogMapper.xml
@@ -0,0 +1,47 @@
+<?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.oying.modules.sh.mapper.OrderReturnOperationLogMapper">
+ <resultMap id="BaseResultMap" type="com.oying.modules.sh.domain.OrderReturnOperationLog">
+ <id column="log_id" property="logId"/>
+ <result column="return_num" property="returnNum"/>
+ <result column="username" property="username"/>
+ <result column="user_type" property="userType"/>
+ <result column="operation" property="operation"/>
+ <result column="operation_describe" property="operationDescribe"/>
+ <result column="remark" property="remark"/>
+ <result column="snapshot_data" property="snapshotData"/>
+ <result column="operation_time" property="operationTime"/>
+ </resultMap>
+
+ <sql id="Base_Column_List">
+ log_id, return_num, username, user_type, operation, operation_describe, remark, snapshot_data, operation_time
+ </sql>
+
+ <select id="findAll" resultMap="BaseResultMap">
+ select
+ <include refid="Base_Column_List"/>
+ from sh_order_return_operation_log
+ <where>
+ <if test="criteria.returnNum != null">
+ and return_num = #{criteria.returnNum}
+ </if>
+ <if test="criteria.username != null">
+ and username like concat('%',#{criteria.username},'%')
+ </if>
+ <if test="criteria.userType != null">
+ and user_type = #{criteria.userType}
+ </if>
+ <if test="criteria.operationTime != null and criteria.operationTime.size() > 0">
+ AND operation_time BETWEEN #{criteria.operationTime[0]} AND #{criteria.operationTime[1]}
+ </if>
+ </where>
+ order by log_id desc
+ </select>
+ <select id="getByReturnNum" resultMap="BaseResultMap">
+ select
+ <include refid="Base_Column_List"/>
+ from sh_order_return_operation_log
+ where return_num = #{returnNum}
+ order by log_id
+ </select>
+</mapper>
--
Gitblit v1.9.3