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

工资单确认反馈优化

This commit is contained in:
Harryxzy 2024-02-19 10:09:49 +08:00
parent 2331ef354e
commit 7fe03ac7a1
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/salary/entity/salaryBill/bo/SalaryTemplateBO.java
View File

@ -78,7 +78,7 @@ public class SalaryTemplateBO {
.autoSendDayOfMonth(saveParam.getAutoSendDayOfMonth())
.autoSendTimeOfDay(saveParam.getAutoSendTimeOfDay())
.ackFeedbackStatus(saveParam.getAckFeedbackStatus()?1:0)
.ackFeedbackStatus(saveParam.getFeedbackStatus()?1:0)
.feedbackStatus(saveParam.getFeedbackStatus()?1:0)
.autoAckDays(saveParam.getAutoAckDays())
.feedbackUrl(saveParam.getFeedbackUrl())
.mobileFeedbackUrl(saveParam.getMobileFeedbackUrl())

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

@ -97,7 +97,7 @@ public class SalaryBillBaseSetServiceImpl extends Service implements SalaryBillB
SalaryBillAckFeedbackDTO ackFeedbackSetting = saveParam.getAckFeedbackSetting();
// 1.保存确认反馈开关状态
getSalarySysConfService(user).saveSettingByType(ackFeedbackSetting.getAckStatus(), SALARY_SEND_FEEDBACK, "工资单确认状态", "billSend");
getSalarySysConfService(user).saveSettingByType(ackFeedbackSetting.getAckStatus(), SALARY_SEND_FEEDBACK_FK, "工资单反馈状态", "billSend");
getSalarySysConfService(user).saveSettingByType(ackFeedbackSetting.getFeedbackStatus(), SALARY_SEND_FEEDBACK_FK, "工资单反馈状态", "billSend");
if (StringUtils.equals(ackFeedbackSetting.getAckStatus(), "1")) {
// 保存自动确认时间
getSalarySysConfService(user).saveSettingByType(ackFeedbackSetting.getAutoAckDays().toString(), SALARY_AUTO_ACK_DAYS, "工资单反馈自动确认", "billSend");

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

@ -866,10 +866,10 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
.replenishSalaryItemSetting(map.getOrDefault("replenishSalaryItemSetting", "").toString())
.build();
Object feedbackStatus = map.get("feedbackStatus");
if (feedbackStatus == null) {
if (feedbackStatus == null || StringUtils.isBlank(feedbackStatus.toString())) {
build.setFeedbackStatus(build.getAckFeedbackStatus());
} else {
Integer.valueOf(map.get("ackFeedbackStatus").toString());
build.setFeedbackStatus(Integer.valueOf(feedbackStatus.toString()));
}
return build;
}

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

@ -215,7 +215,7 @@ public class SalaryTemplateServiceImpl extends Service implements SalaryTemplate
salaryTemplateNew.setAutoSendStatus(saveParam.getAutoSendStatus() ? 1 : 0);
salaryTemplateNew.setAutoSendCycleType(saveParam.getAutoSendCycleType());
salaryTemplateNew.setAckFeedbackStatus(saveParam.getAckFeedbackStatus() ? 1 : 0);
salaryTemplateNew.setAckFeedbackStatus(saveParam.getFeedbackStatus() ? 1 : 0);
salaryTemplateNew.setFeedbackStatus(saveParam.getFeedbackStatus() ? 1 : 0);
salaryTemplateNew.setAutoAckDays(saveParam.getAutoAckDays());
salaryTemplateNew.setFeedbackUrl(saveParam.getFeedbackUrl());
salaryTemplateNew.setMobileFeedbackUrl(saveParam.getMobileFeedbackUrl());

2
src/com/engine/salary/wrapper/SalaryTemplateWrapper.java
View File

@ -169,7 +169,7 @@ public class SalaryTemplateWrapper extends Service {
if (po.getFeedbackStatus() == null) {
salaryTemplateBaseSetDTO.setFeedbackStatus(salaryTemplateBaseSetDTO.getAckFeedbackStatus());
} else {
salaryTemplateBaseSetDTO.setFeedbackStatus(NumberUtils.compare(po.getAckFeedbackStatus(), 1) == 0);
salaryTemplateBaseSetDTO.setFeedbackStatus(NumberUtils.compare(po.getFeedbackStatus(), 1) == 0);
}
salaryTemplateBaseSetDTO.setAutoAckDays(ObjectUtils.isEmpty(po.getAutoAckDays()) ? 7 : po.getAutoAckDays());