yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/hazard/vo/IotHazardPageReqVO.java

@@ -22,6 +22,13 @@ public class IotHazardPageReqVO extends PageParam {
 
     @Schema(description = "排查时间")
     private LocalDateTime checkTime;
+
+    @Schema(description = "检查类型")
+    private String checkType;
+
+    @Schema(description = "隐患排查类型")
+    private String classify;
+
     @Schema(description = "整改要求")
     private String correctStandard;
     @Schema(description = "整改人")

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/hazard/vo/IotHazardRespVO.java

@@ -20,9 +20,12 @@ public class IotHazardRespVO {
     @ExcelProperty("状态")
     private String status;
 
-    @Schema(description = "隐患排查分类")
+    @Schema(description = "隐患排查类型")
     private String classify;
 
+    @Schema(description = "检查类型")
+    private String checkType;
+
     @Schema(description = "隐患排查分类名称")
     private String classifyName;
 
@@ -30,6 +33,8 @@ public class IotHazardRespVO {
     private String source;
     @Schema(description = "排查时间")
     private LocalDateTime checkTime;
+    @Schema(description = "整改期限")
+    private String checkPeriod;
     @Schema(description = "整改要求")
     private String correctStandard;
     @Schema(description = "整改人")

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/hazard/vo/IotHazardSaveReqVO.java

@@ -17,11 +17,16 @@ public class IotHazardSaveReqVO {
 //    @NotEmpty(message = "状态不能为空")
     private String status;
 
-    @Schema(description = "隐患排查分类")
+    @Schema(description = "隐患排查类型")
     private String classify;
 
+    @Schema(description = "检查类型")
+    private String checkType;
+
     @Schema(description = "排查时间")
     private LocalDateTime checkTime;
+    @Schema(description = "整改期限")
+    private String checkPeriod;
     @Schema(description = "整改要求")
     private String correctStandard;
     @Schema(description = "整改要求")

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/qhse/hazard/IotHazardDO.java

@@ -33,9 +33,15 @@ public class IotHazardDO extends BaseDO {
      */
     private String status;
     /**
-     * 隐患排查分类
+     * 隐患排查类型
      */
     private String classify;
+
+    /**
+     * 检查类型
+     */
+    private String checkType;
+
     private String classifyName;
     /**
      * 排查时间
@@ -50,7 +56,11 @@ public class IotHazardDO extends BaseDO {
      */
     private Long correctPerson;
     /**
-     * 隐患排查来源
+     * 整改期限
+     */
+    private String checkPeriod;
+    /**
+     * 检查主体
      */
     private String source;
     /**