Merge remote-tracking branch 'origin/master'

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

@@ -29,6 +29,9 @@ public class QhseDeviceCertPageReqVO extends PageParam {
     @Schema(description = "证书编号")
     private String certNo;
 
+    @Schema(description = "证书类别")
+    private String certType;
+
     @Schema(description = "检测单位")
     private String certOrg;
 

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

@@ -32,6 +32,9 @@ public class QhseDeviceCertRespVO {
     @ExcelProperty("证书编号")
     private String certNo;
 
+    @Schema(description = "证书类别")
+    private String certType;
+
     @Schema(description = "检测单位", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("检测单位")
     private String certOrg;

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

@@ -32,6 +32,8 @@ public class QhseDeviceCertSaveReqVO {
     @Schema(description = "证书编号", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotEmpty(message = "证书编号不能为空")
     private String certNo;
+    @Schema(description = "证书类别")
+    private String certType;
 
     @Schema(description = "检测单位", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotEmpty(message = "检测单位不能为空")

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/qhse/devicecert/QhseDeviceCertDO.java

@@ -75,5 +75,8 @@ public class QhseDeviceCertDO extends BaseDO {
 
     private Boolean alertWarn;
     private Boolean expired;
-
+    /**
+     * 检测类别
+     */
+    private String certType;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/qhse/devicecert/QhseDeviceCertMapper.java

@@ -27,6 +27,7 @@ public interface QhseDeviceCertMapper extends BaseMapperX<QhseDeviceCertDO> {
                 .betweenIfPresent(QhseDeviceCertDO::getCertTime, reqVO.getCertTime())
                 .betweenIfPresent(QhseDeviceCertDO::getCertExpire, reqVO.getCertExpire())
                 .eqIfPresent(QhseDeviceCertDO::getFile, reqVO.getFile())
+                .eqIfPresent(QhseDeviceCertDO::getCertType, reqVO.getCertType())
                 .eqIfPresent(QhseDeviceCertDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(QhseDeviceCertDO::getCreateTime, reqVO.getCreateTime())
                 .likeIfPresent(QhseDeviceCertDO::getDeptName, reqVO.getDeptName())