From e929e18f8d04e72a23c24b06b89ab2d7be6f9c84 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 28 十一月 2024 06:04:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/domain/form/ProjectInvestmentInfoForm.java | 28 +++-------------------------
1 files changed, 3 insertions(+), 25 deletions(-)
diff --git a/business/src/main/java/com/ycl/domain/form/ProjectInvestmentInfoForm.java b/business/src/main/java/com/ycl/domain/form/ProjectInvestmentInfoForm.java
index eaad73a..91269d4 100644
--- a/business/src/main/java/com/ycl/domain/form/ProjectInvestmentInfoForm.java
+++ b/business/src/main/java/com/ycl/domain/form/ProjectInvestmentInfoForm.java
@@ -1,5 +1,6 @@
package com.ycl.domain.form;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.common.group.Update;
import com.ycl.common.group.Add;
import com.ycl.system.domain.base.AbsForm;
@@ -22,80 +23,57 @@
@Data
@ApiModel(value = "ProjectInvestmentInfo琛ㄥ崟", description = "鎶曡祫椤圭洰鍩虹淇℃伅琛ㄨ〃鍗�")
public class ProjectInvestmentInfoForm extends AbsForm {
-
@NotNull(message = "椤圭洰id涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("椤圭洰id")
private Long projectId;
- @NotNull(message = "寤鸿鍦扮偣鏄惁璺ㄥ煙涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("寤鸿鍦扮偣鏄惁璺ㄥ煙")
private Integer beCrossRegion;
- @NotBlank(message = "椤圭洰寤鸿鍦扮偣涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("椤圭洰寤鸿鍦扮偣")
private String constructionLocation;
- @NotBlank(message = "寤鸿璇︾粏鍦板潃涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("寤鸿璇︾粏鍦板潃")
private String detailedAddress;
- @NotNull(message = "鏄惁鏄ˉ鐮侀」鐩笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("鏄惁鏄ˉ鐮侀」鐩�")
private Integer beCompensationProject;
- @NotBlank(message = "琛ョ爜鍘熷洜涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("琛ョ爜鍘熷洜")
private String compensationReason;
- @NotNull(message = "璁″垝寮�宸ユ椂闂翠笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("璁″垝寮�宸ユ椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date plannedStartDate;
- @NotNull(message = "鎷熷缓鎴愭椂闂翠笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("鎷熷缓鎴愭椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date expectedCompletionDate;
- @NotBlank(message = "鍥芥爣琛屼笟鍒嗙被涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("鍥芥爣琛屼笟鍒嗙被")
private String nationalIndustryClassification;
- @NotBlank(message = "鎵�灞炶涓氬垎绫讳笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("鎵�灞炶涓氬垎绫�")
private String industryClassification;
- @NotBlank(message = "椤圭洰寤鸿鎬ц川涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("椤圭洰寤鸿鎬ц川")
private String projectNature;
- @NotBlank(message = "椤圭洰灞炴�т笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("椤圭洰灞炴��")
private String projectAttribute;
- @NotNull(message = "鏄惁浣跨敤鍦熷湴涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("鏄惁浣跨敤鍦熷湴")
private Integer useEarth;
- @NotBlank(message = "涓昏寤鸿鍐呭鍙婅妯′笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("涓昏寤鸿鍐呭鍙婅妯�")
private String contentScale;
- @NotBlank(message = "寤虹骞冲彴浠ｇ爜涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("寤虹骞冲彴浠ｇ爜")
private String code;
- @NotNull(message = "鍒涘缓鏃堕棿涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("鍒涘缓鏃堕棿")
- private Date gmtCreateTime;
-
- @NotNull(message = "鍒涘缓浜轰笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("鍒涘缓浜�")
private Long createBy;
- @NotNull(message = "鏇存柊鏃堕棿涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("鏇存柊鏃堕棿")
- private Date gmtUpdateTime;
-
- @NotNull(message = "鏇存柊浜轰笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("鏇存柊浜�")
private Long updateBy;
--
Gitblit v1.8.0