From 40189ca80d917fa2ebb81d914c4bdc9237f7b8bb Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Tue, 14 Jul 2026 15:43:28 +0800 Subject: [PATCH] version --- .../constant/QualificationLevelEnum.java | 18 ++++++++++-------- .../utils/ComplianceCheckUtil.java | 3 ++- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/QualificationLevelEnum.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/QualificationLevelEnum.java index 92a4580..15e4538 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/QualificationLevelEnum.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/QualificationLevelEnum.java @@ -1,24 +1,26 @@ package org.qinan.safetyeval.domain.constant; +import java.util.Objects; + /** * 资质等级 */ public enum QualificationLevelEnum { - SENIOR(1, "高级"), - MIDDLE(2, "中级"), - JUNIOR(3, "初级"), + SENIOR("SENIOR", "高级"), + MIDDLE("MIDDLE", "中级"), + JUNIOR("JUNIOR", "初级"), ; - private final int code; + private final String code; private final String name; - QualificationLevelEnum(int code, String name) { + QualificationLevelEnum(String code, String name) { this.code = code; this.name = name; } - public int getCode() { + public String getCode() { return code; } @@ -26,12 +28,12 @@ public enum QualificationLevelEnum { return name; } - public static QualificationLevelEnum ofCode(Integer code) { + public static QualificationLevelEnum ofCode(String code) { if (code == null) { return null; } for (QualificationLevelEnum item : values()) { - if (item.code == code) { + if (Objects.equals(item.code, code)) { return item; } } diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/utils/ComplianceCheckUtil.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/utils/ComplianceCheckUtil.java index c8991b6..3a75354 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/utils/ComplianceCheckUtil.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/utils/ComplianceCheckUtil.java @@ -6,6 +6,7 @@ import org.qinan.safetyeval.client.dto.*; import org.qinan.safetyeval.domain.constant.MaterialTypeEnum; import org.qinan.safetyeval.domain.constant.QualFilingComplianceCheckEnum; import org.qinan.safetyeval.domain.constant.QualFilingMaterialUploadStatusEnum; +import org.qinan.safetyeval.domain.constant.QualificationLevelEnum; import java.math.BigDecimal; import java.util.ArrayList; @@ -129,7 +130,7 @@ public class ComplianceCheckUtil { .filter(p -> p.getRegisterEngineerFlag() != null && p.getRegisterEngineerFlag() == 1) .count(); long seniorTitleCount = personnelList.stream() - .filter(p -> p.getTitleName() != null && p.getTitleName().contains("高级")) + .filter(p -> QualificationLevelEnum.SENIOR.getCode().equals(p.getTitleName())) .count(); long engineerRate = engineerCount * 100 / total; long seniorTitleRate = seniorTitleCount * 100 / total;