diff --git a/web-client/src/main/java/com/zcloud/certificate/dto/UserCertificatePageQry.java b/web-client/src/main/java/com/zcloud/certificate/dto/UserCertificatePageQry.java index c5a7104..ae6bde3 100644 --- a/web-client/src/main/java/com/zcloud/certificate/dto/UserCertificatePageQry.java +++ b/web-client/src/main/java/com/zcloud/certificate/dto/UserCertificatePageQry.java @@ -46,6 +46,18 @@ public class UserCertificatePageQry extends PageQuery { @ApiModelProperty(value = "操作项目code-特种作业使用", name = "eqIndustryOperatingItemsCode") private String eqIndustryOperatingItemsCode; + /** + * 作业类别code-特种设备使用 + */ + @ApiModelProperty(value = "作业类别code-特种设备使用", name = "eqAssignmentCategoryCode") + private String eqAssignmentCategoryCode; + + /** + * 作业类别-操作项目code-特种设备使用 + */ + @ApiModelProperty(value = "作业类别-操作项目code-特种设备使用", name = "eqAssignmentOperatingItemsCode") + private String eqAssignmentOperatingItemsCode; + /** * 人员类型 */ diff --git a/web-infrastructure/src/main/resources/mapper/UserCertificateMapper.xml b/web-infrastructure/src/main/resources/mapper/UserCertificateMapper.xml index ab88454..c7b0fc4 100644 --- a/web-infrastructure/src/main/resources/mapper/UserCertificateMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/UserCertificateMapper.xml @@ -40,6 +40,12 @@ AND uc.industry_operating_items_code = #{params.eqIndustryOperatingItemsCode} + + AND uc.assignment_category_code = #{params.eqAssignmentCategoryCode} + + + AND uc.assignment_operating_items_code = #{params.eqAssignmentOperatingItemsCode} + AND uc.type = #{params.eqType} @@ -92,6 +98,12 @@ AND uc.industry_operating_items_code = #{params.eqIndustryOperatingItemsCode} + + AND uc.assignment_category_code = #{params.eqAssignmentCategoryCode} + + + AND uc.assignment_operating_items_code = #{params.eqAssignmentOperatingItemsCode} + AND uc.type = #{params.eqType}