From a4e53d24f26b0276ccb068f63e2178647b408cde Mon Sep 17 00:00:00 2001 From: shenzhidan Date: Thu, 5 Feb 2026 08:31:42 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=89=B9=E7=A7=8D=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E7=B1=BB=E5=88=AB=E9=A1=B9=E7=9B=AE=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../certificate/dto/UserCertificatePageQry.java | 12 ++++++++++++ .../main/resources/mapper/UserCertificateMapper.xml | 12 ++++++++++++ 2 files changed, 24 insertions(+) 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}