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

富士达bug修复

This commit is contained in:
Harryxzy 2025-03-14 14:36:21 +08:00
parent 62c43dd42b
commit 8eebb84002
6 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1342,10 +1342,10 @@ public class SIAccountBiz extends Service {
// throw new SalaryRunTimeException("个税扣缴义务人为空");
// }
getInsuranceAccountBatchMapper().deleteById(insuranceAccountBatchPO.getId());
getInsuranceAccountDetailMapper().batchDeleteNotFile(param.getBillMonth(), param.getPaymentOrganization());
getInsuranceAccountDetailMapper().batchDeleteNotFile(param.getBillMonth(), param.getPaymentOrganization(), param.getFsdSbjndw());
//删除账单月份+个税扣缴义务人下的调差数据
getInsuranceCompensationMapper().deleteByBillMonthAndPayOrg(param.getBillMonth(), param.getPaymentOrganization());
getInsuranceCompensationMapper().deleteByBillMonthAndPayOrg(param.getBillMonth(), param.getPaymentOrganization(), param.getFsdSbjndw());
// LoggerContext insuranceSchemeContext = new LoggerContext();
// insuranceSchemeContext.setTargetId(String.valueOf(insuranceAccountBatchPO.getId()));
// insuranceSchemeContext.setTargetName(insuranceAccountBatchPO.getBillMonth());

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

@ -136,7 +136,7 @@ public interface InsuranceAccountDetailMapper {
*
* @param billMonth
*/
void batchDeleteNotFile(@Param("billMonth") String billMonth, @Param("paymentOrganization") Long paymentOrganization);
void batchDeleteNotFile(@Param("billMonth") String billMonth, @Param("paymentOrganization") Long paymentOrganization, @Param("fsdSbjndw") String fsdSbjndw);
/**

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

@ -831,6 +831,9 @@
<if test="paymentOrganization != null">
AND payment_organization = #{paymentOrganization}
</if>
<if test="fsdSbjndw != null and fsdSbjndw != ''">
AND fsd_sbjndw = #{fsdSbjndw}
</if>
</delete>

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

@ -23,7 +23,7 @@ public interface InsuranceCompensationMapper {
void deleteById(Long id);
void deleteByBillMonthAndPayOrg(@Param("billMonth") String billMonth, @Param("paymentOrganization") Long paymentOrganization);
void deleteByBillMonthAndPayOrg(@Param("billMonth") String billMonth, @Param("paymentOrganization") Long paymentOrganization, @Param("fsdSbjndw") String fsdSbjndw);
void deleteByBillMonthPayOrgEmpIds(InsuranceCompensationPO insuranceCompensationPO);
}

3
src/com/engine/salary/mapper/siaccount/InsuranceCompensationMapper.xml
View File

@ -267,6 +267,9 @@
WHERE bill_month = #{billMonth}
AND payment_organization = #{paymentOrganization}
AND delete_type = 0
<if test="fsdSbjndw != null and fsdSbjndw != ''">
AND fsd_sbjndw = #{fsdSbjndw}
</if>
</delete>
<delete id="deleteByBillMonthPayOrgEmpIds" parameterType="com.engine.salary.entity.siaccount.po.InsuranceCompensationPO">

4
src/com/engine/salary/service/impl/SIAccountServiceImpl.java
View File

@ -6114,9 +6114,9 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
// throw new SalaryRunTimeException("个税扣缴义务人为空");
// }
getInsuranceAccountBatchMapper().deleteById(insuranceAccountBatchPO.getId());
getInsuranceAccountDetailMapper().batchDeleteNotFile(param.getBillMonth(), param.getPaymentOrganization());
getInsuranceAccountDetailMapper().batchDeleteNotFile(param.getBillMonth(), param.getPaymentOrganization(), param.getFsdSbjndw());
//删除账单月份+个税扣缴义务人下的调差数据
getInsuranceCompensationMapper().deleteByBillMonthAndPayOrg(param.getBillMonth(), param.getPaymentOrganization());
getInsuranceCompensationMapper().deleteByBillMonthAndPayOrg(param.getBillMonth(), param.getPaymentOrganization(), param.getFsdSbjndw());
//记录操作日志
TaxAgentPO taxAgentInfo = getTaxAgentMapper().getById(insuranceAccountBatchPO.getPaymentOrganization());
LoggerContext<InsuranceAccountBatchPO> loggerContext = new LoggerContext();