增加状态

This commit is contained in:
钱涛 2023-09-28 17:05:42 +08:00
parent 4ed4edc9ed
commit 4c5bc5dda7
3 changed files with 3 additions and 2 deletions

View File

@ -50,5 +50,5 @@ public class SalarySendBaseInfoDTO {
/**
* 是否支持导出工资单pdf
*/
private Boolean showPdfBt;
private Boolean showPdfBtn;
}

View File

@ -60,6 +60,7 @@ public class SalaryFormulaEmployeeDTO {
private String dissmissdate;
//状态
@SalaryFormulaVar(defaultLabel = "状态", labelId = 98621, dataType = "string")
private String status;
//工号

View File

@ -451,7 +451,7 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
.sendNum(salarySend.getSendNum())
.sendTotal(salarySend.getSendTotal())
.canSend(canSend)
.showPdfBt(GEN_PDF)
.showPdfBtn(GEN_PDF)
// .salaryAcctType(salarySend.getSalaryAcctType().toString())
// .haveBackCalc(haveBackCalc ? NumberUtils.INTEGER_ONE : NumberUtils.INTEGER_ZERO)
.build();