From 32f55fac90d67b276254b6d91e8b65e8f6e36b48 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期四, 18 九月 2025 10:09:28 +0800
Subject: [PATCH] 功能改造
---
gkhy-system/src/main/java/com/gkhy/system/domain/DailySafetyInspection.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/gkhy-system/src/main/java/com/gkhy/system/domain/DailySafetyInspection.java b/gkhy-system/src/main/java/com/gkhy/system/domain/DailySafetyInspection.java
index 64152ec..70f6d2f 100644
--- a/gkhy-system/src/main/java/com/gkhy/system/domain/DailySafetyInspection.java
+++ b/gkhy-system/src/main/java/com/gkhy/system/domain/DailySafetyInspection.java
@@ -7,6 +7,7 @@
import java.io.Serializable;
import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -62,6 +63,12 @@
@ApiModelProperty("被检查部门/研究组名称")
private String researchGroupName;
+
+ @ApiModelProperty(value = "检查类型 1综合检查、2部门检查、3实验室自查、4专项检查",required = true)
+ @TableField("check_type")
+ @NotNull(message = "检查类型不能为空")
+ private Integer checkType;
+
@ApiModelProperty(value = "检查内容",required = true)
@TableField("check_content")
@NotBlank(message = "检查内容不能为空")
@@ -77,20 +84,23 @@
@NotBlank(message = "整改措施不能为空")
private String rectificationMeasures;
- @ApiModelProperty("复查结果")
+ @ApiModelProperty(value = "复查结果",required = true)
@TableField("examination_results")
+ @NotBlank(message = "复查结果不能为空")
private String examinationResults;
- @ApiModelProperty("复查人员id")
+ @ApiModelProperty(value = "复查人员id",required = true)
@TableField("re_check_user_id")
+ @NotNull(message = "复查人员id不能为空")
private Long reCheckUserId;
@ApiModelProperty("复查人员")
@TableField("re_check_user")
private String reCheckUser;
- @ApiModelProperty("复查时间")
+ @ApiModelProperty(value = "复查时间",required = true)
@TableField("re_check_date")
+ @NotNull(message = "复查时间不能为空")
private LocalDate reCheckDate;
@ApiModelProperty("备注")
@@ -126,7 +136,17 @@
@TableField(exist = false)
@ApiModelProperty("参与检查人员id查询条件")
- private Long searchCheckUserId;
+ private List<Long> searchCheckUserIds;
+ @TableField(exist = false)
+ @ApiModelProperty("查询条件检查开始时间")
+ private Date checkBeginDate;
+ @TableField(exist = false)
+ @ApiModelProperty("查询条件检查结束时间")
+ private Date checkEndDate;
+
+ @ApiModelProperty(value = "是否存在隐患 0否1是")
+ @TableField(exist = false)
+ private Integer haveMainHazard;
}
--
Gitblit v1.9.2