From e7202ce274c9ee51a1617069e42c5b886d21991a Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期一, 20 十月 2025 16:30:51 +0800
Subject: [PATCH] 功能改造
---
gkhy-system/src/main/java/com/gkhy/system/domain/DailySafetyInspection.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 47 insertions(+), 12 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..54bfd18 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;
@@ -55,12 +56,17 @@
@ApiModelProperty(value = "被检查部门/研究组",required = true)
@TableField("research_group")
- @NotNull(message = "被检查部门/研究组不能为空")
private Long researchGroup;
@TableField(exist = false)
- @ApiModelProperty("被检查部门/研究组名称")
+ @ApiModelProperty(value = "被检查部门/研究组名称",hidden = true)
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")
@@ -77,20 +83,27 @@
@NotBlank(message = "整改措施不能为空")
private String rectificationMeasures;
- @ApiModelProperty("复查结果")
+ @ApiModelProperty(value = "复查结果",required = true)
@TableField("examination_results")
+ @NotBlank(message = "复查结果不能为空")
private String examinationResults;
- @ApiModelProperty("复查人员id")
+ @ApiModelProperty(value = "复查人员id",hidden = true)
@TableField("re_check_user_id")
private Long reCheckUserId;
- @ApiModelProperty("复查人员")
+ @ApiModelProperty(value = "检查人员",hidden = true)
+ @TableField("check_user")
+ @NotBlank(message = "检查人员不能为空")
+ private String checkUser;
+
+ @ApiModelProperty(value = "复查人员",required = true)
@TableField("re_check_user")
private String reCheckUser;
- @ApiModelProperty("复查时间")
+ @ApiModelProperty(value = "复查时间",required = true)
@TableField("re_check_date")
+ @NotNull(message = "复查时间不能为空")
private LocalDate reCheckDate;
@ApiModelProperty("备注")
@@ -105,6 +118,10 @@
@TableField("create_by")
private String createBy;
+ @ApiModelProperty("创建者id")
+ @TableField("create_by_id")
+ private Long createById;
+
@ApiModelProperty("创建时间")
@TableField("create_time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -114,19 +131,37 @@
@TableField("update_by")
private String updateBy;
+ @ApiModelProperty("更新者id")
+ @TableField("update_by_id")
+ private Long updateById;
+
@ApiModelProperty("更新时间")
@TableField("update_time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime;
- @TableField(exist = false)
- @ApiModelProperty("参与检查人员")
- @NotEmpty(message = "参与检查人员不能为空")
- private List<DailySafetyInspectionUser> dailySafetyInspectionUsers;
+// @TableField(exist = false)
+// @ApiModelProperty("参与检查人员")
+// @NotEmpty(message = "参与检查人员不能为空")
+// private List<DailySafetyInspectionUser> dailySafetyInspectionUsers;
+//
+// @TableField(exist = false)
+// @ApiModelProperty("参与检查人员id查询条件")
+// private List<Long> searchCheckUserIds;
@TableField(exist = false)
- @ApiModelProperty("参与检查人员id查询条件")
- private Long searchCheckUserId;
+ @ApiModelProperty("查询条件检查开始时间")
+ private Date checkBeginDate;
+ @TableField(exist = false)
+ @ApiModelProperty("查询条件检查结束时间")
+ private Date checkEndDate;
+ @ApiModelProperty(value = "是否存在隐患 0否1是")
+ @TableField(exist = false)
+ private Integer haveMainHazard;
+
+ @ApiModelProperty(value = "部门信息")
+ @TableField(exist = false)
+ private List<DailySafetyInspectionDept> dailySafetyInspectionDepts;
}
--
Gitblit v1.9.2