From 26343ea21902eef98f72f6f978767073fcbc082c Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 24 Jul 2020 13:33:14 +0800
Subject: [PATCH] =?UTF-8?q?heart-work:ACT=5FPOINT=5FLOG=EF=BC=9AEFFECT=5FF?=
=?UTF-8?q?LAG=E6=96=B0=E5=A2=9E1=E6=9C=89=E6=95=880=E6=97=A0=E6=95=88?=
=?UTF-8?q?=EF=BC=8C=E5=8F=AA=E6=9C=89=E5=9C=A8=E6=B4=BB=E5=8A=A8=E7=9C=9F?=
=?UTF-8?q?=E6=AD=A3=E7=BB=93=E6=9D=9F=E5=90=8E=E6=89=8D=E6=98=AF1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/java/com/epmet/dto/ActPointLogDTO.java | 9 +++++++--
.../main/java/com/epmet/entity/ActPointLogEntity.java | 9 ++++++---
.../src/main/resources/mapper/ActPointLogDao.xml | 1 +
3 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActPointLogDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActPointLogDTO.java
index 2d878f2615..d7510db23d 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActPointLogDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActPointLogDTO.java
@@ -17,9 +17,10 @@
package com.epmet.dto;
+import lombok.Data;
+
import java.io.Serializable;
import java.util.Date;
-import lombok.Data;
/**
@@ -98,5 +99,9 @@ public class ActPointLogDTO implements Serializable {
* 更新时间
*/
private Date updatedTime;
-
+ /**
+ * 1有效0无效，只有在活动真正结束后才是1
+ * true有效 false无效
+ */
+ private Boolean effectFlag;
}
\ No newline at end of file
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActPointLogEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActPointLogEntity.java
index 1a437316e1..0b50778f81 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActPointLogEntity.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActPointLogEntity.java
@@ -18,13 +18,10 @@
package com.epmet.entity;
import com.baomidou.mybatisplus.annotation.TableName;
-
import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import java.util.Date;
-
/**
* 活动发放积分日志表
*
@@ -69,4 +66,10 @@ public class ActPointLogEntity extends BaseEpmetEntity {
*/
private String remark;
+
+ /**
+ * 1有效0无效，只有在活动真正结束后才是1
+ * true有效 false无效
+ */
+ private Boolean effectFlag;
}
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActPointLogDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActPointLogDao.xml
index 9da8bf431c..0695ec7f4c 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActPointLogDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActPointLogDao.xml
@@ -11,6 +11,7 @@
+