From fa791f7796c1546b1329b52a3de8d753915cb4d5 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 20 Apr 2021 00:24:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

---
 zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignRecordDao.xml |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignRecordDao.xml b/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignRecordDao.xml
index ad83bc6..f84a474 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignRecordDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignRecordDao.xml
@@ -14,4 +14,14 @@
             and a.sign_time like concat('%',DATE(#{format}),'%')
     </select>
 
+    <select id="selectRecordByMonth" resultType="com.matrix.system.shopXcx.api.vo.ActivitySignRecordVo">
+        SELECT
+            *
+        FROM
+            activity_sign_record a
+        where a.sign_time like concat('%',DATE_FORMAT(#{date},'%Y-%m'),'%')
+          and a.activity_id = #{actId}
+          and a.user_id = #{userId}
+    </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1