diff --git a/src/com/engine/salary/enums/salarybill/BillConfimStatusEnum.java b/src/com/engine/salary/enums/salarybill/BillConfimStatusEnum.java index 112c86034..89ca4e758 100644 --- a/src/com/engine/salary/enums/salarybill/BillConfimStatusEnum.java +++ b/src/com/engine/salary/enums/salarybill/BillConfimStatusEnum.java @@ -14,7 +14,7 @@ public enum BillConfimStatusEnum implements BaseEnum { UNCONFIRMED(0, "未确认", 93286), CONFIRMED(1, "已确认", 93212), - AUTOCONFIRMED(3, "自动确认", 93212); + AUTOCONFIRMED(2, "自动确认", 93212); private final int value; diff --git a/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml b/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml index e7f192a15..506afd10c 100644 --- a/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml +++ b/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml @@ -614,13 +614,16 @@ delete_type = #{po.deleteType}, - salary_template = #{po.salaryTemplate} + salary_template = #{po.salaryTemplate}, - bill_read_status = #{po.billReadStatus} + bill_read_status = #{po.billReadStatus}, - bill_confirm_status = #{po.billConfirmStatus} + bill_confirm_status = #{po.billConfirmStatus}, + + + send_employee_id = #{po.sendEmployeeId} @@ -771,7 +774,7 @@ UPDATE hrsa_salary_send_info set - confirm_status = 2 + bill_confirm_status = 2 where delete_type = 0 diff --git a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java index 93cc03be8..b0da29ed7 100644 --- a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java @@ -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 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 listAllUnConfirmedSendInfo() { - return getSalarySendInfoMapper().listSome(SalarySendInfoPO.builder().billConfirmStatus(BillConfimStatusEnum.UNCONFIRMED.getValue()).build()); + return getSalarySendInfoMapper().listSome( + SalarySendInfoPO.builder() + .billConfirmStatus(BillConfimStatusEnum.UNCONFIRMED.getValue()) + .sendStatus(1) + .build()); } @Override