qhse月报 隐患排查

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

@@ -20,6 +20,13 @@ public class IotHazardPageReqVO extends PageParam {
     @Schema(description = "状态", example = "1")
     private String status;
 
+    @Schema(description = "排查时间")
+    private LocalDateTime checkTime;
+    @Schema(description = "整改要求")
+    private String correctStandard;
+    @Schema(description = "整改人")
+    private Long correctPerson;
+
     @Schema(description = "地点")
     private String address;
 

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

@@ -28,6 +28,12 @@ public class IotHazardRespVO {
 
     @Schema(description = "隐患排查来源")
     private String source;
+    @Schema(description = "排查时间")
+    private LocalDateTime checkTime;
+    @Schema(description = "整改要求")
+    private String correctStandard;
+    @Schema(description = "整改人")
+    private Long correctPerson;
 
     @Schema(description = "地点", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("地点")

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

@@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
+import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - QHSE隐患排查及整改新增/修改 Request VO")
 @Data
@@ -19,6 +20,13 @@ public class IotHazardSaveReqVO {
     @Schema(description = "隐患排查分类")
     private String classify;
 
+    @Schema(description = "排查时间")
+    private LocalDateTime checkTime;
+    @Schema(description = "整改要求")
+    private String correctStandard;
+    @Schema(description = "整改要求")
+    private Long correctPerson;
+
     @Schema(description = "隐患排查来源")
     private String source;
 

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

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 
+import java.time.LocalDateTime;
+
 /**
  * QHSE隐患排查及整改 DO
  *
@@ -35,6 +37,18 @@ public class IotHazardDO extends BaseDO {
      */
     private String classify;
     private String classifyName;
+    /**
+     * 排查时间
+     */
+    private LocalDateTime checkTime;
+    /**
+     * 整改要求
+     */
+    private String correctStandard;
+    /**
+     * 整改人
+     */
+    private Long correctPerson;
     /**
      * 隐患排查来源
      */

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/qhse/report/QhseMonthReportMapper.java

@@ -48,6 +48,7 @@ public interface QhseMonthReportMapper extends BaseMapperX<QhseMonthReportDO> {
                 .eqIfPresent(QhseMonthReportDO::getElectricityConsumption, reqVO.getElectricityConsumption())
                 .eqIfPresent(QhseMonthReportDO::getNaturalGasConsumption, reqVO.getNaturalGasConsumption())
                 .eqIfPresent(QhseMonthReportDO::getRemark, reqVO.getRemark())
+                .eqIfPresent(QhseMonthReportDO::getTitle, reqVO.getTitle())
                 .betweenIfPresent(QhseMonthReportDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(QhseMonthReportDO::getId));
     }