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

薪资所属年变量

This commit is contained in:
钱涛 2024-10-25 16:01:45 +08:00
parent c0de305c3d
commit 71569cad9e
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java
View File

@ -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));
}
// /**

5
src/com/engine/salary/enums/salarybill/SalaryTemplateVarEnum.java
View File

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

6
src/com/engine/salary/service/impl/SalarySendServiceImpl.java
View File

@ -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));
}
/**