diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java index 0b30b4d2..65e19a1b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java @@ -163,9 +163,9 @@ public class PayMeeting implements Serializable { private String meetingContent; /**报名截止时间*/ - @Excel(name = "报名截止时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @Excel(name = "报名截止时间", width = 20, format = "yyyy-MM-dd HH:mm") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm") @ApiModelProperty(value = "报名截止时间") private java.util.Date registerDeadline; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index c46a29f8..e2dae9cb 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -1,5 +1,6 @@ package com.jero.meeting.service.impl; +import cn.hutool.core.date.DateField; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; @@ -272,10 +273,11 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl 0)) { - throw new JeroBootException("报名截止时间为:" + DateUtil.formatDate(registerDeadline)); + throw new JeroBootException("报名截止时间为:" + DateUtil.format(registerDeadline,"yyyy-MM-dd HH:mm")); } //会议类型 Integer meetingType = payMeeting.getMeetingType(); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java index 052acf85..bef7faa3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java @@ -148,9 +148,9 @@ public class PayMeetingVO implements Serializable { private String meetingContent; /**报名截止时间*/ - @Excel(name = "报名截止时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @Excel(name = "报名截止时间", width = 20, format = "yyyy-MM-dd HH:mm") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm") @ApiModelProperty(value = "报名截止时间") @NotNull(message = "报名截止时间不能为空") private java.util.Date registerDeadline;