chuangte/smart-switch-java
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into dev-agent

Browse Source
This commit is contained in:
墨大叔 2024-09-30 17:55:29 +08:00
commit 75dede5e20
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java
View File

@ -774,7 +774,7 @@ public class TransactionBillServiceImpl implements TransactionBillService, After
if (dto.getStartDate() != null && dto.getEndDate() != null && Objects.equals(dto.getGroupBy(), TransactionBillGroupBy.create_date.name())) {
List<BillCountVo> newList = new ArrayList<>();
LocalDate i = dto.getStartDate();
while (i.isBefore(dto.getEndDate())) {
while (!i.isAfter(dto.getEndDate())) {
Date finalI = DateUtils.toDate(i);
BillCountVo count = list.stream().filter(item -> DateUtils.getYYYY_MM_DD(item.getCreateDate()).equals(DateUtils.getYYYY_MM_DD(finalI))).findFirst().orElse(null);
if (count == null) {