From 3452f9ab96cde85878df6d86789fda12c8606fc0 Mon Sep 17 00:00:00 2001 From: sy Date: Thu, 22 Sep 2022 14:49:12 +0800 Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-=E7=A4=BE?= =?UTF-8?q?=E4=BF=9D=E7=A6=8F=E5=88=A9=E5=8F=B0=E8=B4=A6-=E6=A0=B8?= =?UTF-8?q?=E7=AE=97-=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/biz/SIAccountBiz.java | 6 ++++-- .../mapper/siaccount/InsuranceAccountDetailMapper.java | 2 +- .../mapper/siaccount/InsuranceAccountDetailMapper.xml | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/com/engine/salary/biz/SIAccountBiz.java b/src/com/engine/salary/biz/SIAccountBiz.java index c273c5b75..090ead9ec 100644 --- a/src/com/engine/salary/biz/SIAccountBiz.java +++ b/src/com/engine/salary/biz/SIAccountBiz.java @@ -365,7 +365,8 @@ public class SIAccountBiz extends Service { try { List 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 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()))); diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.java b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.java index 6c4e7ef84..0205a6886 100644 --- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.java +++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.java @@ -52,7 +52,7 @@ public interface InsuranceAccountDetailMapper { /** * 批量删除 */ - void batchDelAccountDetails(@Param("employeeIds") Collection employeeIds, @Param("billMonth") String billMonth, @Param("paymentOrganization") Long paymentOrganization); + void batchDelAccountDetails(@Param("employeeIds") Collection employeeIds, @Param("billMonth") String billMonth, @Param("paymentOrganization") Long paymentOrganization, @Param("paymentStatus") Integer paymentStatus); /** * 批量保存 diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml index 6cffb2c10..6c72d255c 100644 --- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml +++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml @@ -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}