QHSE计量器具

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/config/PmsDataPermissionConfiguration.java

@@ -17,6 +17,9 @@ import cn.iocoder.yudao.module.pms.dal.dataobject.iotrhdailyreport.IotRhDailyRep
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotsapstock.IotSapStockDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.maintain.IotMaintainDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.maintenance.IotMaintenancePlanDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.cert.IotMeasureCertDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.measure.IotMeasureBookDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.measure.IotMeasureDetectDO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.yanfan.device.YfIotDeviceDO;
 import cn.iocoder.yudao.module.supplier.dal.dataobject.product.SupplierDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
@@ -57,6 +60,9 @@ public class PmsDataPermissionConfiguration {
             rule.addDeptColumn(IotRhDailyReportDO.class, "dept_id");
             rule.addDeptColumn(IotRdDailyReportDO.class, "dept_id");
             rule.addDeptColumn(YfIotDeviceDO.class,"dept_id");
+            rule.addDeptColumn(IotMeasureBookDO.class, "dept_id");
+            rule.addDeptColumn(IotMeasureDetectDO.class, "dept_id");
+            rule.addDeptColumn(IotMeasureCertDO.class, "dept_id");
             // user
 //            rule.addUserColumn(SupplierDO.class);
             rule.addUserColumn(AdminUserDO.class, "id");

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

@@ -63,4 +63,8 @@ public class IotMeasureCertRespVO {
     @ExcelProperty("部门id")
     private Long deptId;
 
+    /**
+     * 用户id
+     */
+    private Long userId;
 }

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

@@ -18,7 +18,7 @@ public class IotMeasureCertSaveReqVO {
     private String type;
 
     @Schema(description = "证书类别", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "证书类别不能为空")
+//    @NotEmpty(message = "证书类别不能为空")
     private String classify;
 
     @Schema(description = "证书所属公司/个人", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -49,4 +49,9 @@ public class IotMeasureCertSaveReqVO {
     @Schema(description = "部门id", example = "29429")
     private Long deptId;
 
+    /**
+     * 用户id
+     */
+    private Long userId;
+
 }

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

@@ -63,4 +63,5 @@ public class IotMeasureBookPageReqVO extends PageParam {
     @Schema(description = "部门id", example = "26945")
     private Long deptId;
 
+    private String measureCertNo;
 }

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

@@ -75,5 +75,5 @@ public class IotMeasureBookRespVO {
     @Schema(description = "部门id", example = "26945")
     @ExcelProperty("部门id")
     private Long deptId;
-
+    private String measureCertNo;
 }

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

@@ -60,5 +60,5 @@ public class IotMeasureBookSaveReqVO {
 
     @Schema(description = "部门id", example = "26945")
     private Long deptId;
-
+    private String measureCertNo;
 }

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

@@ -41,6 +41,14 @@ public class IotMeasureCertDO extends BaseDO {
      * 证书所属公司/个人
      */
     private String certBelong;
+    /**
+     * 部门id
+     */
+    private Long deptId;
+    /**
+     * 用户id
+     */
+    private Long userId;
     /**
      * 证书颁发机构
      */
@@ -69,9 +77,5 @@ public class IotMeasureCertDO extends BaseDO {
      * 备注
      */
     private String remark;
-    /**
-     * 部门id
-     */
-    private Long deptId;
 
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/qhse/measure/IotMeasureBookDO.java

@@ -56,6 +56,10 @@ public class IotMeasureBookDO extends BaseDO {
      * 规格型号
      */
     private String modelName;
+    /**
+     * 证书编码
+     */
+    private String measureCertNo;
     /**
      * 有效期
      */
@@ -72,6 +76,7 @@ public class IotMeasureBookDO extends BaseDO {
      * 价格
      */
     private Double measurePrice;
+
     /**
      * 图片
      */