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

Merge branch 'feature/230701-工资单反馈' into release/2.9.2.2307.02

This commit is contained in:
Harryxzy 2023-07-19 16:18:52 +08:00
parent a144b88f6c 311aa8f139
commit ca0d800bab
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -475,8 +475,9 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
SalarySendInfoPO salarySendInfo = salarySendInfos.get(0);
// 获取默认模板信息
SalarySendPO salarySendPO = getSalarySendMapper().getById(salarySendInfo.getSalarySendId());
if(ObjectUtils.isEmpty(salarySendPO))
if(ObjectUtils.isEmpty(salarySendPO)){
throw new SalaryRunTimeException("工资单不存在");
}
// 更新查看状态
if (salarySendInfo.getBillReadStatus() == null || NumberUtils.compare(salarySendInfo.getBillReadStatus(),BillReadStatusEnum.UNREAD.getValue()) == 0) {
salarySendInfo.setBillReadStatus(BillReadStatusEnum.READED.getValue());
@ -661,11 +662,13 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
PageInfo<SalarySendInfoListDTO> pageInfo = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(),
page, SalarySendInfoListDTO.class);
SalarySendPO salarySendPO = getSalarySendMapper().getById(queryParam.getSalarySendId());
if (ObjectUtils.isEmpty(salarySendPO))
if (ObjectUtils.isEmpty(salarySendPO)){
throw new SalaryRunTimeException("工资单不存在或已被删除");
}
List<SalaryTemplatePO> salaryTemplates = getSalaryTemplateService(user).getDefaultTemplates(Collections.singletonList(salarySendPO.getSalarySobId()));
if(CollectionUtils.isEmpty(salaryTemplates))
if(CollectionUtils.isEmpty(salaryTemplates)){
throw new SalaryRunTimeException("请先设置工资单模板");
}
Integer ackFeedbackStatus = salaryTemplates.get(0).getAckFeedbackStatus();
if (ackFeedbackStatus!=null && NumberUtils.compare(ackFeedbackStatus,1) == 0) {
// 默认为空时，未读未确认