From 2116b5b5802c0de0f126f85cf2ac56a732639e82 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Wed, 02 Jul 2025 16:39:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin
---
oying-system/src/main/resources/mapper/rider/RiderOrderOperationMapper.xml | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 59 insertions(+), 0 deletions(-)
diff --git a/oying-system/src/main/resources/mapper/rider/RiderOrderOperationMapper.xml b/oying-system/src/main/resources/mapper/rider/RiderOrderOperationMapper.xml
new file mode 100644
index 0000000..2dd63c0
--- /dev/null
+++ b/oying-system/src/main/resources/mapper/rider/RiderOrderOperationMapper.xml
@@ -0,0 +1,59 @@
+<?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.rider.mapper.RiderOrderOperationMapper">
+ <resultMap id="BaseResultMap" type="com.oying.modules.rider.domain.RiderOrderOperation">
+ <id column="operation_id" property="operationId"/>
+ <result column="order_id" property="orderId"/>
+ <result column="order_num" property="orderNum"/>
+ <result column="rider_id" property="riderId"/>
+ <result column="rider_phone" property="riderPhone"/>
+ <result column="rider_name" property="riderName"/>
+ <result column="operation_type" property="operationType"/>
+ <result column="operation_reason" property="operationReason"/>
+ <result column="operation_time" property="operationTime"/>
+ <result column="create_by" property="createBy"/>
+ <result column="create_time" property="createTime"/>
+ <result column="update_by" property="updateBy"/>
+ <result column="update_time" property="updateTime"/>
+ </resultMap>
+
+ <sql id="Base_Column_List">
+ operation_id, order_id, order_num, rider_id, rider_phone, rider_name, operation_type, operation_reason, operation_time, create_by, create_time, update_by, update_time
+ </sql>
+
+ <select id="findAll" resultMap="BaseResultMap">
+ select
+ <include refid="Base_Column_List"/>
+ from qs_rider_order_operation
+ <where>
+ <if test="criteria.orderId != null">
+ and order_id = #{criteria.orderId}
+ </if>
+ <if test="criteria.orderNum != null">
+ and order_num = #{criteria.orderNum}
+ </if>
+ <if test="criteria.riderId != null">
+ and rider_id = #{criteria.riderId}
+ </if>
+ <if test="criteria.riderPhone != null">
+ and rider_phone = #{criteria.riderPhone}
+ </if>
+ <if test="criteria.riderName != null">
+ and rider_name = #{criteria.riderName}
+ </if>
+ <if test="criteria.operationType != null">
+ and operation_type = #{criteria.operationType}
+ </if>
+ <if test="criteria.operationReason != null">
+ and operation_reason like concat('%',#{criteria.operationReason},'%')
+ </if>
+ <if test="criteria.operationTime != null and criteria.operationTime.size() > 0">
+ AND operation_time BETWEEN #{criteria.operationTime[0]} AND #{criteria.operationTime[1]}
+ </if>
+ <if test="criteria.createTime != null and criteria.createTime.size() > 0">
+ AND create_time BETWEEN #{criteria.createTime[0]} AND #{criteria.createTime[1]}
+ </if>
+ </where>
+ order by operation_id desc
+ </select>
+</mapper>
\ No newline at end of file
--
Gitblit v1.9.3