From 0930c034b802273c694b2cd880dddd4f9bb6fcd5 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 12 Apr 2021 12:40:22 +0800
Subject: [PATCH] modify

---
 zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml b/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml
index c983585..9b584d0 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml
@@ -10,12 +10,14 @@
 		a.id id,
 		b.nick_name nickName,
 		a.receive_time reciveTime,
+		a.state,
 		c.cumulative_day cumulativeDay,
 		c.award_type awardType,
-		c.award_name awardName
+		c.award_name awardName,
+		c.award_rule awardRule
 		FROM
 		activity_sign_receive_record a
-		LEFT JOIN biz_user b ON a.open_id = b.open_id
+		LEFT JOIN biz_user b ON a.user_id = b.user_id
 		LEFT JOIN activity_sign_award_set c ON a.award_id = c.id
 		<where>
 			a.company_id = #{record.companyId}
@@ -76,4 +78,18 @@
 		</if>
 	</select>
 
+	<select id="getSignAwardReceiveCount" resultType="int">
+		SELECT
+			count(a.id)
+		FROM
+			activity_sign_receive_record a
+		LEFT JOIN activity_sign_award_set b ON a.award_id = b.id
+		where
+		      b.award_type = 1
+		  	and a.state = 1
+		  	and a.company_id = #{companyId}
+			and a.user_id = #{userId}
+
+	</select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1