diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActSignInListResultDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActSignInListResultDTO.java index 30dda362..a9db26c8 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActSignInListResultDTO.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActSignInListResultDTO.java @@ -3,6 +3,7 @@ package com.elink.esua.epdc.activity.result; import lombok.Data; import java.io.Serializable; +import java.util.Date; /** * 活动信息 @@ -30,10 +31,10 @@ public class ActSignInListResultDTO implements Serializable { /** * 打卡开始时间 */ - private String signinStartTime; + private Date signinStartTime; /** * 打卡截止时间 */ - private String signinEndTime; + private Date signinEndTime; } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActSignInRecordsDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActSignInRecordsDTO.java index e12afe6c..7331675a 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActSignInRecordsDTO.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActSignInRecordsDTO.java @@ -3,6 +3,7 @@ package com.elink.esua.epdc.activity.result; import lombok.Data; import java.io.Serializable; +import java.util.Date; /** * 签到记录-result @@ -25,7 +26,7 @@ public class ActSignInRecordsDTO implements Serializable { /** * 签到时间 */ - private String createdTime; + private Date createdTime; /** * 操作积分类型 0-减积分,1-加积分 diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActSignInScanQrCodeResultDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActSignInScanQrCodeResultDTO.java index bb63cdcf..d87228d1 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActSignInScanQrCodeResultDTO.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActSignInScanQrCodeResultDTO.java @@ -3,6 +3,7 @@ package com.elink.esua.epdc.activity.result; import lombok.Data; import java.io.Serializable; +import java.util.Date; /** * 活动扫签到码-result @@ -30,17 +31,17 @@ public class ActSignInScanQrCodeResultDTO implements Serializable { /** * 打卡开始时间 */ - private String signinStartTime; + private Date signinStartTime; /** * 打卡截止时间 */ - private String signinEndTime; + private Date signinEndTime; /** * 签到奖励积分 */ - private String reward; + private Integer reward; /** * 签到状态:0-未签到,1-已签到 diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserPointsLogDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserPointsLogDao.xml index 1e25c863..b755d2e8 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserPointsLogDao.xml +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserPointsLogDao.xml @@ -33,10 +33,10 @@ WHERE t.DEL_FLAG = '0' AND t.OPERATION_TYPE = '9' - AND r.ACT_ID = #{formDto.actId} + AND r.ACT_ID = #{actId} ORDER BY t.CREATED_TIME DESC - LIMIT #{formDto.pageIndex}, #{formDto.pageSize} + LIMIT #{pageIndex}, #{pageSize}