Merge remote-tracking branch 'origin/master'

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/cert/IotMeasureCertController.java

@@ -161,7 +161,7 @@ public class IotMeasureCertController {
         IotMeasureCertPageReqVO reqVO = new IotMeasureCertPageReqVO();
         reqVO.setExpired(true);
         long expired = iotMeasureCertMapper.selectCountByDeptAndExpireAndWarn(reqVO, ids);
-        reqVO.setExpired(null);
+        reqVO.setExpired(false);
         reqVO.setAlertWarn(true);
         //90天预警
         long warn = iotMeasureCertMapper.selectCountByDeptAndExpireAndWarn(reqVO, ids);

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

@@ -1,11 +1,11 @@
 package cn.iocoder.yudao.module.pms.controller.admin.qhse.cert.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
+import lombok.Data;
+
 import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - QHSE-证书人员 Response VO")
 @Data
@@ -48,4 +48,45 @@ public class QhseCertPersonRespVO {
     @ExcelProperty("部门名称")
     private String deptName;
 
+
+    /**
+     * 硫化氢
+     */
+    private Boolean lsh;
+    /**
+     * 井控
+     */
+    private Boolean jk;
+    /**
+     * HSE
+     */
+    private Boolean hse;
+    /**
+     * 司钻
+     */
+    private Boolean sz;
+    /**
+     * 高处作业
+     */
+    private Boolean gczy;
+    /**
+     * 电工
+     */
+    private Boolean dg;
+    /**
+     * 连续油管主操
+     */
+    private Boolean lxygzc;
+    /**
+     * 吊装
+     */
+    private Boolean dz;
+    /**
+     * 特种作业证
+     */
+    private Boolean tzzy;
+    /**
+     * 安全管理证
+     */
+    private Boolean aqgl;
 }

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

@@ -34,4 +34,44 @@ public class QhseCertPersonSaveReqVO {
     @Schema(description = "部门名称", example = "张三")
     private String deptName;
 
+    /**
+     * 硫化氢
+     */
+    private Boolean lsh;
+    /**
+     * 井控
+     */
+    private Boolean jk;
+    /**
+     * HSE
+     */
+    private Boolean hse;
+    /**
+     * 司钻
+     */
+    private Boolean sz;
+    /**
+     * 高处作业
+     */
+    private Boolean gczy;
+    /**
+     * 电工
+     */
+    private Boolean dg;
+    /**
+     * 连续油管主操
+     */
+    private Boolean lxygzc;
+    /**
+     * 吊装
+     */
+    private Boolean dz;
+    /**
+     * 特种作业证
+     */
+    private Boolean tzzy;
+    /**
+     * 安全管理证
+     */
+    private Boolean aqgl;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/measure/IotMeasureBookController.java

@@ -153,7 +153,7 @@ public class IotMeasureBookController {
         IotMeasureBookPageReqVO reqVO = new IotMeasureBookPageReqVO();
         reqVO.setExpired(true);
         long expired = iotMeasureBookMapper.selectCountByDeptAndExpireAndWarn(reqVO, ids);
-        reqVO.setExpired(null);
+        reqVO.setExpired(false);
         reqVO.setAlertWarn(true);
         //90天预警
         long warn = iotMeasureBookMapper.selectCountByDeptAndExpireAndWarn(reqVO, ids);

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/qhse/cert/QhseCertPersonDO.java

@@ -55,4 +55,44 @@ public class QhseCertPersonDO extends BaseDO {
      */
     private String deptName;
 
+    /**
+     * 硫化氢
+     */
+    private Boolean lsh;
+    /**
+     * 井控
+     */
+    private Boolean jk;
+    /**
+     * HSE
+     */
+    private Boolean hse;
+    /**
+     * 司钻
+     */
+    private Boolean sz;
+    /**
+     * 高处作业
+     */
+    private Boolean gczy;
+    /**
+     * 电工
+     */
+    private Boolean dg;
+    /**
+     * 连续油管主操
+     */
+    private Boolean lxygzc;
+    /**
+     * 吊装
+     */
+    private Boolean dz;
+    /**
+     * 特种作业证
+     */
+    private Boolean tzzy;
+    /**
+     * 安全管理证
+     */
+    private Boolean aqgl;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/qhse/cert/IotMeasureCertMapper.java

@@ -33,6 +33,7 @@ public interface IotMeasureCertMapper extends BaseMapperX<IotMeasureCertDO> {
                 .eqIfPresent(IotMeasureCertDO::getCertPic, reqVO.getCertPic())
                 .eqIfPresent(IotMeasureCertDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(IotMeasureCertDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(IotMeasureCertDO::getAlertWarn, reqVO.getAlertWarn())
                 .inIfPresent(IotMeasureCertDO::getDeptId, ids)
                 .orderByDesc(IotMeasureCertDO::getId));
     }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/qhse/measure/IotMeasureBookMapper.java

@@ -34,6 +34,7 @@ public interface IotMeasureBookMapper extends BaseMapperX<IotMeasureBookDO> {
                 .eqIfPresent(IotMeasureBookDO::getRemark, reqVO.getRemark())
                 .eqIfPresent(IotMeasureBookDO::getExpired, reqVO.getExpired())
                 .betweenIfPresent(IotMeasureBookDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(IotMeasureBookDO::getAlertWarn, reqVO.getAlertWarn())
                 .inIfPresent(IotMeasureBookDO::getDeptId, ids)
                 .orderByDesc(IotMeasureBookDO::getId));
     }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/qhse/cert/IotMeasureCertServiceImpl.java

@@ -39,6 +39,8 @@ public class IotMeasureCertServiceImpl implements IotMeasureCertService {
         // 插入
         IotMeasureCertDO iotMeasureCert = BeanUtils.toBean(createReqVO, IotMeasureCertDO.class);
         iotMeasureCert.setDeleted(false);
+        iotMeasureCert.setAlertWarn(false);
+        iotMeasureCert.setExpired(false);
         LocalDateTime certExpire = iotMeasureCert.getCertExpire();
         //证书已过期的话，更新expired为true
         iotMeasureCert.setExpired(certExpire.isBefore(LocalDateTime.now()));

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/qhse/measure/IotMeasureBookServiceImpl.java

@@ -64,6 +64,8 @@ public class IotMeasureBookServiceImpl implements IotMeasureBookService {
         IotMeasureBookDO iotMeasureBook = BeanUtils.toBean(createReqVO, IotMeasureBookDO.class);
         iotMeasureBook.setMeasureCode("JLQJ"+ DateUtil.format(new Date(), "yyyyMMddHHmmss"));
         iotMeasureBook.setDeleted(false);
+        iotMeasureBook.setAlertWarn(false);
+        iotMeasureBook.setExpired(false);
         //处理计量器具的检测是否过期
         iotMeasureBookMapper.insert(iotMeasureBook);
         // 返回