From 8d08ca6bdfc3dd61b0aaa7daa27308c3d59f0df1 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 14 Jul 2021 15:03:11 +0800
Subject: [PATCH] 202107014
---
gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml b/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml
index f9a450d..e796b6d 100644
--- a/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml
+++ b/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml
@@ -13,17 +13,27 @@
,a.weight
,a.status
,a.remark
+ ,date_format(a.receiving_time, '%Y-%m-%d %H:%i') receivingTime
,CONCAT(a.reserve_date, ' ', a.reserve_time) reserveTime
,GROUP_CONCAT(b.title) items
+ ,sum(b.score) recycleScore
+ ,IFNULL(SUM(case when d.item_unit = '台' then b.weight
+ else 0 end), 0) recycleTai
+ ,IFNULL(SUM(case when d.item_unit = 'kg' then b.weight
+ else 0 end), 0) recycleKg
+ ,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.user_id
+ left join xzx_sys_environmental_info d on b.item_type = d.id
<where>
<if test="record.type == 1">
- and user_id=#{record.userId}
+ and a.user_id=#{record.userId}
</if>
<if test="record.type == 2">
<if test="record.status != 1">
- and jhy_id=#{record.userId}
+ and a.jhy_id=#{record.userId}
</if>
</if>
<if test="record.status != null and record.status != ''">
@@ -31,5 +41,6 @@
</if>
</where>
group by a.id
+ order by a.receiving_time desc, a.id desc
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1