diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoDetailAppResultDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoDetailAppResultDTO.java index ec7fb1e33..d03cd1f68 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoDetailAppResultDTO.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoDetailAppResultDTO.java @@ -17,6 +17,7 @@ package com.elink.esua.epdc.activity.result; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.io.Serializable; @@ -57,21 +58,25 @@ public class ActInfoDetailAppResultDTO implements Serializable { /** * 报名开始时间（yyyy-MM-dd HH:ss） */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") private Date signupStartTime; /** * 报名截止时间（yyyy-MM-dd HH:ss） */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") private Date signupEndTime; /** * 活动开始时间（yyyy-MM-dd HH:ss） */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") private Date actStartTime; /** * 活动结束时间（yyyy-MM-dd HH:ss） */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") private Date actEndTime; /** diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/constant/ActUserRelationStatusConstant.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/constant/ActUserRelationStatusConstant.java new file mode 100644 index 000000000..6cfc6f8f0 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/constant/ActUserRelationStatusConstant.java @@ -0,0 +1,33 @@ +package com.elink.esua.epdc.constant; + +/** + * @Description 用户活动关系表当前状态（0-报名，1-审核通过，2-打卡，3-取消报名，4-审核不通过） + * @Author yinzuomei + * @Date 2020/2/5 21:35 + */ +public interface ActUserRelationStatusConstant { + /** + * 报名 + */ + String SIGN_UP="0"; + + /** + * 审核通过 + */ + String APPROVED="1"; + + /** + * 打卡 + */ + String CLOCK="2"; + + /** + * 取消报名 + */ + String CANCEL_SIGN_UP="3"; + + /** + * 审核不通过 + */ + String NOT_APPROVED="4"; +} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java index 1112b6da0..155ac5e65 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java @@ -38,6 +38,7 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.constant.ActStateConstant; +import com.elink.esua.epdc.constant.ActUserRelationStatusConstant; import com.elink.esua.epdc.constant.ActUserStatusConstant; import com.elink.esua.epdc.dto.ScheduleJobDTO; import com.elink.esua.epdc.modules.activity.dao.ActInfoDao; @@ -245,6 +246,14 @@ public class ActInfoServiceImpl extends BaseServiceImpl().ok(resultDTO); } + /** + * @param actId 活动id + * @param userId 用户id + * @return java.lang.String + * @Author yinzuomei + * @Description 返回当前活动下，用户状态：（0-我要报名，1-取消报名，2-已报满，3-未开始，4-我要打卡，5-更新打卡，6-已结束，7-已取消） + * @Date 2020/2/5 21:54 + **/ public String getCurrentUserStatus(String actId, String userId) { ActInfoEntity actInfoEntity = baseDao.selectById(actId); String currentUserStatus = ""; @@ -276,11 +285,11 @@ public class ActInfoServiceImpl extends BaseServiceImpl actInfoEntity.getSignupNum())) { currentUserStatus = ActUserStatusConstant.SIGN_UP; } else if (null == actUserRelationEntity && (actInfoEntity.getActQuota().equals(actInfoEntity.getSignupNum()))) { currentUserStatus = ActUserStatusConstant.FULL_SIGN_UP; } else if (null != actUserRelationEntity - && (actUserRelationEntity.getStatus().equals("0") - || actUserRelationEntity.getStatus().equals("1"))) { + && (ActUserRelationStatusConstant.SIGN_UP.equals(actUserRelationEntity.getStatus()) + || ActUserRelationStatusConstant.APPROVED.equals(actUserRelationEntity.getStatus()))) { currentUserStatus = ActUserStatusConstant.CANCEL_SIGN_UP; + } else if (null != actUserRelationEntity && ActUserRelationStatusConstant.CANCEL_SIGN_UP.equals(actUserRelationEntity.getStatus())) { + currentUserStatus = ActUserStatusConstant.SIGN_UP; } } else if (currentTime.after(actInfoEntity.getSignupEndTime()) && currentTime.before(actInfoEntity.getActStartTime())) { /*报名截至时间到活动未开始时间段内： - 1、当前用户未报名底部显示按钮 未开始 - 2、当前用户已报名且审核通过 取消报名 - 3、当前用户已报名审核不通过 未开始*/ + 1、当前用户未报名底部显示按钮 -未开始 + 2、当前用户已经取消报名的-未开始 + 3、当前用户已报名且审核通过、未审核 -取消报名 + 4、当前用户已报名审核不通过 -未开始*/ if (null == actUserRelationEntity) { currentUserStatus = ActUserStatusConstant.NOT_STARTED; - } else if (null != actUserRelationEntity && actUserRelationEntity.getStatus().equals("1")) { + } else if (null != actUserRelationEntity && ActUserRelationStatusConstant.CANCEL_SIGN_UP.equals(actUserRelationEntity.getStatus())) { + currentUserStatus = ActUserStatusConstant.NOT_STARTED; + } else if (null != actUserRelationEntity + && (ActUserRelationStatusConstant.APPROVED.equals(actUserRelationEntity.getStatus()) + || ActUserRelationStatusConstant.SIGN_UP.equals(actUserRelationEntity.getStatus()))) { currentUserStatus = ActUserStatusConstant.CANCEL_SIGN_UP; - } else if (null != actUserRelationEntity && actUserRelationEntity.getStatus().equals("4")) { + } else if (null != actUserRelationEntity && ActUserRelationStatusConstant.NOT_APPROVED.equals(actUserRelationEntity.getStatus())) { currentUserStatus = ActUserStatusConstant.NOT_STARTED; } }