From 71569cad9edbd866d41c21730bbca680680ecbcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Fri, 25 Oct 2024 16:01:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=89=80=E5=B1=9E=E5=B9=B4?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../engine/salary/entity/salaryBill/bo/SalaryBillBO.java    | 4 +++-
 .../salary/enums/salarybill/SalaryTemplateVarEnum.java      | 5 +++--
 .../engine/salary/service/impl/SalarySendServiceImpl.java   | 6 +++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java b/src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java
index 1bdae5dda..cd1a8f016 100644
--- a/src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java
+++ b/src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java
@@ -205,7 +205,9 @@ public class SalaryBillBO {
             }
         }
 
-        return theme.replace("${companyName}", companyName).replace("${salaryMonth}", new SimpleDateFormat("yyyy年MM月").format(salaryMonth));
+        return theme.replace("${companyName}", companyName)
+                .replace("${salaryMonth}", new SimpleDateFormat("yyyy年MM月").format(salaryMonth))
+                .replace("${salaryYear}", new SimpleDateFormat("yyyy年").format(salaryMonth));
     }
 
 //    /**
diff --git a/src/com/engine/salary/enums/salarybill/SalaryTemplateVarEnum.java b/src/com/engine/salary/enums/salarybill/SalaryTemplateVarEnum.java
index 685904b29..01592b9a0 100644
--- a/src/com/engine/salary/enums/salarybill/SalaryTemplateVarEnum.java
+++ b/src/com/engine/salary/enums/salarybill/SalaryTemplateVarEnum.java
@@ -2,8 +2,9 @@ package com.engine.salary.enums.salarybill;
 
 public enum SalaryTemplateVarEnum {
 
-    CORPORATENAME("CORPORATENAME", "公司名称", 92936),
-    SALARYYEARMONTH("SALARYYEARMONTH", "薪资所属月", 87614);
+    SALARYYEARMONTH("SALARYYEARMONTH", "薪资所属月", 87614),
+    SALARY_YEAR("SALARY_YEAR", "薪资所属年", 92936),
+    CORPORATENAME("CORPORATENAME", "公司名称", 92936);
 
     private String value;
 
diff --git a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java
index 7320144c8..066e89b8d 100644
--- a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java
@@ -864,8 +864,6 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
      * @return
      */
     private String getBillTitle(String theme, Date salaryMonth, Long currentEmployeeId) {
-        String yearI18n = SalaryI18nUtil.getI18nLabel(100325, "年");
-        String monthI18n = SalaryI18nUtil.getI18nLabel(100326, "月");
         String companyName = "";
         if (currentEmployeeId != null) {
             ResourceComInfo resourceComInfo = null;
@@ -878,7 +876,9 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
             }
             companyName = subCompanyComInfo.getSubCompanyname(resourceComInfo.getSubCompanyID(currentEmployeeId + ""));
         }
-        return theme.replace("${companyName}", companyName).replace("${salaryMonth}", new SimpleDateFormat("yyyy年MM月").format(salaryMonth));
+        return theme.replace("${companyName}", companyName)
+                .replace("${salaryMonth}", new SimpleDateFormat("yyyy年MM月").format(salaryMonth))
+                .replace("${salaryYear}", new SimpleDateFormat("yyyy年").format(salaryMonth));
     }
 
     /**