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

薪酬系统-二开，上海港湾-多语言，拉取多语言1201分支，处理冲突

This commit is contained in:
sy 2023-12-13 17:17:57 +08:00
parent 6c5e4ec456
commit be3ad3b47b
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java
View File

@ -84,7 +84,7 @@ public class SalaryAcctRecordBO {
btnList.add(new WeaTableOperate(SalaryI18nUtil.getI18nLabel(user.getLanguage(),535052, "删除"), null, "1"));
}
btnList.add(new WeaTableOperate(SalaryI18nUtil.getI18nLabel(user.getLanguage(),251, "归档"), null, "2"));
} else if (SalaryAcctRecordStatusEnum.ARCHIVED == salaryAcctRecordStatusEnum && ( salarySendMap.get(salaryAcctRecordPO.getId()) ==Boolean.TRUE ) ){
} else if (SalaryAcctRecordStatusEnum.ARCHIVED == salaryAcctRecordStatusEnum && (salarySendMap.get(salaryAcctRecordPO.getId()).equals(Boolean.TRUE)) ){
btnList.add(new WeaTableOperate(SalaryI18nUtil.getI18nLabel(user.getLanguage(),33564, "查看"), null, "3"));
btnList.add(new WeaTableOperate(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542637, "重新核算"), null, "5"));
btnList.add(new WeaTableOperate(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542638, "回算"), null, "4"));
@ -108,7 +108,7 @@ public class SalaryAcctRecordBO {
.accountantName(usernameMap.getOrDefault(salaryAcctRecordPO.getCreator(), StringUtils.EMPTY))
.updateTime(SalaryDateUtil.getFormatLocalDateTime(salaryAcctRecordPO.getUpdateTime()))
.description(salaryAcctRecordPO.getDescription())
.workFlowStatus(workflowStatusEnum.getDefaultLabel())
.workFlowStatus(SalaryI18nUtil.getI18nLabel(user.getLanguage(),workflowStatusEnum.getLabelId(), workflowStatusEnum.getDefaultLabel()))
.operate(btnList)
.build();
}).collect(Collectors.toList());

2
src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
View File

@ -900,7 +900,7 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe
public void setApprovalRequestId(SalaryAcctRecordReAccountParam param) {
SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordMapper().getById(param.getSalaryAcctRecordId());
if (ObjectUtil.isEmpty(salaryAcctRecordPO)) {
throw new SalaryRunTimeException("薪资核算记录不存在或已被删除");
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542300, "薪资核算记录不存在或已被删除"));
}
salaryAcctRecordPO.setApprovalRequestId(param.getApprovalRequestId());
salaryAcctRecordPO.setUpdateTime(new Date());

2
src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
View File

@ -1096,7 +1096,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
public Map<String, Object> sumForWorkflow(SalaryAcctResultQueryParam param) {
SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordService(user).getById(param.getSalaryAcctRecordId());
if (ObjectUtil.isEmpty(salaryAcctRecordPO)) {
throw new SalaryRunTimeException("薪资核算记录不存在或已被删除");
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542300, "薪资核算记录不存在或已被删除"));
}
BaseBean baseBean = new BaseBean();
String fieldNameStr = baseBean.getPropValue("shgwSalary", "fieldName");

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

@ -1494,7 +1494,7 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
// 1.工作簿名称
String sheetName = SalaryI18nUtil.getI18nLabel(user.getLanguage(),542417, "工资单发放信息");
List<Object> header = new ArrayList<>();
header.add(SalaryI18nUtil.getI18nLabel(user.getLanguage(),85429, "姓名"));
header.add(SalaryI18nUtil.getI18nLabel(user.getLanguage(),25034, "姓名"));
header.add(SalaryI18nUtil.getI18nLabel(user.getLanguage(),537996, "个税扣缴义务人"));
header.add(SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"));
header.add(SalaryI18nUtil.getI18nLabel(user.getLanguage(),125238, "手机号"));