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

fix 工资单反馈bug

This commit is contained in:
Harryxzy 2023-07-12 11:25:44 +08:00
parent 56c1666542
commit 58fe219cdb
3 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/salary/enums/salarybill/BillConfimStatusEnum.java
View File

@ -14,7 +14,7 @@ public enum BillConfimStatusEnum implements BaseEnum<Integer> {
UNCONFIRMED(0, "未确认", 93286),
CONFIRMED(1, "已确认", 93212),
AUTOCONFIRMED(3, "自动确认", 93212);
AUTOCONFIRMED(2, "自动确认", 93212);
private final int value;

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

@ -614,13 +614,16 @@
delete_type = #{po.deleteType},
</if>
<if test="po.salaryTemplate != null">
salary_template = #{po.salaryTemplate}
salary_template = #{po.salaryTemplate},
</if>
<if test="po.billReadStatus != null">
bill_read_status = #{po.billReadStatus}
bill_read_status = #{po.billReadStatus},
</if>
<if test="po.billConfirmStatus != null">
bill_confirm_status = #{po.billConfirmStatus}
bill_confirm_status = #{po.billConfirmStatus},
</if>
<if test="po.sendEmployeeId != null">
send_employee_id = #{po.sendEmployeeId}
</if>
</set>
@ -771,7 +774,7 @@
<update id="autoConfirmSalaryBill">
UPDATE hrsa_salary_send_info
set
confirm_status = 2
bill_confirm_status = 2
where
delete_type = 0
<if test="ids != null and ids.size() > 0">

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

@ -482,10 +482,13 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
}
SalarySendInfoPO salarySendInfo = salarySendInfos.get(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);
SalarySysConfPO feedbackPO = getSalarySysConfService(user).getOneByCode(SalarySysConstant.SALARY_SEND_FEEDBACK);
if (feedbackPO != null && StringUtils.equals(feedbackPO.getConfValue(),"1")){
if(salarySendInfo.getBillReadStatus() == null || NumberUtils.compare(salarySendInfo.getBillReadStatus(),BillReadStatusEnum.UNREAD.getValue()) == 0 ){
salarySendInfo.setBillReadStatus(BillReadStatusEnum.READED.getValue());
salarySendInfo.setUpdateTime(new Date());
getSalarySendInfoMapper().updateIgnoreNull(salarySendInfo);
}
}
// List<SalarySendPO> salarySends = new LambdaQueryChainWrapper<>(mapper)
// .eq(SalarySendPO::getDeleteType, 0)
@ -611,11 +614,16 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
map.put("salaryTemplate", salaryTemplate);
map.put("salaryAcctResult", salaryAcctResultS);
// 工资单发送人、是否已确认
map.put("confirmStatus", salarySendInfo.getBillConfirmStatus() == null ? "0" : salarySendInfo.getBillConfirmStatus().toString());
map.put("sendEmployeeId", salarySendInfo.getSalarySendId());
BaseBean baseBean = new BaseBean();
String workFlowId = baseBean.getPropValue("hrmSalary", "feedbackWorkflowId");
map.put("feedbackWorkflowId",workFlowId);
if (feedbackPO != null && StringUtils.equals(feedbackPO.getConfValue(),"1")){
map.put("confirmStatus", salarySendInfo.getBillConfirmStatus() == null ? "0" : salarySendInfo.getBillConfirmStatus().toString());
map.put("sendEmployeeId", salarySendInfo.getSalarySendId());
BaseBean baseBean = new BaseBean();
String workFlowId = baseBean.getPropValue("hrmSalary", "feedbackWorkflowId");
map.put("feedbackWorkflowId",workFlowId);
}else{
map.put("confirmStatus", "1");
}
return map;
}
@ -1616,7 +1624,11 @@ public class SalarySendServiceImpl extends Service implements SalarySendService
@Override
public List<SalarySendInfoPO> listAllUnConfirmedSendInfo() {
return getSalarySendInfoMapper().listSome(SalarySendInfoPO.builder().billConfirmStatus(BillConfimStatusEnum.UNCONFIRMED.getValue()).build());
return getSalarySendInfoMapper().listSome(
SalarySendInfoPO.builder()
.billConfirmStatus(BillConfimStatusEnum.UNCONFIRMED.getValue())
.sendStatus(1)
.build());
}
@Override