diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserQualificationInfoCO.java b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserQualificationInfoCO.java index 68a0a09..ad4b289 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserQualificationInfoCO.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserQualificationInfoCO.java @@ -43,6 +43,23 @@ public class UserQualificationInfoCO extends ClientObject { //证书编号 @ApiModelProperty(value = "证书编号") private String certificateNo; + + // 资质类型,1-特种作业证书,2-安全人员证书 + @ApiModelProperty(value = "资质类型,1-特种作业证书,2-安全人员证书") + private Integer qualificationinfoType; + // 证书作业类别-字典编码 + @ApiModelProperty(value = "证书作业类别-字典编码") + private String qualificationinfoCategory; + // 证书作业类别名称 + @ApiModelProperty(value = "证书作业类别名称") + private String qualificationinfoCategoryName; + // 操作项目-字典编码(特种有,安全没有) + @ApiModelProperty(value = "操作项目-字典编码(特种有,安全没有)") + private String operatingProject; + // 操作项目名称(特种有,安全没有) + @ApiModelProperty(value = "操作项目名称(特种有,安全没有)") + private String operatingProjectName; + //是否删除 @ApiModelProperty(value = "是否删除") private String deleteEnum; diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserQualificationInfoE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserQualificationInfoE.java index 43b7db3..11af902 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserQualificationInfoE.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserQualificationInfoE.java @@ -34,6 +34,17 @@ public class UserQualificationInfoE extends BaseE { //证书编号 private String certificateNo; + // 资质类型,1-特种作业证书,2-安全人员证书 + private Integer qualificationinfoType; + // 证书作业类别-字典编码 + private String qualificationinfoCategory; + // 证书作业类别名称 + private String qualificationinfoCategoryName; + // 操作项目-字典编码(特种有,安全没有) + private String operatingProject; + // 操作项目名称(特种有,安全没有) + private String operatingProjectName; + //是否删除 private String deleteEnum; diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserQualificationInfoDO.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserQualificationInfoDO.java index f9e5b9a..e2ab613 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserQualificationInfoDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserQualificationInfoDO.java @@ -42,6 +42,22 @@ public class UserQualificationInfoDO extends BaseDO { @ApiModelProperty(value = "证书编号") private String certificateNo; + // 资质类型,1-特种作业证书,2-安全人员证书 + @ApiModelProperty(value = "资质类型,1-特种作业证书,2-安全人员证书") + private Integer qualificationinfoType; + // 证书作业类别-字典编码 + @ApiModelProperty(value = "证书作业类别-字典编码") + private String qualificationinfoCategory; + // 证书作业类别名称 + @ApiModelProperty(value = "证书作业类别名称") + private String qualificationinfoCategoryName; + // 操作项目-字典编码(特种有,安全没有) + @ApiModelProperty(value = "操作项目-字典编码(特种有,安全没有)") + private String operatingProject; + // 操作项目名称(特种有,安全没有) + @ApiModelProperty(value = "操作项目名称(特种有,安全没有)") + private String operatingProjectName; + public UserQualificationInfoDO(String userQualificationinfoId) { this.userQualificationinfoId = userQualificationinfoId; }