From 737faba7c5da573ce9ee7293380afd2c3884e18d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 28 Jun 2021 22:35:26 +0800
Subject: [PATCH] modify
---
gc-order/src/main/java/com/xzx/gc/order/vo/JhyOrderListVo.java | 6 ++++++
gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml | 3 +++
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/gc-order/src/main/java/com/xzx/gc/order/vo/JhyOrderListVo.java b/gc-order/src/main/java/com/xzx/gc/order/vo/JhyOrderListVo.java
index 6b0b83f..d63487c 100644
--- a/gc-order/src/main/java/com/xzx/gc/order/vo/JhyOrderListVo.java
+++ b/gc-order/src/main/java/com/xzx/gc/order/vo/JhyOrderListVo.java
@@ -58,4 +58,10 @@
@ApiModelProperty(value = "状态")
private Integer status;
+
+ @ApiModelProperty(value = "集物员姓名")
+ private String jhyName;
+
+ @ApiModelProperty(value = "集物员电话")
+ private String jhyPhone;
}
\ No newline at end of file
diff --git a/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml b/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml
index f9a450d..f769815 100644
--- a/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml
+++ b/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml
@@ -15,8 +15,11 @@
,a.remark
,CONCAT(a.reserve_date, ' ', a.reserve_time) reserveTime
,GROUP_CONCAT(b.title) items
+ ,c.username jhyName
+ ,c.mobile jhyPhone
from xzx_jhy_order a
inner join xzx_jhy_order_items b on a.id=b.order_id
+ left join xzx_jhy_info c on a.jhy_id=c.id
<where>
<if test="record.type == 1">
and user_id=#{record.userId}
--
Gitblit v1.9.1