From a8fb0a175ff61c82819e7da191030c2f5e90ae98 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 18 Aug 2021 17:10:22 +0800
Subject: [PATCH] 20210818
---
gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml | 18 ++++++++++++++++--
gc-shop/src/main/java/com/xzx/gc/shop/dto/QueryJhyOrderListDto.java | 6 ++++++
2 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/dto/QueryJhyOrderListDto.java b/gc-shop/src/main/java/com/xzx/gc/shop/dto/QueryJhyOrderListDto.java
index b3ce0ea..7f072d9 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/dto/QueryJhyOrderListDto.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/dto/QueryJhyOrderListDto.java
@@ -22,6 +22,12 @@
@ApiModelProperty(value="手机号")
private String accountPhone;
+ @ApiModelProperty(value="排序字段 1：预约时间 2：名称")
+ private Integer namePx;
+
+ @ApiModelProperty(value="排序方式 1： asc , 2 ：aesc")
+ private Integer typePx;
+
@ApiModelProperty(value="状态 1-待接单2-服务中3-已收款4-待入库5-已完成6-已取消")
private List<Integer> status;
diff --git a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
index 385b7f7..a626a11 100644
--- a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
@@ -33,7 +33,8 @@
</foreach>
</if>
<if test="record.jwyName != null and record.jwyName != ''">
- and d.username like concat('%',#{record.jwyName},'%')
+ and (d.username like concat('%',#{record.jwyName},'%')
+ or d.mobile like concat('%',#{record.jwyName},'%'))
</if>
<if test="record.account != null and record.account != ''">
and ( a.username like concat('%',#{record.account},'%')
@@ -46,7 +47,20 @@
<if test="record.reserveTimeEnd != null">
and a.reserve_date <= #{record.reserveTimeEnd}
</if>
- order by a.CREATED_TIME desc
+ order by
+ <if test="record.namePx != null and record.namePx != '' and record.namePx == 1">
+ a.CREATED_TIME
+ </if>
+ <if test="record.namePx != null and record.namePx != '' and record.namePx == 2">
+ a.username
+ </if>
+
+ <if test="record.typePx != null and record.typePx != '' and record.typePx == 1">
+ asc
+ </if>
+ <if test="record.typePx != null and record.typePx != '' and record.typePx == 2">
+ desc
+ </if>
</select>
--
Gitblit v1.9.1