diff --git a/src/com/engine/salary/biz/SIAccountBiz.java b/src/com/engine/salary/biz/SIAccountBiz.java index 3959bde8a..53c4ff019 100644 --- a/src/com/engine/salary/biz/SIAccountBiz.java +++ b/src/com/engine/salary/biz/SIAccountBiz.java @@ -410,7 +410,7 @@ public class SIAccountBiz extends Service { /*}*/ List> partition = Lists.partition((List) ids, 100); partition.forEach(part -> { - getSIAccountDetailTempMapper().batchDelByEmpIdsAndMonthAndPayOrg(part, param.getBillMonth(), param.getPaymentOrganization()); + getSIAccountDetailTempMapper().batchDelByEmpIdsAndMonthAndPayOrg(part, param.getBillMonth(), param.getPaymentOrganization(), null); }); log.info("更新福利核算进度······"); getSalaryAcctProgressService(user).finish(SalaryCacheKey.ACCT_PROGRESS + param.getBillMonth(), true); @@ -515,7 +515,7 @@ public class SIAccountBiz extends Service { //临时表入库前先对(可能存在的)历史数据进行删除 List> partition = Lists.partition((List) ids, 100); partition.forEach(part -> { - getSIAccountDetailTempMapper().batchDelByEmpIdsAndMonthAndPayOrg(part, billMonth, paymentOrganization); + getSIAccountDetailTempMapper().batchDelByEmpIdsAndMonthAndPayOrg(part, billMonth, paymentOrganization, null); }); //临时表数据入库 if (CollectionUtils.isNotEmpty(list)) { diff --git a/src/com/engine/salary/entity/auth/param/FsdSocialDetailAuthParam.java b/src/com/engine/salary/entity/auth/param/FsdSocialDetailAuthParam.java new file mode 100644 index 000000000..ee75e7286 --- /dev/null +++ b/src/com/engine/salary/entity/auth/param/FsdSocialDetailAuthParam.java @@ -0,0 +1,19 @@ +package com.engine.salary.entity.auth.param; + + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class FsdSocialDetailAuthParam { + + private Long paymentOrganization; + + private String fsdSbjndw; + +} diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.java b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.java index c0f75f05d..f7ef90fe5 100644 --- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.java +++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.java @@ -199,5 +199,5 @@ public interface InsuranceAccountDetailMapper { */ void deleteByIds(@Param("ids")List ids); - void deleteByEmpIds(@Param("employeeIds")List deleteEmployeeIds, @Param("billMonth") String billMonth, @Param("paymentOrganization") Long paymentOrganization); + void deleteByEmpIds(@Param("employeeIds")List deleteEmployeeIds, @Param("billMonth") String billMonth, @Param("paymentOrganization") Long paymentOrganization, @Param("fsdSbjndw") String fsdSbjndw); } diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml index 857d4bcd1..2d18534b0 100644 --- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml +++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml @@ -1611,6 +1611,9 @@ #{employeeId} + + AND fsd_sbjndw = #{fsdSbjndw} +