From eb806b5ec0bb72536e78c1a7fcffb94bcd24cbbe Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期五, 26 四月 2024 18:24:27 +0800
Subject: [PATCH] 考核结果应用规则（算钱）新增、展示
---
ycl-pojo/src/main/java/com/ycl/platform/domain/form/ReportForm.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 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 208918b..10bf0ff 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
@@ -5,6 +5,8 @@
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;
@@ -34,7 +36,16 @@
private Integer pointId;
@ApiModelProperty("瀹℃牳鏃堕棿")
- private LocalDateTime auditingTime;
+ private Date auditingTime;
+
+ @ApiModelProperty("鐢熸晥鏃堕棿")
+ private Date beginCreateTime;
+
+ @ApiModelProperty("澶辨晥鏃堕棿")
+ private Date endCreateTime;
+
+ @ApiModelProperty("瀹℃牳绫诲瀷")
+ private String reportType;
@NotBlank(message = "鎶ュ鍐呭涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("鎶ュ鍐呭")
@@ -47,6 +58,12 @@
@ApiModelProperty("鏁呴殰绫诲瀷")
private String errorType;
+ @ApiModelProperty("瀹℃牳鎰忚")
+ private String auditOpinion;
+
+ @ApiModelProperty("鐘舵��")
+ private Integer status;
+
public static Report getEntityByForm(@NonNull ReportForm form, Report entity) {
if(entity == null) {
entity = new Report();
--
Gitblit v1.8.0