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

工资单反馈

This commit is contained in:
Harryxzy 2023-07-17 12:11:31 +08:00
parent 8221d4da69
commit e83302caac
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -477,8 +477,6 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
SalarySendPO salarySendPO = getSalarySendMapper().getById(salarySendInfo.getSalarySendId());
if(ObjectUtils.isEmpty(salarySendPO))
throw new SalaryRunTimeException("工资单不存在");
List<SalaryTemplatePO> salaryTemplates = getSalaryTemplateService(user).getDefaultTemplates(Collections.singletonList(salarySendPO.getSalarySobId()));
Integer ackFeedbackStatus = salaryTemplates.get(0).getAckFeedbackStatus();
// 更新查看状态
if (salarySendInfo.getBillReadStatus() == null || NumberUtils.compare(salarySendInfo.getBillReadStatus(),BillReadStatusEnum.UNREAD.getValue()) == 0) {
salarySendInfo.setBillReadStatus(BillReadStatusEnum.READED.getValue());
@ -609,10 +607,9 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
map.put("salaryTemplate", salaryTemplate);
map.put("salaryAcctResult", salaryAcctResultS);
// 工资单发送人、是否已确认
if (ackFeedbackStatus!=null && NumberUtils.compare(ackFeedbackStatus,1) == 0) {
if (NumberUtils.compare(salaryTemplate.getAckFeedbackStatus(),1) == 0) {
map.put("confirmStatus", salarySendInfo.getBillConfirmStatus() == null ? "0" : salarySendInfo.getBillConfirmStatus().toString());
map.put("sendEmployeeId", salarySendInfo.getSendEmployeeId());
map.put("feedbackWorkflowUrl",salaryTemplates.get(0).getFeedbackUrl());
}else{
map.put("confirmStatus", "1");
}