From b8d50f6ad9d1ab407e5b2a6867cf47bc4640a43c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 12 Apr 2021 18:11:55 +0800
Subject: [PATCH] modify taocanlist api
---
zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml | 55 +++++++++++++++++++------------------------------------
1 files changed, 19 insertions(+), 36 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 53ca3c5..9b584d0 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml
@@ -3,52 +3,21 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.matrix.system.activity.dao.ActivitySignReceiveRecordDao">
- <!-- 定义ActivitySignReceiveRecord 的复杂关联map -->
- <resultMap type="com.matrix.system.activity.entity.ActivitySignReceiveRecord" id="ActivitySignReceiveRecordMap">
- <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="receiveTime" column="receive_time" />
- <result property="remark" column="remark" />
- <result property="awardId" column="award_id" />
- <result property="state" column="state" />
- <result property="writeOffCode" column="write_off_code" />
- <result property="activityId" column="activity_id" />
- <result property="companyId" column="company_id" />
- </resultMap>
-
-
- <!-- 定义ActivitySignReceiveRecord 的简单map ，本map不添加其他的关联属性 -->
- <resultMap type="com.matrix.system.activity.entity.ActivitySignReceiveRecord" id="ActivitySignReceiveRecordSimpleMap">
- <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="receiveTime" column="receive_time" />
- <result property="remark" column="remark" />
- <result property="awardId" column="award_id" />
- <result property="state" column="state" />
- <result property="writeOffCode" column="write_off_code" />
- <result property="activityId" column="activity_id" />
- <result property="companyId" column="company_id" />
- </resultMap>
+
<select id="findSignReceiveList" resultType="com.matrix.system.activity.vo.SignReceiveListVo">
SELECT
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}
@@ -109,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