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

薪酬系统-社保福利台账-核算-删除功能优化

This commit is contained in:
sy 2022-09-22 14:49:12 +08:00
parent 83d5533322
commit 3452f9ab96
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/engine/salary/biz/SIAccountBiz.java
View File

@ -365,7 +365,8 @@ public class SIAccountBiz extends Service {
try {
List<InsuranceAccountDetailTempPO> list = MapperProxyFactory.getProxy(SIAccountDetailTempMapper.class).getListByEmployeeIdsAndBillMonth(ids, billMonth, param.getPaymentOrganization());
InsuranceAccountDetailTempPOEncrypt.decryptInsuranceAccountDetailTempPOList(list);
getInsuranceAccountDetailMapper().batchDelAccountDetails(ids, billMonth, param.getPaymentOrganization());
Integer paymentStatus = 0;
getInsuranceAccountDetailMapper().batchDelAccountDetails(ids, billMonth, param.getPaymentOrganization(), paymentStatus);
List<InsuranceAccountDetailPO> collect = list.stream().map(item -> {
InsuranceAccountDetailPO insuranceAccountDetailPO = new InsuranceAccountDetailPO();
BeanUtils.copyProperties(item, insuranceAccountDetailPO);
@ -1383,7 +1384,8 @@ public class SIAccountBiz extends Service {
public void deleteCommonAccount(SaveCommonAccountParam param, Long employeeId, String currentUserName) {
ValidUtil.doValidator(param);
SalaryAssert.notEmpty(param.getIncludes(), SalaryI18nUtil.getI18nLabel(84026, "参数错误"));
getInsuranceAccountDetailMapper().batchDelAccountDetails(param.getIncludes(), param.getBillMonth(), param.getPaymentOrganization());
Integer paymentStatus = 1;
getInsuranceAccountDetailMapper().batchDelAccountDetails(param.getIncludes(), param.getBillMonth(), param.getPaymentOrganization(), paymentStatus);
//记录日志
// LoggerContext insuranceSchemeContext = new LoggerContext();
// insuranceSchemeContext.setTargetId(String.join(",", param.getIncludes().stream().map(item -> String.valueOf(item)).collect(Collectors.toList())));

2
src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.java
View File

@ -52,7 +52,7 @@ public interface InsuranceAccountDetailMapper {
/**
* 批量删除
*/
void batchDelAccountDetails(@Param("employeeIds") Collection<Long> employeeIds, @Param("billMonth") String billMonth, @Param("paymentOrganization") Long paymentOrganization);
void batchDelAccountDetails(@Param("employeeIds") Collection<Long> employeeIds, @Param("billMonth") String billMonth, @Param("paymentOrganization") Long paymentOrganization, @Param("paymentStatus") Integer paymentStatus);
/**
* 批量保存

1
src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml
View File

@ -434,6 +434,7 @@
UPDATE hrsa_bill_detail
SET delete_type = 1
WHERE delete_type = 0
AND payment_status = #{paymentStatus}
AND bill_month = #{billMonth}
AND payment_organization = #{paymentOrganization}
<if test="employeeIds != null and employeeIds.size()>0">