From 3f46c97f2e986c0307aa747df847f362854abab4 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 29 Dec 2020 11:53:33 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
index c36f30a..8460bf2 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
@@ -961,7 +961,7 @@
<select id="selectShopConsumeAchieveRanking" resultType="com.matrix.system.app.vo.RankingVo">
select
- b.shop_short_name,
+ b.shop_short_name name,
b.SHOP_IMAG photo,
sum(IFNULL(a.free_consume,0) + IFNULL(a.consume,0) + IFNULL(a.his_consume,0)) amount
from achieve_new a
@@ -970,13 +970,13 @@
<if test="record.companyId != null">
and a.company_id=#{record.companyId}
</if>
- <if test='record.t1 == "1" and record.orderTime != null'>
+ <if test='record.t1 == "1" and record.datatime != null'>
and date_format(datatime, '%Y-%m-%d') = date_format(#{record.datatime}, '%Y-%m-%d')
</if>
- <if test='record.t1 == "2" and record.orderTime != null'>
+ <if test='record.t1 == "2" and record.datatime != null'>
and date_format(datatime, '%Y-%m') = date_format(#{record.datatime}, '%Y-%m')
</if>
- <if test='record.t1 == "3" and record.orderTime != null'>
+ <if test='record.t1 == "3" and record.datatime != null'>
and date_format(datatime, '%Y') = date_format(#{record.datatime}, '%Y')
</if>
</where>
@@ -1000,13 +1000,13 @@
<if test="record.shopId != null">
and a.shop_id=#{record.shopId}
</if>
- <if test='record.t1 == "1" and record.orderTime != null'>
+ <if test='record.t1 == "1" and record.datatime != null'>
and date_format(datatime, '%Y-%m-%d') = date_format(#{record.datatime}, '%Y-%m-%d')
</if>
- <if test='record.t1 == "2" and record.orderTime != null'>
+ <if test='record.t1 == "2" and record.datatime != null'>
and date_format(datatime, '%Y-%m') = date_format(#{record.datatime}, '%Y-%m')
</if>
- <if test='record.t1 == "3" and record.orderTime != null'>
+ <if test='record.t1 == "3" and record.datatime != null'>
and date_format(datatime, '%Y') = date_format(#{record.datatime}, '%Y')
</if>
</where>
--
Gitblit v1.9.1