diff --git a/src/com/engine/salary/enums/push/PushRecordDStatusEnum.java b/src/com/engine/salary/enums/push/PushRecordDetailStatusEnum.java similarity index 77% rename from src/com/engine/salary/enums/push/PushRecordDStatusEnum.java rename to src/com/engine/salary/enums/push/PushRecordDetailStatusEnum.java index 09f43d0fb..7fbf6cfdf 100644 --- a/src/com/engine/salary/enums/push/PushRecordDStatusEnum.java +++ b/src/com/engine/salary/enums/push/PushRecordDetailStatusEnum.java @@ -13,7 +13,7 @@ import java.util.Objects; * @author qiantao * @version 1.0 **/ -public enum PushRecordDStatusEnum implements BaseEnum { +public enum PushRecordDetailStatusEnum implements BaseEnum { PREPARE(0, "准备中", 87625), WAITING(1, "等待中", 87625), PROGRESS(2, "执行中", 85393), @@ -26,7 +26,7 @@ public enum PushRecordDStatusEnum implements BaseEnum { private int labelId; - PushRecordDStatusEnum(int value, String defaultLabel, int labelId) { + PushRecordDetailStatusEnum(int value, String defaultLabel, int labelId) { this.value = value; this.defaultLabel = defaultLabel; this.labelId = labelId; @@ -47,8 +47,8 @@ public enum PushRecordDStatusEnum implements BaseEnum { return labelId; } - public static PushRecordDStatusEnum parseByValue(int value) { - for (PushRecordDStatusEnum salaryDataSourceEnum : PushRecordDStatusEnum.values()) { + public static PushRecordDetailStatusEnum parseByValue(int value) { + for (PushRecordDetailStatusEnum salaryDataSourceEnum : PushRecordDetailStatusEnum.values()) { if (Objects.equals(salaryDataSourceEnum.getValue(), value)) { return salaryDataSourceEnum; } @@ -60,7 +60,7 @@ public enum PushRecordDStatusEnum implements BaseEnum { if (value == null) { return ""; } - PushRecordDStatusEnum[] enumAry = PushRecordDStatusEnum.values(); + PushRecordDetailStatusEnum[] enumAry = PushRecordDetailStatusEnum.values(); for (int i = 0; i < Arrays.asList(enumAry).size(); i++) { if (enumAry[i].getValue().equals(value)) { return enumAry[i].getDefaultLabel(); diff --git a/src/com/engine/salary/service/impl/PushServiceImpl.java b/src/com/engine/salary/service/impl/PushServiceImpl.java index bd67d8803..74045065a 100644 --- a/src/com/engine/salary/service/impl/PushServiceImpl.java +++ b/src/com/engine/salary/service/impl/PushServiceImpl.java @@ -24,6 +24,7 @@ import com.engine.salary.entity.salaryitem.po.SalaryItemPO; import com.engine.salary.entity.salarysob.dto.SalarySobCycleDTO; import com.engine.salary.entity.salarysob.po.SalarySobPO; import com.engine.salary.enums.push.PushItemFieldEnum; +import com.engine.salary.enums.push.PushRecordDetailStatusEnum; import com.engine.salary.enums.push.PushRecordStatusEnum; import com.engine.salary.enums.salaryformula.SalarySQLReferenceEnum; import com.engine.salary.exception.SalaryRunTimeException;