aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

demand: TMS系统 - 客户账单管理 - 财务开票处理 - 已开票 - 定制导出-客户付款日期、收款登记日期拼接时按照日期从小到大的顺序拼接

Browse Source 
committer: heyu
This commit is contained in:
aike 2025-11-04 16:32:09 +08:00
parent 17f2b62c65
commit a08ec37efc
1 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceRecordServiceImpl.java
View File

@ -578,7 +578,21 @@ public class EmisSettleInvoiceRecordServiceImpl extends EmisBaseService implemen
}
// 格式化客户付款日期（格式：2025/10/30 付款2000元 A公司）
for (PaymentGroup group : paymentGroupMap.values()) {
// 按日期从小到大排序
List<PaymentGroup> sortedPaymentGroups = new ArrayList<>(paymentGroupMap.values());
sortedPaymentGroups.sort((g1, g2) -> {
if (g1.date == null && g2.date == null) {
return 0;
}
if (g1.date == null) {
return -1;
}
if (g2.date == null) {
return 1;
}
return g1.date.compareTo(g2.date);
});
for (PaymentGroup group : sortedPaymentGroups) {
BigDecimal strippedMoney = group.totalMoney.stripTrailingZeros();
String paymentDateStr = group.dateStr + " 付款" + strippedMoney.toPlainString() + "元";
// 如果客户名称不为空，则追加客户名称
@ -589,7 +603,21 @@ public class EmisSettleInvoiceRecordServiceImpl extends EmisBaseService implemen
}
// 格式化收款登记日期（格式：2025/10/30 登记2000元 A公司）
for (PaymentGroup group : registerGroupMap.values()) {
// 按日期从小到大排序
List<PaymentGroup> sortedRegisterGroups = new ArrayList<>(registerGroupMap.values());
sortedRegisterGroups.sort((g1, g2) -> {
if (g1.date == null && g2.date == null) {
return 0;
}
if (g1.date == null) {
return -1;
}
if (g2.date == null) {
return 1;
}
return g1.date.compareTo(g2.date);
});
for (PaymentGroup group : sortedRegisterGroups) {
BigDecimal strippedMoney = group.totalMoney.stripTrailingZeros();
String registerDateStr = group.dateStr + " 登记" + strippedMoney.toPlainString() + "元";
// 如果客户名称不为空，则追加客户名称