Skip to content

荆蔚杰 / java.archive

Go to a project
Toggle navigation
Toggle navigation pinning
8596309f by 荆蔚杰
Options

字段添加.时间格式统一

1 parent e637195e
Inline Side-by-side
Showing 29 changed files with 80 additions and 46 deletions
...@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModel; ...@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModel;
8 import io.swagger.annotations.ApiModelProperty; 8 import io.swagger.annotations.ApiModelProperty;
9 import lombok.Data; 9 import lombok.Data;
10 import lombok.EqualsAndHashCode; 10 import lombok.EqualsAndHashCode;
11 import org.springframework.format.annotation.DateTimeFormat;
11 12
12 import javax.validation.constraints.NotEmpty; 13 import javax.validation.constraints.NotEmpty;
13 14
...@@ -82,6 +83,7 @@ public class AddDgBusinessRequest implements Serializable { ...@@ -82,6 +83,7 @@ public class AddDgBusinessRequest implements Serializable {
82 */ 83 */
83 @NotEmpty(message = "收件时间【sjsj】不能为空") 84 @NotEmpty(message = "收件时间【sjsj】不能为空")
84 @ApiModelProperty(name = "sjsj", value = "收件时间") 85 @ApiModelProperty(name = "sjsj", value = "收件时间")
86 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
85 private Date sjsj; 87 private Date sjsj;
86 88
87 /** 89 /**
......
...@@ -78,8 +78,7 @@ public class DgBusinessDetailVO implements Serializable { ...@@ -78,8 +78,7 @@ public class DgBusinessDetailVO implements Serializable {
78 * 收件时间 78 * 收件时间
79 */ 79 */
80 @ApiModelProperty(name = "sjsj", value = "收件时间") 80 @ApiModelProperty(name = "sjsj", value = "收件时间")
81 @DateTimeFormat(pattern = "yyyy-MM-dd") 81 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
82 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
83 private Date sjsj; 82 private Date sjsj;
84 83
85 /** 84 /**
......
...@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModel; ...@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModel;
7 import io.swagger.annotations.ApiModelProperty; 7 import io.swagger.annotations.ApiModelProperty;
8 import lombok.Data; 8 import lombok.Data;
9 import lombok.EqualsAndHashCode; 9 import lombok.EqualsAndHashCode;
10 import org.springframework.format.annotation.DateTimeFormat;
10 11
11 /** 12 /**
12 * <p> 13 * <p>
...@@ -77,6 +78,7 @@ public class DgBusinessListVO implements Serializable { ...@@ -77,6 +78,7 @@ public class DgBusinessListVO implements Serializable {
77 * 收件时间 78 * 收件时间
78 */ 79 */
79 @ApiModelProperty(name = "sjsj", value = "收件时间") 80 @ApiModelProperty(name = "sjsj", value = "收件时间")
81 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
80 private Date sjsj; 82 private Date sjsj;
81 83
82 /** 84 /**
......
...@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty; ...@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
8 import lombok.Data; 8 import lombok.Data;
9 import lombok.EqualsAndHashCode; 9 import lombok.EqualsAndHashCode;
10 import com.pashanhoo.common.PageInfo; 10 import com.pashanhoo.common.PageInfo;
11 import org.springframework.format.annotation.DateTimeFormat;
11 12
12 /** 13 /**
13 * <p> 14 * <p>
...@@ -92,6 +93,7 @@ public class DgBusinessSearchRequest extends PageInfo implements Serializable { ...@@ -92,6 +93,7 @@ public class DgBusinessSearchRequest extends PageInfo implements Serializable {
92 * 收件时间 93 * 收件时间
93 */ 94 */
94 @ApiModelProperty(name = "sjsj", value = "收件时间") 95 @ApiModelProperty(name = "sjsj", value = "收件时间")
96 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
95 private Date sjsj; 97 private Date sjsj;
96 98
97 /** 99 /**
......
...@@ -78,8 +78,7 @@ public class UpdateDgBusinessRequest implements Serializable { ...@@ -78,8 +78,7 @@ public class UpdateDgBusinessRequest implements Serializable {
78 * 收件时间 78 * 收件时间
79 */ 79 */
80 @ApiModelProperty(name = "sjsj", value = "收件时间") 80 @ApiModelProperty(name = "sjsj", value = "收件时间")
81 @DateTimeFormat(pattern = "yyyy-MM-dd") 81 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
82 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
83 private Date sjsj; 82 private Date sjsj;
84 83
85 /** 84 /**
......
...@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel; ...@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
6 import io.swagger.annotations.ApiModelProperty; 6 import io.swagger.annotations.ApiModelProperty;
7 import lombok.Data; 7 import lombok.Data;
8 import lombok.EqualsAndHashCode; 8 import lombok.EqualsAndHashCode;
9 import org.springframework.format.annotation.DateTimeFormat;
9 10
10 /** 11 /**
11 * <p> 12 * <p>
...@@ -39,6 +40,7 @@ public class AddDgArchivesDestructionRequest implements Serializable { ...@@ -39,6 +40,7 @@ public class AddDgArchivesDestructionRequest implements Serializable {
39 * 发起日期 40 * 发起日期
40 */ 41 */
41 @ApiModelProperty(name = "fqrq", value = "发起日期") 42 @ApiModelProperty(name = "fqrq", value = "发起日期")
43 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
42 private Date fqrq; 44 private Date fqrq;
43 45
44 /** 46 /**
...@@ -69,6 +71,7 @@ public class AddDgArchivesDestructionRequest implements Serializable { ...@@ -69,6 +71,7 @@ public class AddDgArchivesDestructionRequest implements Serializable {
69 * 销毁日期 71 * 销毁日期
70 */ 72 */
71 @ApiModelProperty(name = "xhrq", value = "销毁日期") 73 @ApiModelProperty(name = "xhrq", value = "销毁日期")
74 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
72 private Date xhrq; 75 private Date xhrq;
73 76
74 77
......
...@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel; ...@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
6 import io.swagger.annotations.ApiModelProperty; 6 import io.swagger.annotations.ApiModelProperty;
7 import lombok.Data; 7 import lombok.Data;
8 import lombok.EqualsAndHashCode; 8 import lombok.EqualsAndHashCode;
9 import org.springframework.format.annotation.DateTimeFormat;
9 10
10 /** 11 /**
11 * <p> 12 * <p>
...@@ -44,6 +45,7 @@ public class DgArchivesDestructionDetailVO implements Serializable { ...@@ -44,6 +45,7 @@ public class DgArchivesDestructionDetailVO implements Serializable {
44 * 发起日期 45 * 发起日期
45 */ 46 */
46 @ApiModelProperty(name = "fqrq", value = "发起日期") 47 @ApiModelProperty(name = "fqrq", value = "发起日期")
48 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
47 private Date fqrq; 49 private Date fqrq;
48 50
49 /** 51 /**
...@@ -74,6 +76,7 @@ public class DgArchivesDestructionDetailVO implements Serializable { ...@@ -74,6 +76,7 @@ public class DgArchivesDestructionDetailVO implements Serializable {
74 * 销毁日期 76 * 销毁日期
75 */ 77 */
76 @ApiModelProperty(name = "xhrq", value = "销毁日期") 78 @ApiModelProperty(name = "xhrq", value = "销毁日期")
79 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
77 private Date xhrq; 80 private Date xhrq;
78 81
79 82
......
...@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel; ...@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
6 import io.swagger.annotations.ApiModelProperty; 6 import io.swagger.annotations.ApiModelProperty;
7 import lombok.Data; 7 import lombok.Data;
8 import lombok.EqualsAndHashCode; 8 import lombok.EqualsAndHashCode;
9 import org.springframework.format.annotation.DateTimeFormat;
9 10
10 /** 11 /**
11 * <p> 12 * <p>
...@@ -44,6 +45,7 @@ public class DgArchivesDestructionListVO implements Serializable { ...@@ -44,6 +45,7 @@ public class DgArchivesDestructionListVO implements Serializable {
44 * 发起日期 45 * 发起日期
45 */ 46 */
46 @ApiModelProperty(name = "fqrq", value = "发起日期") 47 @ApiModelProperty(name = "fqrq", value = "发起日期")
48 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
47 private Date fqrq; 49 private Date fqrq;
48 50
49 /** 51 /**
...@@ -74,6 +76,7 @@ public class DgArchivesDestructionListVO implements Serializable { ...@@ -74,6 +76,7 @@ public class DgArchivesDestructionListVO implements Serializable {
74 * 销毁日期 76 * 销毁日期
75 */ 77 */
76 @ApiModelProperty(name = "xhrq", value = "销毁日期") 78 @ApiModelProperty(name = "xhrq", value = "销毁日期")
79 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
77 private Date xhrq; 80 private Date xhrq;
78 /** 81 /**
79 * 数量（卷） 82 * 数量（卷）
......
...@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty; ...@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
7 import lombok.Data; 7 import lombok.Data;
8 import lombok.EqualsAndHashCode; 8 import lombok.EqualsAndHashCode;
9 import com.pashanhoo.common.PageInfo; 9 import com.pashanhoo.common.PageInfo;
10 import org.springframework.format.annotation.DateTimeFormat;
10 11
11 /** 12 /**
12 * <p> 13 * <p>
...@@ -39,6 +40,7 @@ public class DgArchivesDestructionSearchRequest extends PageInfo implements Seri ...@@ -39,6 +40,7 @@ public class DgArchivesDestructionSearchRequest extends PageInfo implements Seri
39 * 销毁日期 40 * 销毁日期
40 */ 41 */
41 @ApiModelProperty(name = "xhrq", value = "销毁日期") 42 @ApiModelProperty(name = "xhrq", value = "销毁日期")
43 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
42 private Date xhrq; 44 private Date xhrq;
43 45
44 46
......
...@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel; ...@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
6 import io.swagger.annotations.ApiModelProperty; 6 import io.swagger.annotations.ApiModelProperty;
7 import lombok.Data; 7 import lombok.Data;
8 import lombok.EqualsAndHashCode; 8 import lombok.EqualsAndHashCode;
9 import org.springframework.format.annotation.DateTimeFormat;
9 10
10 /** 11 /**
11 * <p> 12 * <p>
...@@ -44,6 +45,7 @@ public class UpdateDgArchivesDestructionRequest implements Serializable { ...@@ -44,6 +45,7 @@ public class UpdateDgArchivesDestructionRequest implements Serializable {
44 * 发起日期 45 * 发起日期
45 */ 46 */
46 @ApiModelProperty(name = "fqrq", value = "发起日期") 47 @ApiModelProperty(name = "fqrq", value = "发起日期")
48 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
47 private Date fqrq; 49 private Date fqrq;
48 50
49 /** 51 /**
...@@ -74,6 +76,7 @@ public class UpdateDgArchivesDestructionRequest implements Serializable { ...@@ -74,6 +76,7 @@ public class UpdateDgArchivesDestructionRequest implements Serializable {
74 * 销毁日期 76 * 销毁日期
75 */ 77 */
76 @ApiModelProperty(name = "xhrq", value = "销毁日期") 78 @ApiModelProperty(name = "xhrq", value = "销毁日期")
79 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
77 private Date xhrq; 80 private Date xhrq;
78 81
79 82
......
...@@ -49,8 +49,7 @@ public class AddDgFileRequest implements Serializable { ...@@ -49,8 +49,7 @@ public class AddDgFileRequest implements Serializable {
49 * 上传日期 49 * 上传日期
50 */ 50 */
51 @ApiModelProperty(name = "scrq", value = "上传日期") 51 @ApiModelProperty(name = "scrq", value = "上传日期")
52 @DateTimeFormat(pattern = "yyyy-MM-dd") 52 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
53 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
54 private Date scrq; 53 private Date scrq;
55 54
56 /** 55 /**
......
...@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel; ...@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
6 import io.swagger.annotations.ApiModelProperty; 6 import io.swagger.annotations.ApiModelProperty;
7 import lombok.Data; 7 import lombok.Data;
8 import lombok.EqualsAndHashCode; 8 import lombok.EqualsAndHashCode;
9 import org.springframework.format.annotation.DateTimeFormat;
9 10
10 /** 11 /**
11 * <p> 12 * <p>
...@@ -44,6 +45,7 @@ public class DgFileDetailVO implements Serializable { ...@@ -44,6 +45,7 @@ public class DgFileDetailVO implements Serializable {
44 * 上传日期 45 * 上传日期
45 */ 46 */
46 @ApiModelProperty(name = "scrq", value = "上传日期") 47 @ApiModelProperty(name = "scrq", value = "上传日期")
48 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
47 private Date scrq; 49 private Date scrq;
48 50
49 /** 51 /**
......
...@@ -47,8 +47,7 @@ public class DgFileListVO implements Serializable { ...@@ -47,8 +47,7 @@ public class DgFileListVO implements Serializable {
47 * 上传日期 47 * 上传日期
48 */ 48 */
49 @ApiModelProperty(name = "scrq", value = "上传日期") 49 @ApiModelProperty(name = "scrq", value = "上传日期")
50 @DateTimeFormat(pattern = "yyyy-MM-dd") 50 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
51 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
52 private Date scrq; 51 private Date scrq;
53 52
54 /** 53 /**
......
...@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty; ...@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
7 import lombok.Data; 7 import lombok.Data;
8 import lombok.EqualsAndHashCode; 8 import lombok.EqualsAndHashCode;
9 import com.pashanhoo.common.PageInfo; 9 import com.pashanhoo.common.PageInfo;
10 import org.springframework.format.annotation.DateTimeFormat;
10 11
11 /** 12 /**
12 * <p> 13 * <p>
...@@ -45,6 +46,7 @@ public class DgFileSearchRequest extends PageInfo implements Serializable { ...@@ -45,6 +46,7 @@ public class DgFileSearchRequest extends PageInfo implements Serializable {
45 * 上传日期 46 * 上传日期
46 */ 47 */
47 @ApiModelProperty(name = "scrq", value = "上传日期") 48 @ApiModelProperty(name = "scrq", value = "上传日期")
49 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
48 private Date scrq; 50 private Date scrq;
49 51
50 /** 52 /**
......
...@@ -47,8 +47,7 @@ public class UpdateDgFileRequest implements Serializable { ...@@ -47,8 +47,7 @@ public class UpdateDgFileRequest implements Serializable {
47 * 上传日期 47 * 上传日期
48 */ 48 */
49 @ApiModelProperty(name = "scrq", value = "上传日期") 49 @ApiModelProperty(name = "scrq", value = "上传日期")
50 @DateTimeFormat(pattern = "yyyy-MM-dd") 50 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
51 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
52 private Date scrq; 51 private Date scrq;
53 52
54 /** 53 /**
......
...@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel; ...@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
6 import io.swagger.annotations.ApiModelProperty; 6 import io.swagger.annotations.ApiModelProperty;
7 import lombok.Data; 7 import lombok.Data;
8 import lombok.EqualsAndHashCode; 8 import lombok.EqualsAndHashCode;
9 import org.springframework.format.annotation.DateTimeFormat;
9 10
10 /** 11 /**
11 * <p> 12 * <p>
...@@ -51,12 +52,14 @@ public class AddDgLendRequest implements Serializable { ...@@ -51,12 +52,14 @@ public class AddDgLendRequest implements Serializable {
51 * 借阅日期 52 * 借阅日期
52 */ 53 */
53 @ApiModelProperty(name = "jyrq", value = "借阅日期") 54 @ApiModelProperty(name = "jyrq", value = "借阅日期")
55 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
54 private Date jyrq; 56 private Date jyrq;
55 57
56 /** 58 /**
57 * 归还日期 59 * 归还日期
58 */ 60 */
59 @ApiModelProperty(name = "ghrq", value = "归还日期") 61 @ApiModelProperty(name = "ghrq", value = "归还日期")
62 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
60 private Date ghrq; 63 private Date ghrq;
61 64
62 /** 65 /**
...@@ -93,6 +96,7 @@ public class AddDgLendRequest implements Serializable { ...@@ -93,6 +96,7 @@ public class AddDgLendRequest implements Serializable {
93 * 批准时间 96 * 批准时间
94 */ 97 */
95 @ApiModelProperty(name = "pzsj", value = "批准时间") 98 @ApiModelProperty(name = "pzsj", value = "批准时间")
99 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
96 private Date pzsj; 100 private Date pzsj;
97 /** 101 /**
98 * 归还人 102 * 归还人
......
...@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel; ...@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
6 import io.swagger.annotations.ApiModelProperty; 6 import io.swagger.annotations.ApiModelProperty;
7 import lombok.Data; 7 import lombok.Data;
8 import lombok.EqualsAndHashCode; 8 import lombok.EqualsAndHashCode;
9 import org.springframework.format.annotation.DateTimeFormat;
9 10
10 /** 11 /**
11 * <p> 12 * <p>
...@@ -57,12 +58,14 @@ public class DgLendListVO implements Serializable { ...@@ -57,12 +58,14 @@ public class DgLendListVO implements Serializable {
57 * 借阅日期 58 * 借阅日期
58 */ 59 */
59 @ApiModelProperty(name = "jyrq", value = "借阅日期") 60 @ApiModelProperty(name = "jyrq", value = "借阅日期")
61 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
60 private Date jyrq; 62 private Date jyrq;
61 63
62 /** 64 /**
63 * 归还日期 65 * 归还日期
64 */ 66 */
65 @ApiModelProperty(name = "ghrq", value = "归还日期") 67 @ApiModelProperty(name = "ghrq", value = "归还日期")
68 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
66 private Date ghrq; 69 private Date ghrq;
67 70
68 /** 71 /**
...@@ -99,6 +102,7 @@ public class DgLendListVO implements Serializable { ...@@ -99,6 +102,7 @@ public class DgLendListVO implements Serializable {
99 * 批准时间 102 * 批准时间
100 */ 103 */
101 @ApiModelProperty(name = "pzsj", value = "批准时间") 104 @ApiModelProperty(name = "pzsj", value = "批准时间")
105 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
102 private Date pzsj; 106 private Date pzsj;
103 107
104 108
......
...@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel; ...@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
6 import io.swagger.annotations.ApiModelProperty; 6 import io.swagger.annotations.ApiModelProperty;
7 import lombok.Data; 7 import lombok.Data;
8 import lombok.EqualsAndHashCode; 8 import lombok.EqualsAndHashCode;
9 import org.springframework.format.annotation.DateTimeFormat;
9 10
10 /** 11 /**
11 * <p> 12 * <p>
...@@ -56,12 +57,14 @@ public class UpdateDgLendRequest implements Serializable { ...@@ -56,12 +57,14 @@ public class UpdateDgLendRequest implements Serializable {
56 * 借阅日期 57 * 借阅日期
57 */ 58 */
58 @ApiModelProperty(name = "jyrq", value = "借阅日期") 59 @ApiModelProperty(name = "jyrq", value = "借阅日期")
60 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
59 private Date jyrq; 61 private Date jyrq;
60 62
61 /** 63 /**
62 * 归还日期 64 * 归还日期
63 */ 65 */
64 @ApiModelProperty(name = "ghrq", value = "归还日期") 66 @ApiModelProperty(name = "ghrq", value = "归还日期")
67 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
65 private Date ghrq; 68 private Date ghrq;
66 69
67 /** 70 /**
...@@ -98,6 +101,7 @@ public class UpdateDgLendRequest implements Serializable { ...@@ -98,6 +101,7 @@ public class UpdateDgLendRequest implements Serializable {
98 * 批准时间 101 * 批准时间
99 */ 102 */
100 @ApiModelProperty(name = "pzsj", value = "批准时间") 103 @ApiModelProperty(name = "pzsj", value = "批准时间")
104 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
101 private Date pzsj; 105 private Date pzsj;
102 /** 106 /**
103 * 归还人 107 * 归还人
......
...@@ -55,8 +55,7 @@ public class AddDgArchivesModifyRequest implements Serializable { ...@@ -55,8 +55,7 @@ public class AddDgArchivesModifyRequest implements Serializable {
55 * 创建时间 55 * 创建时间
56 */ 56 */
57 @ApiModelProperty(name="createTime" ,value = "创建时间") 57 @ApiModelProperty(name="createTime" ,value = "创建时间")
58 @DateTimeFormat(pattern = "yyyy-MM-dd") 58 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
59 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
60 private Date createTime; 59 private Date createTime;
61 60
62 /** 61 /**
...@@ -81,7 +80,6 @@ public class AddDgArchivesModifyRequest implements Serializable { ...@@ -81,7 +80,6 @@ public class AddDgArchivesModifyRequest implements Serializable {
81 * 归档时间 80 * 归档时间
82 */ 81 */
83 @ApiModelProperty(name = "gdsj", value = "归档时间") 82 @ApiModelProperty(name = "gdsj", value = "归档时间")
84 @DateTimeFormat(pattern = "yyyy-MM-dd") 83 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
85 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
86 private Date gdsj; 84 private Date gdsj;
87 } 85 }
......
...@@ -59,8 +59,7 @@ public class DgArchivesModifyDetailVO implements Serializable { ...@@ -59,8 +59,7 @@ public class DgArchivesModifyDetailVO implements Serializable {
59 * 创建时间 59 * 创建时间
60 */ 60 */
61 @ApiModelProperty(name="createTime" ,value = "创建时间") 61 @ApiModelProperty(name="createTime" ,value = "创建时间")
62 @DateTimeFormat(pattern = "yyyy-MM-dd") 62 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
63 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
64 private Date createTime; 63 private Date createTime;
65 64
66 /** 65 /**
...@@ -85,7 +84,6 @@ public class DgArchivesModifyDetailVO implements Serializable { ...@@ -85,7 +84,6 @@ public class DgArchivesModifyDetailVO implements Serializable {
85 * 归档时间 84 * 归档时间
86 */ 85 */
87 @ApiModelProperty(name = "gdsj", value = "归档时间") 86 @ApiModelProperty(name = "gdsj", value = "归档时间")
88 @DateTimeFormat(pattern = "yyyy-MM-dd") 87 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
89 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
90 private Date gdsj; 88 private Date gdsj;
91 } 89 }
......
...@@ -44,15 +44,13 @@ public class DgArchivesModifySearchRequest extends PageInfo implements Serializa ...@@ -44,15 +44,13 @@ public class DgArchivesModifySearchRequest extends PageInfo implements Serializa
44 * 修改起始时间 44 * 修改起始时间
45 */ 45 */
46 @ApiModelProperty(name = "xgqssj", value = "修改起始时间") 46 @ApiModelProperty(name = "xgqssj", value = "修改起始时间")
47 @DateTimeFormat(pattern = "yyyy-MM-dd") 47 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
48 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
49 private Date xgqssj; 48 private Date xgqssj;
50 /** 49 /**
51 * 修改截止时间 50 * 修改截止时间
52 */ 51 */
53 @ApiModelProperty(name = "xgjzsj", value = "修改截止时间") 52 @ApiModelProperty(name = "xgjzsj", value = "修改截止时间")
54 @DateTimeFormat(pattern = "yyyy-MM-dd") 53 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
55 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
56 private Date xgjzsj; 54 private Date xgjzsj;
57 /** 55 /**
58 * 档案号 56 * 档案号
......
...@@ -53,8 +53,7 @@ public class UpdateDgArchivesModifyRequest implements Serializable { ...@@ -53,8 +53,7 @@ public class UpdateDgArchivesModifyRequest implements Serializable {
53 * 创建时间 53 * 创建时间
54 */ 54 */
55 @ApiModelProperty(name="createTime" ,value = "创建时间") 55 @ApiModelProperty(name="createTime" ,value = "创建时间")
56 @DateTimeFormat(pattern = "yyyy-MM-dd") 56 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
57 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
58 private Date createTime; 57 private Date createTime;
59 58
60 /** 59 /**
...@@ -85,7 +84,6 @@ public class UpdateDgArchivesModifyRequest implements Serializable { ...@@ -85,7 +84,6 @@ public class UpdateDgArchivesModifyRequest implements Serializable {
85 * 归档时间 84 * 归档时间
86 */ 85 */
87 @ApiModelProperty(name = "gdsj", value = "归档时间") 86 @ApiModelProperty(name = "gdsj", value = "归档时间")
88 @DateTimeFormat(pattern = "yyyy-MM-dd") 87 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
89 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
90 private Date gdsj; 88 private Date gdsj;
91 } 89 }
......
...@@ -12,6 +12,7 @@ import io.swagger.annotations.ApiModel; ...@@ -12,6 +12,7 @@ import io.swagger.annotations.ApiModel;
12 import io.swagger.annotations.ApiModelProperty; 12 import io.swagger.annotations.ApiModelProperty;
13 import lombok.Data; 13 import lombok.Data;
14 import lombok.EqualsAndHashCode; 14 import lombok.EqualsAndHashCode;
15 import org.springframework.format.annotation.DateTimeFormat;
15 16
16 import javax.validation.constraints.NotEmpty; 17 import javax.validation.constraints.NotEmpty;
17 18
...@@ -63,6 +64,7 @@ public class AddDgReceiveRequest implements Serializable { ...@@ -63,6 +64,7 @@ public class AddDgReceiveRequest implements Serializable {
63 */ 64 */
64 @NotEmpty(message = "收件时间【sjsj】不能为空") 65 @NotEmpty(message = "收件时间【sjsj】不能为空")
65 @ApiModelProperty(name = "sjsj", value = "收件时间") 66 @ApiModelProperty(name = "sjsj", value = "收件时间")
67 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
66 private Date sjsj; 68 private Date sjsj;
67 /** 69 /**
68 * 业务号 70 * 业务号
...@@ -81,7 +83,7 @@ public class AddDgReceiveRequest implements Serializable { ...@@ -81,7 +83,7 @@ public class AddDgReceiveRequest implements Serializable {
81 */ 83 */
82 @NotEmpty(message = "单元总数【dyzs】不能为空") 84 @NotEmpty(message = "单元总数【dyzs】不能为空")
83 @ApiModelProperty(name = "dyzs", value = "单元总数") 85 @ApiModelProperty(name = "dyzs", value = "单元总数")
84 private BigDecimal dyzs; 86 private Integer dyzs;
85 /** 87 /**
86 * 不动产权证号 88 * 不动产权证号
87 */ 89 */
...@@ -116,12 +118,14 @@ public class AddDgReceiveRequest implements Serializable { ...@@ -116,12 +118,14 @@ public class AddDgReceiveRequest implements Serializable {
116 */ 118 */
117 @NotEmpty(message = "登记时间【djsj】不能为空") 119 @NotEmpty(message = "登记时间【djsj】不能为空")
118 @ApiModelProperty(name = "djsj", value = "登记时间") 120 @ApiModelProperty(name = "djsj", value = "登记时间")
121 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
119 private Date djsj; 122 private Date djsj;
120 /** 123 /**
121 * 接收时间 124 * 接收时间
122 */ 125 */
123 @NotEmpty(message = "接收时间【jssj】不能为空") 126 @NotEmpty(message = "接收时间【jssj】不能为空")
124 @ApiModelProperty(name = "jssj", value = "接收时间") 127 @ApiModelProperty(name = "jssj", value = "接收时间")
128 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
125 private Date jssj; 129 private Date jssj;
126 /** 130 /**
127 * 推送机构编码 131 * 推送机构编码
......
...@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModel; ...@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModel;
7 import io.swagger.annotations.ApiModelProperty; 7 import io.swagger.annotations.ApiModelProperty;
8 import lombok.Data; 8 import lombok.Data;
9 import lombok.EqualsAndHashCode; 9 import lombok.EqualsAndHashCode;
10 import org.springframework.format.annotation.DateTimeFormat;
10 11
11 /** 12 /**
12 * <p> 13 * <p>
...@@ -57,6 +58,7 @@ public class DgReceiveDetailVO implements Serializable { ...@@ -57,6 +58,7 @@ public class DgReceiveDetailVO implements Serializable {
57 * 收件时间 58 * 收件时间
58 */ 59 */
59 @ApiModelProperty(name = "sjsj", value = "收件时间") 60 @ApiModelProperty(name = "sjsj", value = "收件时间")
61 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
60 private Date sjsj; 62 private Date sjsj;
61 63
62 /** 64 /**
...@@ -75,7 +77,7 @@ public class DgReceiveDetailVO implements Serializable { ...@@ -75,7 +77,7 @@ public class DgReceiveDetailVO implements Serializable {
75 * 单元总数 77 * 单元总数
76 */ 78 */
77 @ApiModelProperty(name = "dyzs", value = "单元总数") 79 @ApiModelProperty(name = "dyzs", value = "单元总数")
78 private BigDecimal dyzs; 80 private Integer dyzs;
79 81
80 /** 82 /**
81 * 不动产权证号 83 * 不动产权证号
...@@ -111,12 +113,14 @@ public class DgReceiveDetailVO implements Serializable { ...@@ -111,12 +113,14 @@ public class DgReceiveDetailVO implements Serializable {
111 * 登记时间 113 * 登记时间
112 */ 114 */
113 @ApiModelProperty(name = "djsj", value = "登记时间") 115 @ApiModelProperty(name = "djsj", value = "登记时间")
116 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
114 private Date djsj; 117 private Date djsj;
115 118
116 /** 119 /**
117 * 接收时间 120 * 接收时间
118 */ 121 */
119 @ApiModelProperty(name = "jssj", value = "接收时间") 122 @ApiModelProperty(name = "jssj", value = "接收时间")
123 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
120 private Date jssj; 124 private Date jssj;
121 125
122 /** 126 /**
...@@ -135,6 +139,7 @@ public class DgReceiveDetailVO implements Serializable { ...@@ -135,6 +139,7 @@ public class DgReceiveDetailVO implements Serializable {
135 * 归档时间 139 * 归档时间
136 */ 140 */
137 @ApiModelProperty(name = "gdsj", value = "归档时间") 141 @ApiModelProperty(name = "gdsj", value = "归档时间")
142 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
138 private Date gdsj; 143 private Date gdsj;
139 144
140 /** 145 /**
......
...@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModel; ...@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModel;
7 import io.swagger.annotations.ApiModelProperty; 7 import io.swagger.annotations.ApiModelProperty;
8 import lombok.Data; 8 import lombok.Data;
9 import lombok.EqualsAndHashCode; 9 import lombok.EqualsAndHashCode;
10 import org.springframework.format.annotation.DateTimeFormat;
10 11
11 /** 12 /**
12 * <p> 13 * <p>
...@@ -58,6 +59,7 @@ public class DgReceiveListVO implements Serializable { ...@@ -58,6 +59,7 @@ public class DgReceiveListVO implements Serializable {
58 * 收件时间 59 * 收件时间
59 */ 60 */
60 @ApiModelProperty(name = "sjsj", value = "收件时间") 61 @ApiModelProperty(name = "sjsj", value = "收件时间")
62 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
61 private Date sjsj; 63 private Date sjsj;
62 64
63 /** 65 /**
...@@ -76,7 +78,7 @@ public class DgReceiveListVO implements Serializable { ...@@ -76,7 +78,7 @@ public class DgReceiveListVO implements Serializable {
76 * 单元总数 78 * 单元总数
77 */ 79 */
78 @ApiModelProperty(name = "dyzs", value = "单元总数") 80 @ApiModelProperty(name = "dyzs", value = "单元总数")
79 private BigDecimal dyzs; 81 private Integer dyzs;
80 82
81 /** 83 /**
82 * 不动产权证号 84 * 不动产权证号
...@@ -112,12 +114,14 @@ public class DgReceiveListVO implements Serializable { ...@@ -112,12 +114,14 @@ public class DgReceiveListVO implements Serializable {
112 * 登记时间 114 * 登记时间
113 */ 115 */
114 @ApiModelProperty(name = "djsj", value = "登记时间") 116 @ApiModelProperty(name = "djsj", value = "登记时间")
117 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
115 private Date djsj; 118 private Date djsj;
116 119
117 /** 120 /**
118 * 接收时间 121 * 接收时间
119 */ 122 */
120 @ApiModelProperty(name = "jssj", value = "接收时间") 123 @ApiModelProperty(name = "jssj", value = "接收时间")
124 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
121 private Date jssj; 125 private Date jssj;
122 126
123 /** 127 /**
...@@ -136,6 +140,7 @@ public class DgReceiveListVO implements Serializable { ...@@ -136,6 +140,7 @@ public class DgReceiveListVO implements Serializable {
136 * 归档时间 140 * 归档时间
137 */ 141 */
138 @ApiModelProperty(name = "gdsj", value = "归档时间") 142 @ApiModelProperty(name = "gdsj", value = "归档时间")
143 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
139 private Date gdsj; 144 private Date gdsj;
140 145
141 /** 146 /**
......
...@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModel; ...@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModel;
7 import io.swagger.annotations.ApiModelProperty; 7 import io.swagger.annotations.ApiModelProperty;
8 import lombok.Data; 8 import lombok.Data;
9 import lombok.EqualsAndHashCode; 9 import lombok.EqualsAndHashCode;
10 import org.springframework.format.annotation.DateTimeFormat;
10 11
11 /** 12 /**
12 * <p> 13 * <p>
...@@ -57,6 +58,7 @@ public class UpdateDgReceiveRequest implements Serializable { ...@@ -57,6 +58,7 @@ public class UpdateDgReceiveRequest implements Serializable {
57 * 收件时间 58 * 收件时间
58 */ 59 */
59 @ApiModelProperty(name = "sjsj", value = "收件时间") 60 @ApiModelProperty(name = "sjsj", value = "收件时间")
61 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
60 private Date sjsj; 62 private Date sjsj;
61 63
62 /** 64 /**
...@@ -75,7 +77,7 @@ public class UpdateDgReceiveRequest implements Serializable { ...@@ -75,7 +77,7 @@ public class UpdateDgReceiveRequest implements Serializable {
75 * 单元总数 77 * 单元总数
76 */ 78 */
77 @ApiModelProperty(name = "dyzs", value = "单元总数") 79 @ApiModelProperty(name = "dyzs", value = "单元总数")
78 private BigDecimal dyzs; 80 private Integer dyzs;
79 81
80 /** 82 /**
81 * 不动产权证号 83 * 不动产权证号
...@@ -111,12 +113,14 @@ public class UpdateDgReceiveRequest implements Serializable { ...@@ -111,12 +113,14 @@ public class UpdateDgReceiveRequest implements Serializable {
111 * 登记时间 113 * 登记时间
112 */ 114 */
113 @ApiModelProperty(name = "djsj", value = "登记时间") 115 @ApiModelProperty(name = "djsj", value = "登记时间")
116 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
114 private Date djsj; 117 private Date djsj;
115 118
116 /** 119 /**
117 * 接收时间 120 * 接收时间
118 */ 121 */
119 @ApiModelProperty(name = "jssj", value = "接收时间") 122 @ApiModelProperty(name = "jssj", value = "接收时间")
123 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
120 private Date jssj; 124 private Date jssj;
121 125
122 /** 126 /**
...@@ -135,6 +139,7 @@ public class UpdateDgReceiveRequest implements Serializable { ...@@ -135,6 +139,7 @@ public class UpdateDgReceiveRequest implements Serializable {
135 * 归档时间 139 * 归档时间
136 */ 140 */
137 @ApiModelProperty(name = "gdsj", value = "归档时间") 141 @ApiModelProperty(name = "gdsj", value = "归档时间")
142 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
138 private Date gdsj; 143 private Date gdsj;
139 144
140 /** 145 /**
......
...@@ -54,8 +54,7 @@ public class DgArchivesReplenishDetailVO implements Serializable { ...@@ -54,8 +54,7 @@ public class DgArchivesReplenishDetailVO implements Serializable {
54 * 创建时间 54 * 创建时间
55 */ 55 */
56 @ApiModelProperty(name = "createTime", value = "创建时间") 56 @ApiModelProperty(name = "createTime", value = "创建时间")
57 @DateTimeFormat(pattern = "yyyy-MM-dd") 57 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
58 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
59 private Date createTime; 58 private Date createTime;
60 59
61 /** 60 /**
...@@ -67,16 +66,13 @@ public class DgArchivesReplenishDetailVO implements Serializable { ...@@ -67,16 +66,13 @@ public class DgArchivesReplenishDetailVO implements Serializable {
67 /** 66 /**
68 * 状态1:补录中,2:已归档 67 * 状态1:补录中,2:已归档
69 */ 68 */
70 @TableField("STATE") 69 @ApiModelProperty(name = "state", value = "状态1:补录中,2:已归档")
71 @DateTimeFormat(pattern = "yyyy-MM-dd")
72 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
73 private String state; 70 private String state;
74 71
75 /** 72 /**
76 * 归档时间 73 * 归档时间
77 */ 74 */
78 @TableField("GDSJ") 75 @ApiModelProperty(name = "gdsj", value = "归档时间")
79 @DateTimeFormat(pattern = "yyyy-MM-dd") 76 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
80 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
81 private Date gdsj; 77 private Date gdsj;
82 } 78 }
......
...@@ -91,7 +91,6 @@ public class DgArchivesReplenishListVO implements Serializable { ...@@ -91,7 +91,6 @@ public class DgArchivesReplenishListVO implements Serializable {
91 */ 91 */
92 @ApiModelProperty(name = "createTime", value = "创建时间") 92 @ApiModelProperty(name = "createTime", value = "创建时间")
93 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") 93 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
94 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
95 private Date createTime; 94 private Date createTime;
96 95
97 /** 96 /**
...@@ -117,6 +116,5 @@ public class DgArchivesReplenishListVO implements Serializable { ...@@ -117,6 +116,5 @@ public class DgArchivesReplenishListVO implements Serializable {
117 */ 116 */
118 @TableField("GDSJ") 117 @TableField("GDSJ")
119 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") 118 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
120 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
121 private Date gdsj; 119 private Date gdsj;
122 } 120 }
......
...@@ -55,21 +55,19 @@ public class DgArchivesReplenishSearchRequest extends PageInfo implements Serial ...@@ -55,21 +55,19 @@ public class DgArchivesReplenishSearchRequest extends PageInfo implements Serial
55 * 创建时间 55 * 创建时间
56 */ 56 */
57 @ApiModelProperty(name = "createTime", value = "创建时间") 57 @ApiModelProperty(name = "createTime", value = "创建时间")
58 @DateTimeFormat(pattern = "yyyy-MM-dd") 58 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
59 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
60 private Date createTime; 59 private Date createTime;
61 60
62 /** 61 /**
63 * 状态1:补录中,2:已归档 62 * 状态1:补录中,2:已归档
64 */ 63 */
65 @TableField("STATE") 64 @ApiModelProperty(name = "state", value = "状态1:补录中,2:已归档")
66 private String state; 65 private String state;
67 66
68 /** 67 /**
69 * 归档时间 68 * 归档时间
70 */ 69 */
71 @TableField("GDSJ") 70 @ApiModelProperty(name = "gdsj", value = "归档时间")
72 @DateTimeFormat(pattern = "yyyy-MM-dd") 71 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
73 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
74 private Date gdsj; 72 private Date gdsj;
75 } 73 }
......