From c501a7d724fefb38c99f5b1f4469b5b0833d3c95 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 09 Aug 2021 11:40:08 +0800
Subject: [PATCH] fix bug
---
gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 48 insertions(+), 1 deletions(-)
diff --git a/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml b/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml
index 348a35a..6d4ef3b 100644
--- a/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml
+++ b/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml
@@ -13,14 +13,20 @@
,a.weight
,a.status
,a.remark
- ,date_format(a.receiving_time, '%Y-%m-%d %H:%d') receivingTime
+ ,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 a.user_id=#{record.userId}
@@ -37,4 +43,45 @@
group by a.id
order by a.receiving_time desc, a.id desc
</select>
+
+ <select id="selectOrderStatusCount" resultType="com.xzx.gc.order.vo.JhyStatusCountVo">
+ select
+ status,
+ count(1) cnt
+ from xzx_jhy_order
+ <where>
+ status=1
+ <if test="type == 2">
+ and user_id=#{userId}
+ </if>
+ </where>
+ group by status
+ union all
+ select
+ status,
+ count(1) cnt
+ from xzx_jhy_order
+ <where>
+ <if test="type == 1">
+ and jhy_id=#{userId}
+ </if>
+ <if test="type == 2" >
+ and user_id=#{userId}
+ </if>
+ </where>
+ group by status
+ </select>
+
+ <select id="selectJhyOrderListByStatus" resultType="com.xzx.gc.entity.JhyOrder">
+ select * from xzx_jhy_order
+ where user_id=#{userId} and status in
+ <foreach collection="list" index="index" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </select>
+
+ <select id="selectJhyOrderNoWaitAndCancel" resultType="com.xzx.gc.entity.JhyOrder">
+ select * from xzx_jhy_order
+ where status not in (1, 5)
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1