From a56551a91812ec1f620d49c7e6e06f9f15eabdbb Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 12 Jan 2021 17:39:29 +0800
Subject: [PATCH] 1、修改服务单看板时间查询了未确认的和已取消的bug 2、跟进记录根据时间倒序排序
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
index fb14fa7..33c70be 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
@@ -479,6 +479,7 @@
<select id="selectApiOrderListInPage" resultType="com.matrix.system.app.vo.OrderDetailVo">
select
a.id orderId,
+ a.VIP_ID vipId,
a.ORDER_NO orderNo,
a.ORDER_TIME orderTime,
a.STATU orderStatus,
@@ -580,6 +581,7 @@
<select id="selectStaffSaleAchieveRanking" resultType="com.matrix.system.app.vo.RankingVo">
select
b.su_name name,
+ b.su_id id,
b.su_photo photo,
sum(ZK_TOTAL) amount,
c.shop_short_name shopName
@@ -605,6 +607,6 @@
</if>
</where>
group by b.su_id
- order by amount desc, a.su_id
+ order by amount desc, b.su_id
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1