qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

确认名单转义

This commit is contained in:
钱涛 2025-03-31 18:23:12 +08:00
parent 590046b0a3
commit 1a4ab02bdc
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/engine/salary/entity/deductionamount/dto/DeductionAmountDTO.java
View File

@ -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;

11
src/com/engine/salary/enums/employeedeclare/DeclareStatusEnum.java
View File

@ -2,6 +2,8 @@ package com.engine.salary.enums.employeedeclare;
import com.engine.salary.enums.BaseEnum;
import java.util.Objects;
/**
* 人员报送状态
* <p>Copyright: Copyright (c) 2023</p>
@ -43,4 +45,13 @@ public enum DeclareStatusEnum implements BaseEnum<Integer> {
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;
}
}

3
src/com/engine/salary/service/impl/DeductionAmountServiceImpl.java
View File

@ -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)