diff --git a/web-client/src/main/java/com/zcloud/certificate/dto/UserCertificateAddCmd.java b/web-client/src/main/java/com/zcloud/certificate/dto/UserCertificateAddCmd.java index b75c62c..7d403fb 100644 --- a/web-client/src/main/java/com/zcloud/certificate/dto/UserCertificateAddCmd.java +++ b/web-client/src/main/java/com/zcloud/certificate/dto/UserCertificateAddCmd.java @@ -32,8 +32,8 @@ public class UserCertificateAddCmd extends Command { @ApiModelProperty(value = "业务主键ID") private String userCertificateId; - @ApiModelProperty(value = "1-特种作业,2-特种设备,3-主要负责人,4-安全生产管理人员", name = "type", required = true) - @NotNull(message = "1-特种作业,2-特种设备,3-主要负责人,4-安全生产管理人员不能为空") + @ApiModelProperty(value = "证书类型(字典)", name = "type", required = true) + @NotNull(message = "证书类型(字典)") private String type; @ApiModelProperty(value = "人员类型名称", name = "typeName", required = true) 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 f6167fe..c5a7104 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 @@ -49,7 +49,7 @@ public class UserCertificatePageQry extends PageQuery { /** * 人员类型 */ - @ApiModelProperty(value = "人员类型 1-特种作业,2-特种设备,3-主要负责人,4-安全生产管理人员", name = "eqType") + @ApiModelProperty(value = "证书类型(字典)", name = "eqType") private String eqType; /** diff --git a/web-client/src/main/java/com/zcloud/certificate/dto/UserCertificateUpdateCmd.java b/web-client/src/main/java/com/zcloud/certificate/dto/UserCertificateUpdateCmd.java index 01b30b3..b60e64b 100644 --- a/web-client/src/main/java/com/zcloud/certificate/dto/UserCertificateUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/certificate/dto/UserCertificateUpdateCmd.java @@ -33,8 +33,8 @@ public class UserCertificateUpdateCmd extends Command { @ApiModelProperty(value = "用户id", name = "userId", required = true) // @NotNull(message = "用户id不能为空") private Long userId; - @ApiModelProperty(value = "1-特种作业,2-特种设备,3-主要负责人,4-安全生产管理人员", name = "type", required = true) - @NotNull(message = "1-特种作业,2-特种设备,3-主要负责人,4-安全生产管理人员不能为空") + @ApiModelProperty(value = "证书类型(字典)", name = "type", required = true) + @NotNull(message = "证书类型(字典)") private String type; @ApiModelProperty(value = "人员类型名称", name = "typeName", required = true) @NotEmpty(message = "人员类型名称不能为空") diff --git a/web-infrastructure/src/main/resources/mapper/UserCertificateMapper.xml b/web-infrastructure/src/main/resources/mapper/UserCertificateMapper.xml index ba5756f..9ef9c0b 100644 --- a/web-infrastructure/src/main/resources/mapper/UserCertificateMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/UserCertificateMapper.xml @@ -140,10 +140,10 @@ SELECT ci.id AS corpinfoId, ci.corp_name AS corpName, - COALESCE(SUM(CASE WHEN uc.type = 1 THEN 1 ELSE 0 END), 0) AS specialWorkCertCount, - COALESCE(SUM(CASE WHEN uc.type = 2 THEN 1 ELSE 0 END), 0) AS specialEquipmentCertCount, - COALESCE(SUM(CASE WHEN uc.type = 3 THEN 1 ELSE 0 END), 0) AS principalCertCount, - COALESCE(SUM(CASE WHEN uc.type = 4 THEN 1 ELSE 0 END), 0) AS safetyManagerCertCount + COALESCE(SUM(CASE WHEN uc.type = 'tezhongzuoye' THEN 1 ELSE 0 END), 0) AS specialWorkCertCount, + COALESCE(SUM(CASE WHEN uc.type = 'tzsbczry' THEN 1 ELSE 0 END), 0) AS specialEquipmentCertCount, + COALESCE(SUM(CASE WHEN uc.type = 'zyfzr' THEN 1 ELSE 0 END), 0) AS principalCertCount, + COALESCE(SUM(CASE WHEN uc.type = 'aqscglry' THEN 1 ELSE 0 END), 0) AS safetyManagerCertCount FROM corp_info ci LEFT JOIN