|
|
@@ -971,6 +971,18 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
.flatMap(List::stream)
|
|
|
.collect(Collectors.toList());
|
|
|
|
|
|
+ // ============新增:给signMonth赋值 year+month,月份补两位 2026-7 → "202607"============
|
|
|
+ resultList.stream()
|
|
|
+ .filter(vo -> StrUtil.isNotBlank(vo.getYear()) && StrUtil.isNotBlank(vo.getMonth()))
|
|
|
+ .forEach(vo -> {
|
|
|
+ String year = vo.getYear();
|
|
|
+ String month = vo.getMonth();
|
|
|
+ String monthPad = StrUtil.padPre(month, 2, "0");
|
|
|
+ // 格式 yyyy‑MM
|
|
|
+ String signMonth = year + "-" + monthPad;
|
|
|
+ vo.setSignMonth(signMonth);
|
|
|
+ });
|
|
|
+
|
|
|
return resultList;
|
|
|
}
|
|
|
|
|
|
@@ -5128,8 +5140,10 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
invoiceRecordQueryVo.setCompanyIds(companyIds.getData());
|
|
|
}
|
|
|
if (invoiceRecordQueryVo.getInvoiceTypes().contains("2") || invoiceRecordQueryVo.getInvoiceTypes().contains("4")){
|
|
|
+ // 跟单费
|
|
|
invoiceRecordList = baseMapper.getFollowInvoiceRecordList(invoiceRecordQueryVo.getPage(), invoiceRecordQueryVo);
|
|
|
}else if(invoiceRecordQueryVo.getInvoiceTypes().contains("1") || invoiceRecordQueryVo.getInvoiceTypes().contains("3")){
|
|
|
+ // 手续费
|
|
|
invoiceRecordList = baseMapper.getInvoiceRecordList(invoiceRecordQueryVo.getPage(), invoiceRecordQueryVo);
|
|
|
}
|
|
|
List<InvoiceRecordResult> records = invoiceRecordList.getRecords();
|