|
|
@@ -1566,7 +1566,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
// 执行更新
|
|
|
baseMapper.update(null, incomeUpdateWrapper);
|
|
|
}
|
|
|
- return insPlyIncomeInvoiceSettlementMapper.deleteById(id) > 0;
|
|
|
+ return insPlyIncomeInvoiceSettlementMapper.deleteById(settlementId) > 0;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -3822,8 +3822,8 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
@Override
|
|
|
public void exportReceiverSettlementReportExcel(Page page, SettlementReportQueryVo settlementReportQueryVo) {
|
|
|
settlementReportQueryVo.setSystemCode(baseController.getSystemCode());
|
|
|
- // TODO 这里需要进行调整 2026年6月22日15:38:02
|
|
|
- Page<ReceiverSettlementReportDto> receiverSettlementReport = baseMapper.getReceiverSettlementReport(page, settlementReportQueryVo);
|
|
|
+ // modify by lipf 2026年6月22日16:24:15 无法通过一个sql查询出所有要求的数据, 只能通过多个sql对数据进行聚合
|
|
|
+ Page<ReceiverSettlementReportDto> receiverSettlementReport = this.receiverSettlementReport(page, settlementReportQueryVo);
|
|
|
List<ReceiverSettlementReportDto> receiverSettlementReportDtos = receiverSettlementReport.getRecords();
|
|
|
EasyExcelUtils.exportForWeb(ServletUtils.getResponse(), ReceiverSettlementReportDto.class, receiverSettlementReportDtos, "对接人结算报表");
|
|
|
}
|