|
|
@@ -589,6 +589,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
|
|
|
@Override
|
|
|
public List<InsPlyIncome> getReceivableList(ReceivableQueryVo receivableQueryVo) {
|
|
|
+ receivableQueryVo.setSystemCode(baseController.getSystemCode());
|
|
|
// modify by lipf, 和查询调用同一个查询mapper,并且将分页参数进行调整 2026年6月9日10:03:13
|
|
|
receivableQueryVo.setPages(1);
|
|
|
receivableQueryVo.setSize(Integer.MAX_VALUE);
|
|
|
@@ -2576,6 +2577,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
if("30".equals(invoiceRecordQueryVo.getSettlementStatus())){
|
|
|
invoiceRecordQueryVo.setSettlementStatus(null);
|
|
|
}
|
|
|
+ invoiceRecordQueryVo.setSystemCode(baseController.getSystemCode());
|
|
|
Page<InvoiceRecordResult> invoiceRecordList = baseMapper.getInvoiceRecordList(invoiceRecordQueryVo.getPage(), invoiceRecordQueryVo);
|
|
|
List<InvoiceRecordResult> records = invoiceRecordList.getRecords();
|
|
|
if(CollUtil.isNotEmpty(records)){
|
|
|
@@ -2669,6 +2671,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
@Override
|
|
|
public void exportSuperviseJyExcel(ReceivableQueryVo receivableQueryVo) throws IOException {
|
|
|
verifyUploadPath();
|
|
|
+ receivableQueryVo.setSystemCode(baseController.getSystemCode());
|
|
|
List<ExportSuperviseJyExcelDto> exportSuperviseJyExcelDtos = baseMapper.getSuperviseJyExcelDtos(receivableQueryVo);
|
|
|
exportSuperviseJyExcelDtos.forEach(dto -> {
|
|
|
switch (dto.getEntryStatus()) {
|
|
|
@@ -2691,6 +2694,8 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
log.info("查询结算手续费结算记录:settlementQueryVo=[{}]", JSONUtil.toJsonStr(settlementQueryVo));
|
|
|
// 设置空条件
|
|
|
setNoneCondition(settlementQueryVo);
|
|
|
+ // 设置租户
|
|
|
+ settlementQueryVo.setSystemCode(baseController.getSystemCode());
|
|
|
Page<ExportSuperviseSettlementExcelDto> exportSuperviseSettlementExcelDtos = baseMapper.superviseSettlementExcelDtos(page, settlementQueryVo);
|
|
|
// 补充、转换列表的数据
|
|
|
supplementaryListData(exportSuperviseSettlementExcelDtos);
|
|
|
@@ -2708,6 +2713,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
log.info("查询平台结算记录:settlementQueryVo=[{}]", JSONUtil.toJsonStr(settlementQueryVo));
|
|
|
// 设置空条件
|
|
|
setNoneCondition(settlementQueryVo);
|
|
|
+ settlementQueryVo.setSystemCode(baseController.getSystemCode());
|
|
|
Page<ExportSuperviseSettlementExcelDto> exportSuperviseSettlementExcelDtos = baseMapper.platformSettlementExcelDtos(page, settlementQueryVo);
|
|
|
// 补充、转换列表的数据
|
|
|
supplementaryListData(exportSuperviseSettlementExcelDtos);
|
|
|
@@ -2725,6 +2731,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
log.info("查询平台结算记录:settlementQueryVo=[{}]", JSONUtil.toJsonStr(settlementQueryVo));
|
|
|
// 设置空条件
|
|
|
setNoneCondition(settlementQueryVo);
|
|
|
+ settlementQueryVo.setSystemCode(baseController.getSystemCode());
|
|
|
Page<ExportSuperviseSettlementExcelDto> exportSuperviseSettlementExcelDtos = baseMapper.followSettlementExcelDtos(page, settlementQueryVo);
|
|
|
// 补充、转换列表的数据
|
|
|
supplementaryListData(exportSuperviseSettlementExcelDtos);
|
|
|
@@ -2796,6 +2803,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
@Override
|
|
|
public void exportSuperviseSettlementExcel(Page page, SettlementQueryVo settlementQueryVo) throws IOException {
|
|
|
verifyUploadPath();
|
|
|
+ settlementQueryVo.setSystemCode(baseController.getSystemCode());
|
|
|
Page<ExportSuperviseSettlementExcelDto> exportSuperviseSettlementExcelDtos = baseMapper.superviseSettlementExcelDtos(page, settlementQueryVo);
|
|
|
// 补充、转换列表的数据
|
|
|
supplementaryListData(exportSuperviseSettlementExcelDtos);
|
|
|
@@ -2812,6 +2820,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
@Override
|
|
|
public void exportPlatformSettlementExcel(Page page, SettlementQueryVo settlementQueryVo) throws IOException {
|
|
|
verifyUploadPath();
|
|
|
+ settlementQueryVo.setSystemCode(baseController.getSystemCode());
|
|
|
Page<ExportSuperviseSettlementExcelDto> exportSuperviseSettlementExcelDtos = baseMapper.platformSettlementExcelDtos(page, settlementQueryVo);
|
|
|
// 补充、转换列表的数据
|
|
|
supplementaryListData(exportSuperviseSettlementExcelDtos);
|
|
|
@@ -2843,6 +2852,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
*/
|
|
|
@Override
|
|
|
public String exportPlatFormReceivable(ReceivableQueryVo receivableQueryVo) {
|
|
|
+ receivableQueryVo.setSystemCode(baseController.getSystemCode());
|
|
|
List<InsPlyIncome> receivableList = baseMapper.getReceivableList(receivableQueryVo);
|
|
|
|
|
|
// 调用动态导出
|
|
|
@@ -2856,6 +2866,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
@Override
|
|
|
public Page<ExportSuperviseSettlementDetailExcelDto> superviseSettlementDetailExcel(Page page, SettlementQueryVo settlementQueryVo) {
|
|
|
log.info("superviseSettlementDetailExcel:settlementQueryVo=[{}]", JSONUtil.toJsonStr(settlementQueryVo));
|
|
|
+ settlementQueryVo.setSystemCode(baseController.getSystemCode());
|
|
|
Page<ExportSuperviseSettlementDetailExcelDto> exportSuperviseSettlementDetailExcelDtos = baseMapper.getSuperviseSettlementDetailExcelDtos(page, settlementQueryVo);
|
|
|
exportSuperviseSettlementDetailExcelDtos.getRecords().forEach(dto -> {
|
|
|
if (dto.getInvoiceParty().equals("1")) {
|
|
|
@@ -2881,6 +2892,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
@Override
|
|
|
public void exportSuperviseSettlementDetailExcel(Page page, SettlementQueryVo settlementQueryVo) throws IOException {
|
|
|
verifyUploadPath();
|
|
|
+ settlementQueryVo.setSystemCode(baseController.getSystemCode());
|
|
|
Page<ExportSuperviseSettlementDetailExcelDto> exportSuperviseSettlementDetailExcelDtos = baseMapper.getSuperviseSettlementDetailExcelDtos(page, settlementQueryVo);
|
|
|
exportSuperviseSettlementDetailExcelDtos.getRecords().forEach(dto -> {
|
|
|
if (dto.getInvoiceParty().equals("1")) {
|
|
|
@@ -2907,6 +2919,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
@Override
|
|
|
public void exportSuperviseSettlementDetailJyExcel(Page page, SettlementQueryVo settlementQueryVo) throws IOException {
|
|
|
verifyUploadPath();
|
|
|
+ settlementQueryVo.setSystemCode(baseController.getSystemCode());
|
|
|
Page<ExportSuperviseSettlementDetailJyExcelDto> exportSuperviseSettlementDetailJyExcelDtos = baseMapper.getSuperviseSettlementDetailJyExcelDtos(page, settlementQueryVo);
|
|
|
exportSuperviseSettlementDetailJyExcelDtos.getRecords().forEach(dto -> {
|
|
|
if (dto.getInvoiceParty().equals("1")) {
|
|
|
@@ -2930,6 +2943,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
@Override
|
|
|
public void exportOtherExcel(ReceivableQueryVo receivableQueryVo) throws IOException {
|
|
|
verifyUploadPath();
|
|
|
+ receivableQueryVo.setSystemCode(baseController.getSystemCode());
|
|
|
// modify by lipf, 2026年6月9日11:57:39 调用和查询相同的接口,保证数据一致性
|
|
|
//List<ExportOtherExcelDto> exportOtherExcelDtos = baseMapper.getOtherExcelDtos(receivableQueryVo);
|
|
|
receivableQueryVo.setSize(Integer.MAX_VALUE);
|
|
|
@@ -2960,6 +2974,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
@Override
|
|
|
public void exportOtherJyExcel(ReceivableQueryVo receivableQueryVo) throws IOException {
|
|
|
verifyUploadPath();
|
|
|
+ receivableQueryVo.setSystemCode(baseController.getSystemCode());
|
|
|
List<ExportOtherJyExcelDto> exportOtherJyExcelDtos = baseMapper.getOtherJyExcelDtos(receivableQueryVo);
|
|
|
exportOtherJyExcelDtos.forEach(dto -> {
|
|
|
switch (dto.getEntryStatus()) {
|
|
|
@@ -2973,6 +2988,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
|
|
|
@Override
|
|
|
public Page<ExportOtherSettlementExcelDto> exportOtherSettlement(Page page, SettlementQueryVo settlementQueryVo) {
|
|
|
+ settlementQueryVo.setSystemCode(baseController.getSystemCode());
|
|
|
Page<ExportOtherSettlementExcelDto> exportOtherSettlementExcelDtos = baseMapper.getOtherSettlementExcelDtos(page, settlementQueryVo);
|
|
|
exportOtherSettlementExcelDtos.getRecords().forEach(dto -> {
|
|
|
if (dto.getInvoiceParty().equals("1")) {
|
|
|
@@ -3000,6 +3016,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
@Override
|
|
|
public void exportOtherSettlementExcel(Page page, SettlementQueryVo settlementQueryVo) throws IOException {
|
|
|
verifyUploadPath();
|
|
|
+ settlementQueryVo.setSystemCode(baseController.getSystemCode());
|
|
|
Page<ExportOtherSettlementExcelDto> exportOtherSettlementExcelDtos = baseMapper.getOtherSettlementExcelDtos(page, settlementQueryVo);
|
|
|
exportOtherSettlementExcelDtos.getRecords().forEach(dto -> {
|
|
|
if (dto.getInvoiceParty().equals("1")) {
|
|
|
@@ -3020,6 +3037,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
|
|
|
@Override
|
|
|
public Page<ExportOtherSettlementDetailExcelDto> otherSettlementDetail(Page page, SettlementQueryVo settlementQueryVo) {
|
|
|
+ settlementQueryVo.setSystemCode(baseController.getSystemCode());
|
|
|
Page<ExportOtherSettlementDetailExcelDto> otherSettlementDetail = baseMapper.getOtherSettlementDetailExcelDtos(page, settlementQueryVo);
|
|
|
otherSettlementDetail.getRecords().forEach(dto -> {
|
|
|
if (dto.getInvoiceParty().equals("1")) {
|
|
|
@@ -3042,6 +3060,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
@Override
|
|
|
public void exportOtherSettlementDetailExcel(Page page, SettlementQueryVo settlementQueryVo) throws IOException {
|
|
|
verifyUploadPath();
|
|
|
+ settlementQueryVo.setSystemCode(baseController.getSystemCode());
|
|
|
Page<ExportOtherSettlementDetailExcelDto> exportOtherSettlementDetailExcelDtos = baseMapper.getOtherSettlementDetailExcelDtos(page, settlementQueryVo);
|
|
|
exportOtherSettlementDetailExcelDtos.getRecords().forEach(dto -> {
|
|
|
if (dto.getInvoiceParty().equals("1")) {
|
|
|
@@ -3069,6 +3088,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
@Override
|
|
|
public void exportOtherSettlementDetailJyExcel(Page page, SettlementQueryVo settlementQueryVo) throws IOException {
|
|
|
verifyUploadPath();
|
|
|
+ settlementQueryVo.setSystemCode(baseController.getSystemCode());
|
|
|
Page<ExportOtherSettlementDetailJyExcelDto> exportOtherSettlementDetailJyExcelDtos = baseMapper.getOtherSettlementDetailJyExcelDtos(page, settlementQueryVo);
|
|
|
exportOtherSettlementDetailJyExcelDtos.getRecords().forEach(dto -> {
|
|
|
if (dto.getInvoiceParty().equals("1")) {
|
|
|
@@ -3400,6 +3420,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
@Override
|
|
|
public Page<ReceiverSettlementReportDto> receiverSettlementReport(Page page, SettlementReportQueryVo settlementReportQueryVo) {
|
|
|
log.info("平台协议应收-结算报表-对接人结算报表查询。 settlementReportQueryVo=[{}]", JSONUtil.toJsonStr(settlementReportQueryVo));
|
|
|
+ settlementReportQueryVo.setSystemCode(baseController.getSystemCode());
|
|
|
Page<ReceiverSettlementReportDto> receiverSettlementReport = baseMapper.getReceiverSettlementReport(page, settlementReportQueryVo);
|
|
|
List<ReceiverSettlementReportDto> records = receiverSettlementReport.getRecords();
|
|
|
if(CollUtil.isNotEmpty(records)) {
|
|
|
@@ -3425,6 +3446,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
|
|
|
@Override
|
|
|
public void exportReceiverSettlementReportExcel(Page page, SettlementReportQueryVo settlementReportQueryVo) {
|
|
|
+ settlementReportQueryVo.setSystemCode(baseController.getSystemCode());
|
|
|
Page<ReceiverSettlementReportDto> receiverSettlementReport = baseMapper.getReceiverSettlementReport(page, settlementReportQueryVo);
|
|
|
List<ReceiverSettlementReportDto> receiverSettlementReportDtos = receiverSettlementReport.getRecords();
|
|
|
EasyExcelUtils.exportForWeb(ServletUtils.getResponse(), ReceiverSettlementReportDto.class, receiverSettlementReportDtos, "对接人结算报表");
|