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 11:27:40 +08:00
parent 6279f0d8c9
commit 8221d4da69
5 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/engine/salary/entity/salaryBill/dto/SalaryTemplateShowSetDTO.java
View File

@ -55,20 +55,4 @@ public class SalaryTemplateShowSetDTO {
// 薪资项为0时不显示")
private Boolean salaryItemZeroStatus;
/**
* 工资单确认反馈状态
*/
private Boolean ackFeedbackStatus;
/**
* 自动确认超时天数
*/
private Integer autoAckDays;
/**
* 反馈流程地址
*
*/
private String feedbackUrl;
}

2
src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml
View File

@ -724,12 +724,12 @@
LEFT JOIN hrsa_salary_send s
ON t.salary_send_id = s.id
WHERE t.delete_type = 0
AND t.bill_confirm_status = 0
AND t.send_status = 1
AND s.salary_sob_id IN
<foreach collection="salarySobIds" separator="," item="salarySobId" open="(" close=")">
#{salarySobId}
</foreach>
AND (t.bill_confirm_status = 0 or bill_confirm_status is null)
</select>

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

@ -142,6 +142,7 @@ public class SalaryBillBaseSetServiceImpl extends Service implements SalaryBillB
// 未开启工资单确认
defaultAckFeedBackDTO.setAckStatus("0");
defaultAckFeedBackDTO.setAutoAckDays(0);
defaultAckFeedBackDTO.setFeedBackUrl("/");
return defaultAckFeedBackDTO;
}
defaultAckFeedBackDTO.setAckStatus(ackStatus);

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

@ -480,8 +480,7 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
List<SalaryTemplatePO> salaryTemplates = getSalaryTemplateService(user).getDefaultTemplates(Collections.singletonList(salarySendPO.getSalarySobId()));
Integer ackFeedbackStatus = salaryTemplates.get(0).getAckFeedbackStatus();
// 更新查看状态
if ( (ackFeedbackStatus!=null && NumberUtils.compare(ackFeedbackStatus,1) == 1)
&& (salarySendInfo.getBillReadStatus() == null || NumberUtils.compare(salarySendInfo.getBillReadStatus(),BillReadStatusEnum.UNREAD.getValue()) == 0)) {
if (salarySendInfo.getBillReadStatus() == null || NumberUtils.compare(salarySendInfo.getBillReadStatus(),BillReadStatusEnum.UNREAD.getValue()) == 0) {
salarySendInfo.setBillReadStatus(BillReadStatusEnum.READED.getValue());
salarySendInfo.setUpdateTime(new Date());
getSalarySendInfoMapper().updateIgnoreNull(salarySendInfo);
@ -610,7 +609,7 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
map.put("salaryTemplate", salaryTemplate);
map.put("salaryAcctResult", salaryAcctResultS);
// 工资单发送人、是否已确认
if (ackFeedbackStatus!=null && NumberUtils.compare(ackFeedbackStatus,1) == 1) {
if (ackFeedbackStatus!=null && NumberUtils.compare(ackFeedbackStatus,1) == 0) {
map.put("confirmStatus", salarySendInfo.getBillConfirmStatus() == null ? "0" : salarySendInfo.getBillConfirmStatus().toString());
map.put("sendEmployeeId", salarySendInfo.getSendEmployeeId());
map.put("feedbackWorkflowUrl",salaryTemplates.get(0).getFeedbackUrl());
@ -669,7 +668,7 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
throw new SalaryRunTimeException("工资单不存在或已被删除");
List<SalaryTemplatePO> salaryTemplates = getSalaryTemplateService(user).getDefaultTemplates(Collections.singletonList(salarySendPO.getSalarySobId()));
Integer ackFeedbackStatus = salaryTemplates.get(0).getAckFeedbackStatus();
if (ackFeedbackStatus!=null && NumberUtils.compare(ackFeedbackStatus,1) == 1) {
if (ackFeedbackStatus!=null && NumberUtils.compare(ackFeedbackStatus,1) == 0) {
// 默认为空时，未读未确认
pageInfo.getList().stream().forEach(obj -> {
SalarySendInfoListDTO dto = (SalarySendInfoListDTO) obj;
@ -769,6 +768,9 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
Map<String, Object> map = JsonUtil.parseMap(salaryTemplateContent, Object.class);
return SalaryTemplatePO.builder()
.id(Long.valueOf(map.getOrDefault("id", "0").toString()))
.ackFeedbackStatus(Integer.valueOf(map.getOrDefault("ackFeedbackStatus", "0").toString()))
.autoAckDays(Integer.valueOf(map.getOrDefault("autoAckDays", "0").toString()))
.feedbackUrl(map.getOrDefault("feedbackUrl", "").toString())
.name(map.getOrDefault("name", "").toString())
.salarySobId(Long.valueOf(map.getOrDefault("salarySobId", "0").toString()))
.useType(Integer.valueOf(map.getOrDefault("useType", "0").toString()))

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

@ -159,7 +159,7 @@ public class SalaryTemplateWrapper extends Service {
salaryTemplateBaseSetDTO.setSalarySob(po.getSalarySobId());
salaryTemplateBaseSetDTO.setSendEmail(po.getSendEmailId());
salaryTemplateBaseSetDTO.setAutoSendStatus(po.getAutoSendStatus() == null ? false : po.getAutoSendStatus().equals(SalaryTemplateWhetherEnum.TRUE.getValue()));
salaryTemplateBaseSetDTO.setAckFeedbackStatus(po.getAckFeedbackStatus() == null ? false : NumberUtils.compare(po.getAckFeedbackStatus(), 1) == 1);
salaryTemplateBaseSetDTO.setAckFeedbackStatus(po.getAckFeedbackStatus() == null ? false : NumberUtils.compare(po.getAckFeedbackStatus(), 1) == 0);
salaryTemplateBaseSetDTO.setAutoAckDays(ObjectUtils.isEmpty(po.getAutoAckDays()) ? 7 : po.getAutoAckDays());
// 规则赋值 如果为ALL传“” 如果为byRule传薪资项目ID
salaryTemplateBaseSetDTO.setReplenishRule(SalaryTemplateReplenishRuleEnum.ALL.getValue().equals(po.getReplenishRule()) ? "" : po.getReplenishRule());
@ -229,8 +229,6 @@ public class SalaryTemplateWrapper extends Service {
salaryTemplateShowSetDTO.setTextContentPosition(po.getTextContentPosition().toString());
salaryTemplateShowSetDTO.setSalaryItemNullStatus(po.getSalaryItemNullStatus().equals(SalaryTemplateWhetherEnum.TRUE.getValue()));
salaryTemplateShowSetDTO.setSalaryItemZeroStatus(po.getSalaryItemZeroStatus().equals(SalaryTemplateWhetherEnum.TRUE.getValue()));
salaryTemplateShowSetDTO.setAckFeedbackStatus(po.getAckFeedbackStatus() != null && NumberUtils.compare(po.getAckFeedbackStatus(),1) == 1);
salaryTemplateShowSetDTO.setAutoAckDays(ObjectUtils.isEmpty(po.getAutoAckDays()) ? 7 : po.getAutoAckDays());
}
Map<String, Object> salaryTemplateShowSet = new HashMap<>();