From 050ff0dfc04d4ca2a33ac0e97c98f042b9f95df6 Mon Sep 17 00:00:00 2001
From: li-guang <153605324@qq.com>
Date: Wed, 07 Apr 2021 11:56:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

---
 zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignRecordDao.xml |   38 ++++++++++----------------------------
 1 files changed, 10 insertions(+), 28 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 9d51d49..59fe364 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignRecordDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignRecordDao.xml
@@ -3,33 +3,15 @@
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.matrix.system.activity.dao.ActivitySignRecordDao">
-	<!-- 定义ActivitySignRecord 的复杂关联map -->
-	<resultMap type="com.matrix.system.activity.entity.ActivitySignRecord" id="ActivitySignRecordMap">
-		<id property="id" column="id" />
-		<result property="createBy" column="create_by" />
-		<result property="createTime" column="create_time" />
-		<result property="updateBy" column="update_by" />
-		<result property="updateTime" column="update_time" />
-			<result property="openId" column="open_id" />
-			<result property="signTime" column="sign_time" />
-			<result property="cumulativeDay" column="cumulative_day" />
-			<result property="activityId" column="activity_id" />
-			<result property="companyId" column="company_id" />
-	</resultMap>
-	
-	
-	<!-- 定义ActivitySignRecord 的简单map  ,本map不添加其他的关联属性 -->
-	<resultMap type="com.matrix.system.activity.entity.ActivitySignRecord" id="ActivitySignRecordSimpleMap">
-		<id property="id" column="id" />
-		<result property="createBy" column="create_by" />
-		<result property="createTime" column="create_time" />
-		<result property="updateBy" column="update_by" />
-		<result property="updateTime" column="update_time" />
-			<result property="openId" column="open_id" />
-			<result property="signTime" column="sign_time" />
-			<result property="cumulativeDay" column="cumulative_day" />
-			<result property="activityId" column="activity_id" />
-			<result property="companyId" column="company_id" />
-	</resultMap>
+    <select id="selectOneByActIdAndUserIdLikesignTime" resultType="com.matrix.system.activity.entity.ActivitySignRecord">
+        SELECT
+        *
+        FROM
+        activity_sign_record a
+        where
+            a.actId = #{actId}
+            and a.open_id = #{userId}
+            and a.sign_time like concat('%',#{format},'%')
+    </select>
 
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1