From a4f1e1a9b97f7606347ba1b6a5c5957c3fc28a59 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期三, 15 十月 2025 13:28:37 +0800
Subject: [PATCH] 功能改造
---
gkhy-system/src/main/java/com/gkhy/system/domain/DailySafetyInspection.java | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 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 1eee189..c69d484 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
@@ -56,11 +56,10 @@
@ApiModelProperty(value = "被检查部门/研究组",required = true)
@TableField("research_group")
- @NotNull(message = "被检查部门/研究组不能为空")
private Long researchGroup;
@TableField(exist = false)
- @ApiModelProperty("被检查部门/研究组名称")
+ @ApiModelProperty(value = "被检查部门/研究组名称",hidden = true)
private String researchGroupName;
@@ -89,12 +88,16 @@
@NotBlank(message = "复查结果不能为空")
private String examinationResults;
- @ApiModelProperty(value = "复查人员id",required = true)
+ @ApiModelProperty(value = "复查人员id",hidden = true)
@TableField("re_check_user_id")
- @NotNull(message = "复查人员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;
@@ -129,14 +132,14 @@
@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("参与检查人员id查询条件")
- private Long searchCheckUserId;
+// @TableField(exist = false)
+// @ApiModelProperty("参与检查人员")
+// @NotEmpty(message = "参与检查人员不能为空")
+// private List<DailySafetyInspectionUser> dailySafetyInspectionUsers;
+//
+// @TableField(exist = false)
+// @ApiModelProperty("参与检查人员id查询条件")
+// private List<Long> searchCheckUserIds;
@TableField(exist = false)
@ApiModelProperty("查询条件检查开始时间")
@@ -149,4 +152,8 @@
@ApiModelProperty(value = "是否存在隐患 0否1是")
@TableField(exist = false)
private Integer haveMainHazard;
+
+ @ApiModelProperty(value = "部门信息")
+ @TableField(exist = false)
+ private List<DailySafetyInspectionDept> dailySafetyInspectionDepts;
}
--
Gitblit v1.9.2