diff --git a/src/com/engine/salary/biz/SIAccountBiz.java b/src/com/engine/salary/biz/SIAccountBiz.java index 37c379404..c29c2c39c 100644 --- a/src/com/engine/salary/biz/SIAccountBiz.java +++ b/src/com/engine/salary/biz/SIAccountBiz.java @@ -1304,8 +1304,8 @@ public class SIAccountBiz extends Service { updateBatchAccount(AccountParam.builder().billMonth(param.get(0).getBillMonth()).paymentOrganization(param.get(0).getPaymentOrganization()).build(), employeeId, SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY, currentUserName); } - public void file(String billMonth, Long employeeId) { - // TODO 归档前检查是否有核算异常 + public void file(String billMonth, Long employeeId, Long paymentOrganization) { + // 归档前检查是否有核算异常 // List insuranceAccountInspectPOS = MapperProxyFactory.getProxy(InsuranceAccountInspectMapper.class).getByInspectStatusAndBillMonth(InspectStatusEnum.IGNORE.getValue(),billMonth); // SalaryAssert.isEmpty(insuranceAccountInspectPOS, SalaryI18nUtil.getI18nLabel( 100500, "当前核算月存在核算异常数据")); @@ -1315,6 +1315,7 @@ public class SIAccountBiz extends Service { SalaryAssert.notNull(insuranceAccountBatchPO, SalaryI18nUtil.getI18nLabel(100503, "月份账单不存在")); SalaryAssert.isFalse(insuranceAccountBatchPO.getBillStatus() == BillStatusEnum.ARCHIVED.getValue(), SalaryI18nUtil.getI18nLabel(100504, "月份账单已归档")); insuranceAccountBatchPO.setBillStatus(BillStatusEnum.ARCHIVED.getValue()); + insuranceAccountBatchPO.setPaymentOrganization(paymentOrganization); MapperProxyFactory.getProxy(InsuranceAccountBatchMapper.class).updateById(insuranceAccountBatchPO); //日志记录 // LoggerContext insuranceSchemeContext = new LoggerContext(); diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.xml b/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.xml index 45a04a850..f14797538 100644 --- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.xml +++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.xml @@ -214,6 +214,9 @@ bill_status=#{billStatus} WHERE id = #{id} AND delete_type = 0 + + AND payment_organization = #{paymentOrganization} + diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml index 5a3a79acf..d970f1cc6 100644 --- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml +++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml @@ -340,8 +340,10 @@ FROM hrsa_bill_detail WHERE delete_type = 0 AND bill_month = #{billMonth} - AND payment_organization = #{paymentOrganization} - AND bill_status = 0 + AND bill_status = 0 + + AND payment_organization = #{paymentOrganization} + diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java index 4f9523897..6234346dd 100644 --- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java @@ -341,7 +341,6 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { public void deleteSummplementaryAccount(List supplementAccountBaseParams) { Long employeeId = (long)user.getUID(); String currentUserName = user.getLastname(); - getSiAccountBiz(user).deleteSupplementaryAccount(supplementAccountBaseParams,employeeId,currentUserName); } @@ -349,7 +348,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { public void file(AccountParam accountParam) { Long employeeId = (long)user.getUID(); String billMonth = accountParam.getBillMonth(); - getSiAccountBiz(user).file(billMonth,employeeId); + getSiAccountBiz(user).file(billMonth,employeeId, accountParam.getPaymentOrganization()); } @Override