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 | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 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 b06fd74..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
@@ -1,20 +1,21 @@
package com.ycl.platform.domain.form;
-import com.ycl.system.domain.group.Update;
-import com.ycl.system.domain.group.Add;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.platform.base.AbsForm;
import com.ycl.platform.domain.entity.Report;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-import org.springframework.beans.BeanUtils;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import org.springframework.lang.NonNull;
+import com.ycl.system.domain.group.Add;
+import com.ycl.system.domain.group.Update;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import lombok.experimental.Accessors;
+import org.springframework.beans.BeanUtils;
+import org.springframework.lang.NonNull;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Date;
+import java.util.List;
/**
* 鎶ュ琛ㄥ崟
@@ -31,20 +32,23 @@
private Integer peopleId;
- @NotNull(message = "鐐逛綅涓嶈兘涓虹┖", groups = {Add.class, Update.class})
- @ApiModelProperty("鐐逛綅")
- private Integer pointId;
+ @ApiModelProperty("鐐逛綅鍥芥爣鐮�")
+ private String pointId;
- @ApiModelProperty("瀹℃牳鏃堕棿")
- private Date auditingTime;
+ @ApiModelProperty("瀵煎叆鐐逛綅")
+ private MultipartFile importPointId;
@ApiModelProperty("鐢熸晥鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date beginCreateTime;
+ private String beginCreateTimeStr;
@ApiModelProperty("澶辨晥鏃堕棿")
+ @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})
@@ -56,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