From d666793c93e91026e129f00bae414217690635ae Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 27 May 2021 13:20:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-manage/src/main/java/com/moral/api/pojo/form/organization/OrganizationInsertForm.java | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/form/organization/OrganizationInsertForm.java b/screen-manage/src/main/java/com/moral/api/pojo/form/organization/OrganizationInsertForm.java
index 26824d9..a4aff0e 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/form/organization/OrganizationInsertForm.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/form/organization/OrganizationInsertForm.java
@@ -1,11 +1,13 @@
package com.moral.api.pojo.form.organization;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.moral.api.entity.Organization;
import com.moral.api.pojo.dto.organization.OrganizationDTO;
import com.moral.constant.ResponseCodeEnum;
import com.moral.util.DateUtils;
import com.moral.util.RegexUtils;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.util.ObjectUtils;
import java.io.Serializable;
@@ -50,7 +52,9 @@
private String wechat;
- private String expireTime;
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ private Date expireTime;
public boolean valid() {
if (
@@ -82,8 +86,7 @@
organization.setPhone(phone);
organization.setEmail(email);
organization.setWechat(wechat);
- Date expireTimeDate = DateUtils.getDate(expireTime + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
- organization.setExpireTime(expireTimeDate);
+ organization.setExpireTime(expireTime);
return organization;
}
@@ -106,16 +109,9 @@
return dto;
}
}
- //������������������������
- if (!RegexUtils.checkDate(expireTime)) {
- dto.setCode(ResponseCodeEnum.TIME_FORMAT_INVALID.getCode());
- dto.setMsg(ResponseCodeEnum.TIME_FORMAT_INVALID.getMsg());
- return dto;
- }
//������������������������������������������
- Date expireDate = DateUtils.getDate(expireTime, "yyyy-MM-dd");
Date currentDate = new Date();
- if (DateUtils.compareDateStr(expireDate, currentDate) >= 0) {
+ if (DateUtils.compareDateStr(expireTime, currentDate) >= 0) {
dto.setCode(ResponseCodeEnum.TIME_INVALID.getCode());
dto.setMsg(ResponseCodeEnum.TIME_INVALID.getMsg());
return dto;
--
Gitblit v1.8.0