wangli/orgmanax
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/REQ-3488-zhh' into 'feature/REQ-3488'

Browse Source 
Feature/req 3488 zhh

See merge request universal/infrastructure/backend/orgmanax!85
This commit is contained in:
张弘昊 2025-01-02 05:36:04 +00:00
commit 32434507a1
5 changed files with 104 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/unit/qualification/enums/QualificationTypeEnum.java Normal file
View File

@ -0,0 +1,59 @@
package cn.axzo.orgmanax.dto.unit.qualification.enums;
import lombok.Getter;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
@Getter
public enum QualificationTypeEnum {
CEC(1, "建筑业企业资质证书"),
QCD(2, "房地产开发企业资质证书"),
SQC(3, "工程监理资质证书"),
OTHER(20, "其他"),
;
private static final Map<Integer, QualificationTypeEnum> mapping = new HashMap<>();
static {
Arrays.stream(QualificationTypeEnum.values()).forEach(t -> mapping.put(t.getCode(), t));
}
public final Integer code;
public final String desc;
QualificationTypeEnum(Integer code, String desc) {
this.code = code;
this.desc = desc;
}
public static QualificationTypeEnum getByCode(Integer code) {
return mapping.get(code);
}
/**
* 根据资质序列映射资质类型
*
* @param quaOuType
* @return
*/
public static QualificationTypeEnum getByQuaOuType(Integer quaOuType) {
if (Arrays.asList(QualificationsTypeEnum.PRIMARY_CONTRACTING_UNIT.getValue()
, QualificationsTypeEnum.LABOR_SUBCONTRACTING.getValue()
, QualificationsTypeEnum.PROFESSIONAL_SUBCONTRACTING.getValue())
.contains(quaOuType)) {
return CEC;
} else if (Arrays.asList(QualificationsTypeEnum.CONSTRUCTION_UNIT.getValue()).contains(quaOuType)) {
return QCD;
} else if (Arrays.asList(QualificationsTypeEnum.SUPERVISION_UNIT.getValue()).contains(quaOuType)) {
return SQC;
} else if (Arrays.asList(QualificationsTypeEnum.OTHER.getValue()).contains(quaOuType)) {
return OTHER;
} else {
return null;
}
}
}

45
orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/unit/qualification/enums/QualificationsTypeEnum.java Normal file
View File

@ -0,0 +1,45 @@
package cn.axzo.orgmanax.dto.unit.qualification.enums;
import com.fasterxml.jackson.annotation.JsonValue;
import lombok.Getter;
import java.util.Arrays;
/**
* 资质类型
*/
@Getter
public enum QualificationsTypeEnum {
PRIMARY_CONTRACTING_UNIT(1, "施工总承包"),
CONSTRUCTION_UNIT(2, "建设单位"),
SUPERVISION_UNIT(3, "监理单位"),
LABOR_SUBCONTRACTING(4, "劳务分包"),
PROFESSIONAL_SUBCONTRACTING(5, "专业承包"),
OTHER(30, "其他"),
;
@JsonValue
private final Integer value;
private final String desc;
QualificationsTypeEnum(final Integer value, final String desc) {
this.value = value;
this.desc = desc;
}
public static QualificationsTypeEnum getByValue(Integer value) {
return Arrays.stream(values()).filter(o -> o.getValue().equals(value)).findFirst().orElse(null);
}
public static String toDesc(Integer value) {
if (value == null) {
return "";
}
for (QualificationsTypeEnum item : values()) {
if (item.value.equals(value)) {
return item.desc;
}
}
return "";
}
}

6
orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/unit/qualification/req/ListQualificationReq.java
View File

@ -53,11 +53,5 @@ public class ListQualificationReq extends PageReqV2 {
*/
@CriteriaField(ignore = true)
private Boolean includeDeleted;
@CriteriaField(ignore = true)
Integer page;
@CriteriaField(ignore = true)
Integer pageSize;
@CriteriaField(ignore = true)
List<String> sort;
}

7
orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/unit/qualification/req/ListQualificationsApplyReq.java
View File

@ -10,7 +10,6 @@ import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import java.util.Date;
import java.util.List;
import java.util.Set;
/**
@ -82,11 +81,5 @@ public class ListQualificationsApplyReq extends PageReqV2 {
*/
@CriteriaField(ignore = true)
private Boolean includeDeleted;
@CriteriaField(ignore = true)
Integer page;
@CriteriaField(ignore = true)
Integer pageSize;
@CriteriaField(ignore = true)
List<String> sort;
}

15
orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/client/profile/dto/model/IdentityPair.java
View File

@ -1,15 +0,0 @@
package cn.axzo.orgmanax.infra.client.profile.dto.model;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
@NoArgsConstructor
@AllArgsConstructor
@Data
@SuperBuilder
public class IdentityPair {
private Long identityId;
private Integer identityType;
}