From f8bb26290620ba7718825d40abfc92f543127401 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Thu, 29 Sep 2022 09:32:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A1=A3=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salaryarchive/po/SalaryArchivePO.java | 22 +++++++++- .../SalaryArchiveAddTypeEnum.java | 43 +++++++++++++++++++ 2 files changed, 63 insertions(+), 2 deletions(-) create mode 100644 src/com/engine/salary/enums/salaryarchive/SalaryArchiveAddTypeEnum.java diff --git a/src/com/engine/salary/entity/salaryarchive/po/SalaryArchivePO.java b/src/com/engine/salary/entity/salaryarchive/po/SalaryArchivePO.java index b1e80e42b..95e08f887 100644 --- a/src/com/engine/salary/entity/salaryarchive/po/SalaryArchivePO.java +++ b/src/com/engine/salary/entity/salaryarchive/po/SalaryArchivePO.java @@ -1,5 +1,7 @@ package com.engine.salary.entity.salaryarchive.po; +import com.engine.salary.enums.salaryarchive.ArchiveStatusEnum; +import com.engine.salary.enums.salaryarchive.SalaryArchiveAddTypeEnum; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -45,8 +47,24 @@ public class SalaryArchivePO { /** * 档案状态 + * + * @see ArchiveStatusEnum */ - private String status; + private String runStatus; + + /** + * 定薪类型 + * + * @see SalaryArchiveAddTypeEnum + */ + private Integer addType; + + /** + * 停薪类型 + * + * @see + */ + private Integer stopType; /** * 创建时间 @@ -81,5 +99,5 @@ public class SalaryArchivePO { //---------条件------- private Collection ids; - private Collection employeeIds;; + private Collection employeeIds; } diff --git a/src/com/engine/salary/enums/salaryarchive/SalaryArchiveAddTypeEnum.java b/src/com/engine/salary/enums/salaryarchive/SalaryArchiveAddTypeEnum.java new file mode 100644 index 000000000..7f814d323 --- /dev/null +++ b/src/com/engine/salary/enums/salaryarchive/SalaryArchiveAddTypeEnum.java @@ -0,0 +1,43 @@ +package com.engine.salary.enums.salaryarchive; + + +/** + * 薪资档案-定薪类型 + *

Copyright: Copyright (c) 2022

+ *

Company: 泛微软件

+ * + * @author qiantao + * @version 1.0 + **/ +public enum SalaryArchiveAddTypeEnum { + + INDUCTION(0, "入职", 85901), + // REHIRE(2, "返聘", 109535), + TAXAGENTADJUST(1, "调整个税扣缴义务人", 93910); + + private int value; + + private String defaultLabel; + + private int labelId; + + SalaryArchiveAddTypeEnum(int value, String defaultLabel, int labelId) { + this.value = value; + this.defaultLabel = defaultLabel; + this.labelId = labelId; + } + + public int getValue() { + return value; + } + + public String getDefaultLabel() { + return defaultLabel; + } + + public int getLabelId() { + return labelId; + } + + +}