From af7f37cbb7a0694c882bdc91174dca39796ad4ad Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 02 Nov 2021 16:20:23 +0800
Subject: [PATCH] Merge branch 'score_shop' into ty_fix
---
zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml | 2 +-
1 files changed, 1 insertions(+), 1 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 9c23401..ac64cfa 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
@@ -1103,7 +1103,7 @@
and date_format(a.create_time, '%Y') = date_format(#{record.datatime}, '%Y')
</if>
<if test='record.t1 == "4" and record.datatime != null'>
- and date_format(datatime, '%Y-%m-%d %u') = date_format(#{record.datatime}, '%Y-%m-%d %u')
+ and date_format(a.create_time, '%Y-%m-%d %u') = date_format(#{record.datatime}, '%Y-%m-%d %u')
</if>
</where>
group by a.shop_id
--
Gitblit v1.9.1