From 4c5bc5dda749f7c60d96c6d22b34deb71dbab5f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Thu, 28 Sep 2023 17:05:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/entity/salaryBill/dto/SalarySendBaseInfoDTO.java     | 2 +-
 .../entity/salaryformula/dto/SalaryFormulaEmployeeDTO.java      | 1 +
 src/com/engine/salary/service/impl/SalarySendServiceImpl.java   | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/com/engine/salary/entity/salaryBill/dto/SalarySendBaseInfoDTO.java b/src/com/engine/salary/entity/salaryBill/dto/SalarySendBaseInfoDTO.java
index ae1a88f3a..05b69d9bf 100644
--- a/src/com/engine/salary/entity/salaryBill/dto/SalarySendBaseInfoDTO.java
+++ b/src/com/engine/salary/entity/salaryBill/dto/SalarySendBaseInfoDTO.java
@@ -50,5 +50,5 @@ public class SalarySendBaseInfoDTO {
     /**
      * 是否支持导出工资单pdf
      */
-    private Boolean showPdfBt;
+    private Boolean showPdfBtn;
 }
diff --git a/src/com/engine/salary/entity/salaryformula/dto/SalaryFormulaEmployeeDTO.java b/src/com/engine/salary/entity/salaryformula/dto/SalaryFormulaEmployeeDTO.java
index ae5a91807..e88c263c7 100644
--- a/src/com/engine/salary/entity/salaryformula/dto/SalaryFormulaEmployeeDTO.java
+++ b/src/com/engine/salary/entity/salaryformula/dto/SalaryFormulaEmployeeDTO.java
@@ -60,6 +60,7 @@ public class SalaryFormulaEmployeeDTO {
     private String dissmissdate;
 
     //状态
+    @SalaryFormulaVar(defaultLabel = "状态", labelId = 98621, dataType = "string")
     private String status;
 
     //工号
diff --git a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java
index f3c245a70..e5426ff66 100644
--- a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java
@@ -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();