cq_anquan
/
safety-eval-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

version

dev
luotaiqian 2026-07-14 15:43:28 +08:00
parent 79d2949043
commit 40189ca80d
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/QualificationLevelEnum.java
View File

@ -1,24 +1,26 @@
package org.qinan.safetyeval.domain.constant; package org.qinan.safetyeval.domain.constant;
import java.util.Objects;
/** /**
* 资质等级 * 资质等级
*/ */
public enum QualificationLevelEnum { public enum QualificationLevelEnum {
SENIOR(1, "高级"), SENIOR("SENIOR", "高级"),
MIDDLE(2, "中级"), MIDDLE("MIDDLE", "中级"),
JUNIOR(3, "初级"), JUNIOR("JUNIOR", "初级"),
; ;
private final int code; private final String code;
private final String name; private final String name;
QualificationLevelEnum(int code, String name) { QualificationLevelEnum(String code, String name) {
this.code = code; this.code = code;
this.name = name; this.name = name;
} }
public int getCode() { public String getCode() {
return code; return code;
} }
@ -26,12 +28,12 @@ public enum QualificationLevelEnum {
return name; return name;
} }
public static QualificationLevelEnum ofCode(Integer code) { public static QualificationLevelEnum ofCode(String code) {
if (code == null) { if (code == null) {
return null; return null;
} }
for (QualificationLevelEnum item : values()) { for (QualificationLevelEnum item : values()) {
if (item.code == code) { if (Objects.equals(item.code, code)) {
return item; return item;
} }
} }

3
safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/utils/ComplianceCheckUtil.java
View File

@ -6,6 +6,7 @@ import org.qinan.safetyeval.client.dto.*;
import org.qinan.safetyeval.domain.constant.MaterialTypeEnum; import org.qinan.safetyeval.domain.constant.MaterialTypeEnum;
import org.qinan.safetyeval.domain.constant.QualFilingComplianceCheckEnum; import org.qinan.safetyeval.domain.constant.QualFilingComplianceCheckEnum;
import org.qinan.safetyeval.domain.constant.QualFilingMaterialUploadStatusEnum; import org.qinan.safetyeval.domain.constant.QualFilingMaterialUploadStatusEnum;
import org.qinan.safetyeval.domain.constant.QualificationLevelEnum;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
@ -129,7 +130,7 @@ public class ComplianceCheckUtil {
.filter(p -> p.getRegisterEngineerFlag() != null && p.getRegisterEngineerFlag() == 1) .filter(p -> p.getRegisterEngineerFlag() != null && p.getRegisterEngineerFlag() == 1)
.count(); .count();
long seniorTitleCount = personnelList.stream() long seniorTitleCount = personnelList.stream()
.filter(p -> p.getTitleName() != null && p.getTitleName().contains("高级")) .filter(p -> QualificationLevelEnum.SENIOR.getCode().equals(p.getTitleName()))
.count(); .count();
long engineerRate = engineerCount * 100 / total; long engineerRate = engineerCount * 100 / total;
long seniorTitleRate = seniorTitleCount * 100 / total; long seniorTitleRate = seniorTitleCount * 100 / total;