From b5e6059298596d4151df3bbf09aea51ed7280658 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Tue, 22 Oct 2024 16:38:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E7=AE=97=E8=AE=B0=E5=BD=95=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E5=AD=97=E6=AE=B5=E5=88=86=E5=BC=80=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/entity/salaryacct/bo/SalaryAcctResultBO.java  | 2 ++
 .../entity/salaryacct/po/SalaryAcctEmployeePO.java       | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
index 8912df16e..1ad40c4f5 100644
--- a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
+++ b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java
@@ -296,6 +296,8 @@ public class SalaryAcctResultBO {
                         map.put("departmentId", e.getDepartmentId());
                     } else if ("subcompanyName".equals(salarySobEmpField.getFieldCode())) {
                         map.put("subcompanyName", e.getSubcompanyName());
+                    }else if ("subcompanyId".equals(salarySobEmpField.getFieldCode())) {
+                        map.put("subcompanyId", e.getSubcompanyId());
                     } else if ("jobcall".equals(salarySobEmpField.getFieldCode())) {
                         map.put("jobcall", e.getJobcall());
                     } else if ("jobcallId".equals(salarySobEmpField.getFieldCode())) {
diff --git a/src/com/engine/salary/entity/salaryacct/po/SalaryAcctEmployeePO.java b/src/com/engine/salary/entity/salaryacct/po/SalaryAcctEmployeePO.java
index 3645db6fc..bd5a19575 100644
--- a/src/com/engine/salary/entity/salaryacct/po/SalaryAcctEmployeePO.java
+++ b/src/com/engine/salary/entity/salaryacct/po/SalaryAcctEmployeePO.java
@@ -119,29 +119,38 @@ public class SalaryAcctEmployeePO {
      * 分部
      */
     @I18n
+    @SalaryFormulaVar(defaultLabel = "分部", labelId = 86321, dataType = "string")
     private String subcompanyName;
+    @SalaryFormulaVar(defaultLabel = "分部ID", labelId = 86321, dataType = "string")
     private Long subcompanyId;
     /**
      * 部门
      */
     @I18n
+    @SalaryFormulaVar(defaultLabel = "部门", labelId = 86321, dataType = "string")
     private String departmentName;
+    @SalaryFormulaVar(defaultLabel = "部门ID", labelId = 86321, dataType = "string")
     private Long departmentId;
     /**
      * 岗位
      */
     @I18n
+    @SalaryFormulaVar(defaultLabel = "岗位", labelId = 86321, dataType = "string")
     private String jobtitleName;
+    @SalaryFormulaVar(defaultLabel = "岗位ID", labelId = 86321, dataType = "string")
     private Long jobtitleId;
     /**
      * 职称
      */
     @I18n
+    @SalaryFormulaVar(defaultLabel = "职称", labelId = 86321, dataType = "string")
     private String jobcall;
+    @SalaryFormulaVar(defaultLabel = "职称ID", labelId = 86321, dataType = "string")
     private Long jobcallId;
     /**
      * 状态
      */
+    @SalaryFormulaVar(defaultLabel = "状态", labelId = 86321, dataType = "string")
     private String status;
 
     //锁定的项目