From 8596309f2f09ca02b3d937918ec5b77db498c329 Mon Sep 17 00:00:00 2001
From: jingweijie <jingweijie@pashanhoo.com>
Date: Mon, 29 Nov 2021 10:39:11 +0800
Subject: [PATCH] 字段添加.时间格式统一
---
src/main/java/com/pashanhoo/business/entity/vo/AddDgBusinessRequest.java | 2 ++
src/main/java/com/pashanhoo/business/entity/vo/DgBusinessDetailVO.java | 3 +--
src/main/java/com/pashanhoo/business/entity/vo/DgBusinessListVO.java | 2 ++
src/main/java/com/pashanhoo/business/entity/vo/DgBusinessSearchRequest.java | 2 ++
src/main/java/com/pashanhoo/business/entity/vo/UpdateDgBusinessRequest.java | 3 +--
src/main/java/com/pashanhoo/destroy/entity/vo/AddDgArchivesDestructionRequest.java | 3 +++
src/main/java/com/pashanhoo/destroy/entity/vo/DgArchivesDestructionDetailVO.java | 3 +++
src/main/java/com/pashanhoo/destroy/entity/vo/DgArchivesDestructionListVO.java | 3 +++
src/main/java/com/pashanhoo/destroy/entity/vo/DgArchivesDestructionSearchRequest.java | 2 ++
src/main/java/com/pashanhoo/destroy/entity/vo/UpdateDgArchivesDestructionRequest.java | 3 +++
src/main/java/com/pashanhoo/file/entity/vo/AddDgFileRequest.java | 3 +--
src/main/java/com/pashanhoo/file/entity/vo/DgFileDetailVO.java | 2 ++
src/main/java/com/pashanhoo/file/entity/vo/DgFileListVO.java | 3 +--
src/main/java/com/pashanhoo/file/entity/vo/DgFileSearchRequest.java | 2 ++
src/main/java/com/pashanhoo/file/entity/vo/UpdateDgFileRequest.java | 3 +--
src/main/java/com/pashanhoo/lend/entity/vo/AddDgLendRequest.java | 4 ++++
src/main/java/com/pashanhoo/lend/entity/vo/DgLendListVO.java | 4 ++++
src/main/java/com/pashanhoo/lend/entity/vo/UpdateDgLendRequest.java | 4 ++++
src/main/java/com/pashanhoo/modify/entity/vo/AddDgArchivesModifyRequest.java | 6 ++----
src/main/java/com/pashanhoo/modify/entity/vo/DgArchivesModifyDetailVO.java | 6 ++----
src/main/java/com/pashanhoo/modify/entity/vo/DgArchivesModifySearchRequest.java | 6 ++----
src/main/java/com/pashanhoo/modify/entity/vo/UpdateDgArchivesModifyRequest.java | 6 ++----
src/main/java/com/pashanhoo/receive/entity/vo/AddDgReceiveRequest.java | 6 +++++-
src/main/java/com/pashanhoo/receive/entity/vo/DgReceiveDetailVO.java | 7 ++++++-
src/main/java/com/pashanhoo/receive/entity/vo/DgReceiveListVO.java | 7 ++++++-
src/main/java/com/pashanhoo/receive/entity/vo/UpdateDgReceiveRequest.java | 7 ++++++-
src/main/java/com/pashanhoo/replenish/entity/vo/DgArchivesReplenishDetailVO.java | 12 ++++--------
src/main/java/com/pashanhoo/replenish/entity/vo/DgArchivesReplenishListVO.java | 2 --
src/main/java/com/pashanhoo/replenish/entity/vo/DgArchivesReplenishSearchRequest.java | 10 ++++------
29 files changed, 80 insertions(+), 46 deletions(-)
diff --git a/src/main/java/com/pashanhoo/business/entity/vo/AddDgBusinessRequest.java b/src/main/java/com/pashanhoo/business/entity/vo/AddDgBusinessRequest.java
index fcc0d82..155d742 100644
--- a/src/main/java/com/pashanhoo/business/entity/vo/AddDgBusinessRequest.java
+++ b/src/main/java/com/pashanhoo/business/entity/vo/AddDgBusinessRequest.java
@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotEmpty;
@@ -82,6 +83,7 @@ public class AddDgBusinessRequest implements Serializable {
*/
@NotEmpty(message = "收件时间【sjsj】不能为空")
@ApiModelProperty(name = "sjsj", value = "收件时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date sjsj;
/**
diff --git a/src/main/java/com/pashanhoo/business/entity/vo/DgBusinessDetailVO.java b/src/main/java/com/pashanhoo/business/entity/vo/DgBusinessDetailVO.java
index fbb197d..ca09381 100644
--- a/src/main/java/com/pashanhoo/business/entity/vo/DgBusinessDetailVO.java
+++ b/src/main/java/com/pashanhoo/business/entity/vo/DgBusinessDetailVO.java
@@ -78,8 +78,7 @@ public class DgBusinessDetailVO implements Serializable {
* 收件时间
*/
@ApiModelProperty(name = "sjsj", value = "收件时间")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date sjsj;
/**
diff --git a/src/main/java/com/pashanhoo/business/entity/vo/DgBusinessListVO.java b/src/main/java/com/pashanhoo/business/entity/vo/DgBusinessListVO.java
index 8d73df0..cf78e70 100644
--- a/src/main/java/com/pashanhoo/business/entity/vo/DgBusinessListVO.java
+++ b/src/main/java/com/pashanhoo/business/entity/vo/DgBusinessListVO.java
@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
/**
* <p>
@@ -77,6 +78,7 @@ public class DgBusinessListVO implements Serializable {
* 收件时间
*/
@ApiModelProperty(name = "sjsj", value = "收件时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date sjsj;
/**
diff --git a/src/main/java/com/pashanhoo/business/entity/vo/DgBusinessSearchRequest.java b/src/main/java/com/pashanhoo/business/entity/vo/DgBusinessSearchRequest.java
index c972ac3..e88e6d4 100644
--- a/src/main/java/com/pashanhoo/business/entity/vo/DgBusinessSearchRequest.java
+++ b/src/main/java/com/pashanhoo/business/entity/vo/DgBusinessSearchRequest.java
@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import com.pashanhoo.common.PageInfo;
+import org.springframework.format.annotation.DateTimeFormat;
/**
* <p>
@@ -92,6 +93,7 @@ public class DgBusinessSearchRequest extends PageInfo implements Serializable {
* 收件时间
*/
@ApiModelProperty(name = "sjsj", value = "收件时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date sjsj;
/**
diff --git a/src/main/java/com/pashanhoo/business/entity/vo/UpdateDgBusinessRequest.java b/src/main/java/com/pashanhoo/business/entity/vo/UpdateDgBusinessRequest.java
index 535a580..4daf967 100644
--- a/src/main/java/com/pashanhoo/business/entity/vo/UpdateDgBusinessRequest.java
+++ b/src/main/java/com/pashanhoo/business/entity/vo/UpdateDgBusinessRequest.java
@@ -78,8 +78,7 @@ public class UpdateDgBusinessRequest implements Serializable {
* 收件时间
*/
@ApiModelProperty(name = "sjsj", value = "收件时间")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date sjsj;
/**
diff --git a/src/main/java/com/pashanhoo/destroy/entity/vo/AddDgArchivesDestructionRequest.java b/src/main/java/com/pashanhoo/destroy/entity/vo/AddDgArchivesDestructionRequest.java
index 3180b70..c48d178 100644
--- a/src/main/java/com/pashanhoo/destroy/entity/vo/AddDgArchivesDestructionRequest.java
+++ b/src/main/java/com/pashanhoo/destroy/entity/vo/AddDgArchivesDestructionRequest.java
@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
/**
* <p>
@@ -39,6 +40,7 @@ public class AddDgArchivesDestructionRequest implements Serializable {
* 发起日期
*/
@ApiModelProperty(name = "fqrq", value = "发起日期")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date fqrq;
/**
@@ -69,6 +71,7 @@ public class AddDgArchivesDestructionRequest implements Serializable {
* 销毁日期
*/
@ApiModelProperty(name = "xhrq", value = "销毁日期")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date xhrq;
diff --git a/src/main/java/com/pashanhoo/destroy/entity/vo/DgArchivesDestructionDetailVO.java b/src/main/java/com/pashanhoo/destroy/entity/vo/DgArchivesDestructionDetailVO.java
index 2a1a899..f3c7ddf 100644
--- a/src/main/java/com/pashanhoo/destroy/entity/vo/DgArchivesDestructionDetailVO.java
+++ b/src/main/java/com/pashanhoo/destroy/entity/vo/DgArchivesDestructionDetailVO.java
@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
/**
* <p>
@@ -44,6 +45,7 @@ public class DgArchivesDestructionDetailVO implements Serializable {
* 发起日期
*/
@ApiModelProperty(name = "fqrq", value = "发起日期")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date fqrq;
/**
@@ -74,6 +76,7 @@ public class DgArchivesDestructionDetailVO implements Serializable {
* 销毁日期
*/
@ApiModelProperty(name = "xhrq", value = "销毁日期")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date xhrq;
diff --git a/src/main/java/com/pashanhoo/destroy/entity/vo/DgArchivesDestructionListVO.java b/src/main/java/com/pashanhoo/destroy/entity/vo/DgArchivesDestructionListVO.java
index 82bee93..521bfec 100644
--- a/src/main/java/com/pashanhoo/destroy/entity/vo/DgArchivesDestructionListVO.java
+++ b/src/main/java/com/pashanhoo/destroy/entity/vo/DgArchivesDestructionListVO.java
@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
/**
* <p>
@@ -44,6 +45,7 @@ public class DgArchivesDestructionListVO implements Serializable {
* 发起日期
*/
@ApiModelProperty(name = "fqrq", value = "发起日期")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date fqrq;
/**
@@ -74,6 +76,7 @@ public class DgArchivesDestructionListVO implements Serializable {
* 销毁日期
*/
@ApiModelProperty(name = "xhrq", value = "销毁日期")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date xhrq;
/**
* 数量（卷）
diff --git a/src/main/java/com/pashanhoo/destroy/entity/vo/DgArchivesDestructionSearchRequest.java b/src/main/java/com/pashanhoo/destroy/entity/vo/DgArchivesDestructionSearchRequest.java
index b1ceb9a..1360a0e 100644
--- a/src/main/java/com/pashanhoo/destroy/entity/vo/DgArchivesDestructionSearchRequest.java
+++ b/src/main/java/com/pashanhoo/destroy/entity/vo/DgArchivesDestructionSearchRequest.java
@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import com.pashanhoo.common.PageInfo;
+import org.springframework.format.annotation.DateTimeFormat;
/**
* <p>
@@ -39,6 +40,7 @@ public class DgArchivesDestructionSearchRequest extends PageInfo implements Seri
* 销毁日期
*/
@ApiModelProperty(name = "xhrq", value = "销毁日期")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date xhrq;
diff --git a/src/main/java/com/pashanhoo/destroy/entity/vo/UpdateDgArchivesDestructionRequest.java b/src/main/java/com/pashanhoo/destroy/entity/vo/UpdateDgArchivesDestructionRequest.java
index 522f97f..ef93133 100644
--- a/src/main/java/com/pashanhoo/destroy/entity/vo/UpdateDgArchivesDestructionRequest.java
+++ b/src/main/java/com/pashanhoo/destroy/entity/vo/UpdateDgArchivesDestructionRequest.java
@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
/**
* <p>
@@ -44,6 +45,7 @@ public class UpdateDgArchivesDestructionRequest implements Serializable {
* 发起日期
*/
@ApiModelProperty(name = "fqrq", value = "发起日期")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date fqrq;
/**
@@ -74,6 +76,7 @@ public class UpdateDgArchivesDestructionRequest implements Serializable {
* 销毁日期
*/
@ApiModelProperty(name = "xhrq", value = "销毁日期")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date xhrq;
diff --git a/src/main/java/com/pashanhoo/file/entity/vo/AddDgFileRequest.java b/src/main/java/com/pashanhoo/file/entity/vo/AddDgFileRequest.java
index dead8e7..963091f 100644
--- a/src/main/java/com/pashanhoo/file/entity/vo/AddDgFileRequest.java
+++ b/src/main/java/com/pashanhoo/file/entity/vo/AddDgFileRequest.java
@@ -49,8 +49,7 @@ public class AddDgFileRequest implements Serializable {
* 上传日期
*/
@ApiModelProperty(name = "scrq", value = "上传日期")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date scrq;
/**
diff --git a/src/main/java/com/pashanhoo/file/entity/vo/DgFileDetailVO.java b/src/main/java/com/pashanhoo/file/entity/vo/DgFileDetailVO.java
index ee65744..70ef0d6 100644
--- a/src/main/java/com/pashanhoo/file/entity/vo/DgFileDetailVO.java
+++ b/src/main/java/com/pashanhoo/file/entity/vo/DgFileDetailVO.java
@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
/**
* <p>
@@ -44,6 +45,7 @@ public class DgFileDetailVO implements Serializable {
* 上传日期
*/
@ApiModelProperty(name = "scrq", value = "上传日期")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date scrq;
/**
diff --git a/src/main/java/com/pashanhoo/file/entity/vo/DgFileListVO.java b/src/main/java/com/pashanhoo/file/entity/vo/DgFileListVO.java
index 8d74916..5cbd77c 100644
--- a/src/main/java/com/pashanhoo/file/entity/vo/DgFileListVO.java
+++ b/src/main/java/com/pashanhoo/file/entity/vo/DgFileListVO.java
@@ -47,8 +47,7 @@ public class DgFileListVO implements Serializable {
* 上传日期
*/
@ApiModelProperty(name = "scrq", value = "上传日期")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date scrq;
/**
diff --git a/src/main/java/com/pashanhoo/file/entity/vo/DgFileSearchRequest.java b/src/main/java/com/pashanhoo/file/entity/vo/DgFileSearchRequest.java
index 8e6560c..50953ad 100644
--- a/src/main/java/com/pashanhoo/file/entity/vo/DgFileSearchRequest.java
+++ b/src/main/java/com/pashanhoo/file/entity/vo/DgFileSearchRequest.java
@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import com.pashanhoo.common.PageInfo;
+import org.springframework.format.annotation.DateTimeFormat;
/**
* <p>
@@ -45,6 +46,7 @@ public class DgFileSearchRequest extends PageInfo implements Serializable {
* 上传日期
*/
@ApiModelProperty(name = "scrq", value = "上传日期")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date scrq;
/**
diff --git a/src/main/java/com/pashanhoo/file/entity/vo/UpdateDgFileRequest.java b/src/main/java/com/pashanhoo/file/entity/vo/UpdateDgFileRequest.java
index 1176a94..aa605c4 100644
--- a/src/main/java/com/pashanhoo/file/entity/vo/UpdateDgFileRequest.java
+++ b/src/main/java/com/pashanhoo/file/entity/vo/UpdateDgFileRequest.java
@@ -47,8 +47,7 @@ public class UpdateDgFileRequest implements Serializable {
* 上传日期
*/
@ApiModelProperty(name = "scrq", value = "上传日期")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date scrq;
/**
diff --git a/src/main/java/com/pashanhoo/lend/entity/vo/AddDgLendRequest.java b/src/main/java/com/pashanhoo/lend/entity/vo/AddDgLendRequest.java
index 0151aa2..030f9f2 100644
--- a/src/main/java/com/pashanhoo/lend/entity/vo/AddDgLendRequest.java
+++ b/src/main/java/com/pashanhoo/lend/entity/vo/AddDgLendRequest.java
@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
/**
* <p>
@@ -51,12 +52,14 @@ public class AddDgLendRequest implements Serializable {
* 借阅日期
*/
@ApiModelProperty(name = "jyrq", value = "借阅日期")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date jyrq;
/**
* 归还日期
*/
@ApiModelProperty(name = "ghrq", value = "归还日期")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date ghrq;
/**
@@ -93,6 +96,7 @@ public class AddDgLendRequest implements Serializable {
* 批准时间
*/
@ApiModelProperty(name = "pzsj", value = "批准时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date pzsj;
/**
* 归还人
diff --git a/src/main/java/com/pashanhoo/lend/entity/vo/DgLendListVO.java b/src/main/java/com/pashanhoo/lend/entity/vo/DgLendListVO.java
index 0d690c3..d250696 100644
--- a/src/main/java/com/pashanhoo/lend/entity/vo/DgLendListVO.java
+++ b/src/main/java/com/pashanhoo/lend/entity/vo/DgLendListVO.java
@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
/**
* <p>
@@ -57,12 +58,14 @@ public class DgLendListVO implements Serializable {
* 借阅日期
*/
@ApiModelProperty(name = "jyrq", value = "借阅日期")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date jyrq;
/**
* 归还日期
*/
@ApiModelProperty(name = "ghrq", value = "归还日期")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date ghrq;
/**
@@ -99,6 +102,7 @@ public class DgLendListVO implements Serializable {
* 批准时间
*/
@ApiModelProperty(name = "pzsj", value = "批准时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date pzsj;
diff --git a/src/main/java/com/pashanhoo/lend/entity/vo/UpdateDgLendRequest.java b/src/main/java/com/pashanhoo/lend/entity/vo/UpdateDgLendRequest.java
index 8178de8..bdbbb34 100644
--- a/src/main/java/com/pashanhoo/lend/entity/vo/UpdateDgLendRequest.java
+++ b/src/main/java/com/pashanhoo/lend/entity/vo/UpdateDgLendRequest.java
@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
/**
* <p>
@@ -56,12 +57,14 @@ public class UpdateDgLendRequest implements Serializable {
* 借阅日期
*/
@ApiModelProperty(name = "jyrq", value = "借阅日期")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date jyrq;
/**
* 归还日期
*/
@ApiModelProperty(name = "ghrq", value = "归还日期")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date ghrq;
/**
@@ -98,6 +101,7 @@ public class UpdateDgLendRequest implements Serializable {
* 批准时间
*/
@ApiModelProperty(name = "pzsj", value = "批准时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date pzsj;
/**
* 归还人
diff --git a/src/main/java/com/pashanhoo/modify/entity/vo/AddDgArchivesModifyRequest.java b/src/main/java/com/pashanhoo/modify/entity/vo/AddDgArchivesModifyRequest.java
index f1e0359..2f4d340 100644
--- a/src/main/java/com/pashanhoo/modify/entity/vo/AddDgArchivesModifyRequest.java
+++ b/src/main/java/com/pashanhoo/modify/entity/vo/AddDgArchivesModifyRequest.java
@@ -55,8 +55,7 @@ public class AddDgArchivesModifyRequest implements Serializable {
* 创建时间
*/
@ApiModelProperty(name="createTime" ,value = "创建时间")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
@@ -81,7 +80,6 @@ public class AddDgArchivesModifyRequest implements Serializable {
* 归档时间
*/
@ApiModelProperty(name = "gdsj", value = "归档时间")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date gdsj;
}
diff --git a/src/main/java/com/pashanhoo/modify/entity/vo/DgArchivesModifyDetailVO.java b/src/main/java/com/pashanhoo/modify/entity/vo/DgArchivesModifyDetailVO.java
index 10a8fc4..9c7adc2 100644
--- a/src/main/java/com/pashanhoo/modify/entity/vo/DgArchivesModifyDetailVO.java
+++ b/src/main/java/com/pashanhoo/modify/entity/vo/DgArchivesModifyDetailVO.java
@@ -59,8 +59,7 @@ public class DgArchivesModifyDetailVO implements Serializable {
* 创建时间
*/
@ApiModelProperty(name="createTime" ,value = "创建时间")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
@@ -85,7 +84,6 @@ public class DgArchivesModifyDetailVO implements Serializable {
* 归档时间
*/
@ApiModelProperty(name = "gdsj", value = "归档时间")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date gdsj;
}
diff --git a/src/main/java/com/pashanhoo/modify/entity/vo/DgArchivesModifySearchRequest.java b/src/main/java/com/pashanhoo/modify/entity/vo/DgArchivesModifySearchRequest.java
index 7e3bdba..b652014 100644
--- a/src/main/java/com/pashanhoo/modify/entity/vo/DgArchivesModifySearchRequest.java
+++ b/src/main/java/com/pashanhoo/modify/entity/vo/DgArchivesModifySearchRequest.java
@@ -44,15 +44,13 @@ public class DgArchivesModifySearchRequest extends PageInfo implements Serializa
* 修改起始时间
*/
@ApiModelProperty(name = "xgqssj", value = "修改起始时间")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date xgqssj;
/**
* 修改截止时间
*/
@ApiModelProperty(name = "xgjzsj", value = "修改截止时间")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date xgjzsj;
/**
* 档案号
diff --git a/src/main/java/com/pashanhoo/modify/entity/vo/UpdateDgArchivesModifyRequest.java b/src/main/java/com/pashanhoo/modify/entity/vo/UpdateDgArchivesModifyRequest.java
index 3332f46..10c673a 100644
--- a/src/main/java/com/pashanhoo/modify/entity/vo/UpdateDgArchivesModifyRequest.java
+++ b/src/main/java/com/pashanhoo/modify/entity/vo/UpdateDgArchivesModifyRequest.java
@@ -53,8 +53,7 @@ public class UpdateDgArchivesModifyRequest implements Serializable {
* 创建时间
*/
@ApiModelProperty(name="createTime" ,value = "创建时间")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
@@ -85,7 +84,6 @@ public class UpdateDgArchivesModifyRequest implements Serializable {
* 归档时间
*/
@ApiModelProperty(name = "gdsj", value = "归档时间")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date gdsj;
}
diff --git a/src/main/java/com/pashanhoo/receive/entity/vo/AddDgReceiveRequest.java b/src/main/java/com/pashanhoo/receive/entity/vo/AddDgReceiveRequest.java
index 4ddc077..f413046 100644
--- a/src/main/java/com/pashanhoo/receive/entity/vo/AddDgReceiveRequest.java
+++ b/src/main/java/com/pashanhoo/receive/entity/vo/AddDgReceiveRequest.java
@@ -12,6 +12,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotEmpty;
@@ -63,6 +64,7 @@ public class AddDgReceiveRequest implements Serializable {
*/
@NotEmpty(message = "收件时间【sjsj】不能为空")
@ApiModelProperty(name = "sjsj", value = "收件时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date sjsj;
/**
* 业务号
@@ -81,7 +83,7 @@ public class AddDgReceiveRequest implements Serializable {
*/
@NotEmpty(message = "单元总数【dyzs】不能为空")
@ApiModelProperty(name = "dyzs", value = "单元总数")
- private BigDecimal dyzs;
+ private Integer dyzs;
/**
* 不动产权证号
*/
@@ -116,12 +118,14 @@ public class AddDgReceiveRequest implements Serializable {
*/
@NotEmpty(message = "登记时间【djsj】不能为空")
@ApiModelProperty(name = "djsj", value = "登记时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date djsj;
/**
* 接收时间
*/
@NotEmpty(message = "接收时间【jssj】不能为空")
@ApiModelProperty(name = "jssj", value = "接收时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date jssj;
/**
* 推送机构编码
diff --git a/src/main/java/com/pashanhoo/receive/entity/vo/DgReceiveDetailVO.java b/src/main/java/com/pashanhoo/receive/entity/vo/DgReceiveDetailVO.java
index fdbb625..5f334d2 100644
--- a/src/main/java/com/pashanhoo/receive/entity/vo/DgReceiveDetailVO.java
+++ b/src/main/java/com/pashanhoo/receive/entity/vo/DgReceiveDetailVO.java
@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
/**
* <p>
@@ -57,6 +58,7 @@ public class DgReceiveDetailVO implements Serializable {
* 收件时间
*/
@ApiModelProperty(name = "sjsj", value = "收件时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date sjsj;
/**
@@ -75,7 +77,7 @@ public class DgReceiveDetailVO implements Serializable {
* 单元总数
*/
@ApiModelProperty(name = "dyzs", value = "单元总数")
- private BigDecimal dyzs;
+ private Integer dyzs;
/**
* 不动产权证号
@@ -111,12 +113,14 @@ public class DgReceiveDetailVO implements Serializable {
* 登记时间
*/
@ApiModelProperty(name = "djsj", value = "登记时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date djsj;
/**
* 接收时间
*/
@ApiModelProperty(name = "jssj", value = "接收时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date jssj;
/**
@@ -135,6 +139,7 @@ public class DgReceiveDetailVO implements Serializable {
* 归档时间
*/
@ApiModelProperty(name = "gdsj", value = "归档时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date gdsj;
/**
diff --git a/src/main/java/com/pashanhoo/receive/entity/vo/DgReceiveListVO.java b/src/main/java/com/pashanhoo/receive/entity/vo/DgReceiveListVO.java
index 9e9c563..e16b5f4 100644
--- a/src/main/java/com/pashanhoo/receive/entity/vo/DgReceiveListVO.java
+++ b/src/main/java/com/pashanhoo/receive/entity/vo/DgReceiveListVO.java
@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
/**
* <p>
@@ -58,6 +59,7 @@ public class DgReceiveListVO implements Serializable {
* 收件时间
*/
@ApiModelProperty(name = "sjsj", value = "收件时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date sjsj;
/**
@@ -76,7 +78,7 @@ public class DgReceiveListVO implements Serializable {
* 单元总数
*/
@ApiModelProperty(name = "dyzs", value = "单元总数")
- private BigDecimal dyzs;
+ private Integer dyzs;
/**
* 不动产权证号
@@ -112,12 +114,14 @@ public class DgReceiveListVO implements Serializable {
* 登记时间
*/
@ApiModelProperty(name = "djsj", value = "登记时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date djsj;
/**
* 接收时间
*/
@ApiModelProperty(name = "jssj", value = "接收时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date jssj;
/**
@@ -136,6 +140,7 @@ public class DgReceiveListVO implements Serializable {
* 归档时间
*/
@ApiModelProperty(name = "gdsj", value = "归档时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date gdsj;
/**
diff --git a/src/main/java/com/pashanhoo/receive/entity/vo/UpdateDgReceiveRequest.java b/src/main/java/com/pashanhoo/receive/entity/vo/UpdateDgReceiveRequest.java
index 72e822c..b024095 100644
--- a/src/main/java/com/pashanhoo/receive/entity/vo/UpdateDgReceiveRequest.java
+++ b/src/main/java/com/pashanhoo/receive/entity/vo/UpdateDgReceiveRequest.java
@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
/**
* <p>
@@ -57,6 +58,7 @@ public class UpdateDgReceiveRequest implements Serializable {
* 收件时间
*/
@ApiModelProperty(name = "sjsj", value = "收件时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date sjsj;
/**
@@ -75,7 +77,7 @@ public class UpdateDgReceiveRequest implements Serializable {
* 单元总数
*/
@ApiModelProperty(name = "dyzs", value = "单元总数")
- private BigDecimal dyzs;
+ private Integer dyzs;
/**
* 不动产权证号
@@ -111,12 +113,14 @@ public class UpdateDgReceiveRequest implements Serializable {
* 登记时间
*/
@ApiModelProperty(name = "djsj", value = "登记时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date djsj;
/**
* 接收时间
*/
@ApiModelProperty(name = "jssj", value = "接收时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date jssj;
/**
@@ -135,6 +139,7 @@ public class UpdateDgReceiveRequest implements Serializable {
* 归档时间
*/
@ApiModelProperty(name = "gdsj", value = "归档时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date gdsj;
/**
diff --git a/src/main/java/com/pashanhoo/replenish/entity/vo/DgArchivesReplenishDetailVO.java b/src/main/java/com/pashanhoo/replenish/entity/vo/DgArchivesReplenishDetailVO.java
index 349b0fc..3f5e677 100644
--- a/src/main/java/com/pashanhoo/replenish/entity/vo/DgArchivesReplenishDetailVO.java
+++ b/src/main/java/com/pashanhoo/replenish/entity/vo/DgArchivesReplenishDetailVO.java
@@ -54,8 +54,7 @@ public class DgArchivesReplenishDetailVO implements Serializable {
* 创建时间
*/
@ApiModelProperty(name = "createTime", value = "创建时间")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
@@ -67,16 +66,13 @@ public class DgArchivesReplenishDetailVO implements Serializable {
/**
* 状态1:补录中,2:已归档
*/
- @TableField("STATE")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @ApiModelProperty(name = "state", value = "状态1:补录中,2:已归档")
private String state;
/**
* 归档时间
*/
- @TableField("GDSJ")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @ApiModelProperty(name = "gdsj", value = "归档时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date gdsj;
}
diff --git a/src/main/java/com/pashanhoo/replenish/entity/vo/DgArchivesReplenishListVO.java b/src/main/java/com/pashanhoo/replenish/entity/vo/DgArchivesReplenishListVO.java
index fa45f10..1297582 100644
--- a/src/main/java/com/pashanhoo/replenish/entity/vo/DgArchivesReplenishListVO.java
+++ b/src/main/java/com/pashanhoo/replenish/entity/vo/DgArchivesReplenishListVO.java
@@ -91,7 +91,6 @@ public class DgArchivesReplenishListVO implements Serializable {
*/
@ApiModelProperty(name = "createTime", value = "创建时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
/**
@@ -117,6 +116,5 @@ public class DgArchivesReplenishListVO implements Serializable {
*/
@TableField("GDSJ")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date gdsj;
}
diff --git a/src/main/java/com/pashanhoo/replenish/entity/vo/DgArchivesReplenishSearchRequest.java b/src/main/java/com/pashanhoo/replenish/entity/vo/DgArchivesReplenishSearchRequest.java
index 076bfcd..cedafad 100644
--- a/src/main/java/com/pashanhoo/replenish/entity/vo/DgArchivesReplenishSearchRequest.java
+++ b/src/main/java/com/pashanhoo/replenish/entity/vo/DgArchivesReplenishSearchRequest.java
@@ -55,21 +55,19 @@ public class DgArchivesReplenishSearchRequest extends PageInfo implements Serial
* 创建时间
*/
@ApiModelProperty(name = "createTime", value = "创建时间")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
* 状态1:补录中,2:已归档
*/
- @TableField("STATE")
+ @ApiModelProperty(name = "state", value = "状态1:补录中,2:已归档")
private String state;
/**
* 归档时间
*/
- @TableField("GDSJ")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @ApiModelProperty(name = "gdsj", value = "归档时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date gdsj;
}
--
libgit2 0.24.0