From b14531e3b850fe6d2fa916ba7b88b3e2bd2ff30a Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期三, 11 九月 2024 16:47:48 +0800 Subject: [PATCH] OSD加标签 --- ycl-pojo/src/main/java/com/ycl/platform/domain/form/ReportForm.java | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/ReportForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/ReportForm.java index c5029f2..995aec9 100644 --- a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/ReportForm.java +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/ReportForm.java @@ -15,6 +15,7 @@ import org.springframework.web.multipart.MultipartFile; import java.util.Date; +import java.util.List; /** * 鎶ュ琛ㄥ崟 @@ -31,21 +32,23 @@ private Integer peopleId; - @ApiModelProperty("鐐逛綅") + @ApiModelProperty("鐐逛綅鍥芥爣鐮�") private String pointId; @ApiModelProperty("瀵煎叆鐐逛綅") private MultipartFile importPointId; @ApiModelProperty("鐢熸晥鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date beginCreateTime; + private String beginCreateTimeStr; @ApiModelProperty("澶辨晥鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date endCreateTime; + private String endCreateTimeStr; - @ApiModelProperty("瀹℃牳绫诲瀷") + @ApiModelProperty("鎶ュ绫诲瀷") private String reportType; @NotBlank(message = "鎶ュ鍐呭涓嶈兘涓虹┖", groups = {Add.class, Update.class}) @@ -57,7 +60,7 @@ private String reportMaterials; @ApiModelProperty("鏁呴殰绫诲瀷") - private String errorType; + private List<String> errorTypeList; public static Report getEntityByForm(@NonNull ReportForm form, Report entity) { if(entity == null) { -- Gitblit v1.8.0