diff --git a/src/com/engine/organization/entity/personnelcard/ResourceStatusEnum.java b/src/com/engine/organization/entity/personnelcard/ResourceStatusEnum.java new file mode 100644 index 00000000..b8cf8875 --- /dev/null +++ b/src/com/engine/organization/entity/personnelcard/ResourceStatusEnum.java @@ -0,0 +1,53 @@ +package com.engine.organization.entity.personnelcard; + +import com.engine.organization.exception.OrganizationRunTimeException; + +/** + * @author:dxfeng + * @createTime: 2022/10/14 + * @version: 1.0 + */ +public enum ResourceStatusEnum { + TRY_OUT("0", "试用"), + OFFICIAL("1", "正式"), + TEMPORARILY("2", "临时"), + TRIAL_EXTENSION("3", "试用延期"), + DISMISSAL("4", "解聘"), + RESIGN("5", "离职"), + RETIRE("6", "退休"), + INVALID("7", "无效"), + WORK("8", "在职"); + + private String value; + private String name; + + ResourceStatusEnum(String value, String name) { + this.value = value; + this.name = name; + } + + public static ResourceStatusEnum getResourceStatus(String value) { + for (ResourceStatusEnum item : ResourceStatusEnum.values()) { + if (item.value.equalsIgnoreCase(value)) { + return item; + } + } + throw new OrganizationRunTimeException("未找到对应状态"); + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/src/com/engine/organization/entity/personnelcard/User.java b/src/com/engine/organization/entity/personnelcard/User.java index 6d67537e..aa95cf90 100644 --- a/src/com/engine/organization/entity/personnelcard/User.java +++ b/src/com/engine/organization/entity/personnelcard/User.java @@ -7,6 +7,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.apache.commons.lang3.StringUtils; /** * @author:dxfeng @@ -27,11 +28,15 @@ public class User { private String belongTo; private String status; - public String getSex() { - if ("0".equals(sex)) { - return "男"; + public String getBelongTo() { + return StringUtils.isBlank(belongTo) ? "主账号" : "次账号"; + } + + public String getStatus() { + if (StringUtils.isNotBlank(status)) { + return ResourceStatusEnum.getResourceStatus(status).getName(); } - return "女"; + return status; } public String getImage() { diff --git a/src/com/engine/organization/util/field/FieldDefinedValueUtil.java b/src/com/engine/organization/util/field/FieldDefinedValueUtil.java index acafe620..3fc69167 100644 --- a/src/com/engine/organization/util/field/FieldDefinedValueUtil.java +++ b/src/com/engine/organization/util/field/FieldDefinedValueUtil.java @@ -29,7 +29,6 @@ import weaver.hrm.train.TrainResourceComInfo; import weaver.interfaces.workflow.browser.Browser; import weaver.interfaces.workflow.browser.BrowserBean; import weaver.proj.Maint.ProjectInfoComInfo; -import weaver.systeminfo.SystemEnv; import weaver.workflow.field.BrowserComInfo; import weaver.workflow.request.ResourceConditionManager; import weaver.workflow.workflow.WorkflowRequestComInfo; @@ -303,7 +302,8 @@ public class FieldDefinedValueUtil { for (String fileid : fileids) { ImageFileManager manager = new ImageFileManager(); manager.getImageFileInfoById(Util.getIntValue(fileid)); - showName.append("