From 4c75849f7c579147e20a3ce9e07d43375ceb4c2a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 22 Apr 2021 14:47:49 +0800
Subject: [PATCH] 20210422 签到
---
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-receive.html | 1 +
zq-erp/src/main/java/com/matrix/system/activity/vo/SignReceiveListVo.java | 3 +++
zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml | 1 +
3 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/activity/vo/SignReceiveListVo.java b/zq-erp/src/main/java/com/matrix/system/activity/vo/SignReceiveListVo.java
index 06f33bf..661707f 100644
--- a/zq-erp/src/main/java/com/matrix/system/activity/vo/SignReceiveListVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/activity/vo/SignReceiveListVo.java
@@ -22,6 +22,9 @@
@ApiModelProperty(value = "连续签到天数")
private Integer cumulativeDay;
+
+ @ApiModelProperty(value = "数量")
+ private Integer scoreCnt;
@ApiModelProperty(value = "奖励类型")
private String awardType;
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 868f5e3..221ca35 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml
@@ -15,6 +15,7 @@
c.award_type awardType,
c.award_name awardName,
c.coupon_name couponName,
+ c.score_cnt scoreCnt,
c.award_rule awardRule
FROM
activity_sign_receive_record a
diff --git a/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-receive.html b/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-receive.html
index da4a408..8f1da03 100644
--- a/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-receive.html
+++ b/zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-receive.html
@@ -128,6 +128,7 @@
<template slot-scope="scope">
{{scope.row.awardName}}
<span v-if="scope.row.awardType == 3">({{scope.row.couponName}})</span>
+ <span v-if="scope.row.awardType == 2">(*{{scope.row.scoreCnt}})</span>
</template>
</el-table-column>
</el-table>
--
Gitblit v1.9.1