From 6269dc7a50d5028fa616b339cfe790b6e0d5d16e Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Wed, 16 Jul 2025 18:20:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin
---
oying-system/src/main/resources/mapper/sh/OrderOperationLogMapper.xml | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/oying-system/src/main/resources/mapper/sh/OrderOperationLogMapper.xml b/oying-system/src/main/resources/mapper/sh/OrderOperationLogMapper.xml
index 1611552..86f4724 100644
--- a/oying-system/src/main/resources/mapper/sh/OrderOperationLogMapper.xml
+++ b/oying-system/src/main/resources/mapper/sh/OrderOperationLogMapper.xml
@@ -3,9 +3,10 @@
<mapper namespace="com.oying.modules.sh.mapper.OrderOperationLogMapper">
<resultMap id="BaseResultMap" type="com.oying.modules.sh.domain.OrderOperationLog">
<id column="log_id" property="logId"/>
- <result column="user_id" property="userId"/>
+ <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"/>
@@ -13,7 +14,7 @@
</resultMap>
<sql id="Base_Column_List">
- log_id, user_id, user_type, operation, remark, snapshot_data, operation_time, order_num
+ log_id, username, user_type, operation, operation_describe, remark, snapshot_data, operation_time, order_num
</sql>
<select id="findAll" resultMap="BaseResultMap">
@@ -21,8 +22,8 @@
<include refid="Base_Column_List"/>
from sh_order_operation_log
<where>
- <if test="criteria.userId != null">
- and user_id = #{criteria.userId}
+ <if test="criteria.username != null">
+ and username like concat('%',#{criteria.username},'%')
</if>
<if test="criteria.userType != null">
and user_type = #{criteria.userType}
@@ -34,6 +35,12 @@
AND operation_time BETWEEN #{criteria.operationTime[0]} AND #{criteria.operationTime[1]}
</if>
</where>
- order by log_id desc
+ order by log_id
</select>
-</mapper>
\ No newline at end of file
+ <select id="getByOrderNum" resultMap="BaseResultMap">
+ select
+ <include refid="Base_Column_List"/>
+ from sh_order_operation_log
+ where order_num = #{orderNum} order by log_id
+ </select>
+</mapper>
--
Gitblit v1.9.3