diff --git a/src/com/engine/salary/entity/deductionamount/dto/DeductionAmountDTO.java b/src/com/engine/salary/entity/deductionamount/dto/DeductionAmountDTO.java
index 43fc7de83..234ec01cd 100644
--- a/src/com/engine/salary/entity/deductionamount/dto/DeductionAmountDTO.java
+++ b/src/com/engine/salary/entity/deductionamount/dto/DeductionAmountDTO.java
@@ -83,8 +83,10 @@ public class DeductionAmountDTO {
/**
* 报送状态
*/
- @TableTitle(title = "报送状态", dataIndex = "declareStatus", key = "declareStatus")
+ @TableTitle(title = "报送状态", dataIndex = "declareStatusName", key = "declareStatusName")
+ private String declareStatusName;
private Integer declareStatus;
+
private String declareErrorMsg;
diff --git a/src/com/engine/salary/enums/employeedeclare/DeclareStatusEnum.java b/src/com/engine/salary/enums/employeedeclare/DeclareStatusEnum.java
index 2a91aafde..e0d759613 100644
--- a/src/com/engine/salary/enums/employeedeclare/DeclareStatusEnum.java
+++ b/src/com/engine/salary/enums/employeedeclare/DeclareStatusEnum.java
@@ -2,6 +2,8 @@ package com.engine.salary.enums.employeedeclare;
import com.engine.salary.enums.BaseEnum;
+import java.util.Objects;
+
/**
* 人员报送状态
*
Copyright: Copyright (c) 2023
@@ -43,4 +45,13 @@ public enum DeclareStatusEnum implements BaseEnum {
public Integer getLabelId() {
return labelId;
}
+
+ public static DeclareStatusEnum getByValue(Integer value) {
+ for (DeclareStatusEnum e : DeclareStatusEnum.values()) {
+ if (Objects.equals(e.getValue(), value)) {
+ return e;
+ }
+ }
+ return NOT_DECLARE;
+ }
}
diff --git a/src/com/engine/salary/service/impl/DeductionAmountServiceImpl.java b/src/com/engine/salary/service/impl/DeductionAmountServiceImpl.java
index d36575ca8..e6b3c6b4c 100644
--- a/src/com/engine/salary/service/impl/DeductionAmountServiceImpl.java
+++ b/src/com/engine/salary/service/impl/DeductionAmountServiceImpl.java
@@ -79,6 +79,7 @@ public class DeductionAmountServiceImpl extends Service implements DeductionAmou
.cardNum(deductionAmountPO.getCardNum())
.cardType(deductionAmountPO.getCardType())
.declareStatus(deductionAmountPO.getDeclareStatus())
+ .declareStatusName(DeclareStatusEnum.getByValue(deductionAmountPO.getDeclareStatus()).getDefaultLabel())
.declareErrorMsg(deductionAmountPO.getDeclareErrorMsg())
.deductFlag(deductionAmountPO.getDeductFlag())
.successfullyDeclared(deductionAmountPO.getSuccessfullyDeclared())
@@ -118,7 +119,7 @@ public class DeductionAmountServiceImpl extends Service implements DeductionAmou
.cardType(employeeDeclarePO.getCardType())
.nationality(employeeDeclarePO.getNationality())
.declareStatus(DeclareStatusEnum.NOT_DECLARE.getValue())
- .deductFlag(SalaryOnOffEnum.OFF.getValue())
+ .deductFlag(SalaryOnOffEnum.ON.getValue())
.successfullyDeclared(SalaryOnOffEnum.OFF.getValue())
.creator((long) user.getUID())
.createTime(now)