From 8c175743e8f519df335925316dab5bba7e1a89d0 Mon Sep 17 00:00:00 2001 From: wangwenyan Date: Sun, 27 Apr 2025 13:39:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=91=A8=E6=97=A5=E5=9D=87?= =?UTF-8?q?=E4=BB=B7=E6=9F=A5=E8=AF=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../district/DistrictStatServiceImpl.java | 35 ++++++++++++++----- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/district/DistrictStatServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/district/DistrictStatServiceImpl.java index 6065c2063..389638fa6 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/district/DistrictStatServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/district/DistrictStatServiceImpl.java @@ -1604,9 +1604,13 @@ public class DistrictStatServiceImpl implements DistrictStatService { if (startDate == null) { throw new IllegalArgumentException("开始日期不能为空"); + }else { + startDate = DateUtil.truncateDay(startDate); } if (endDate == null) { throw new IllegalArgumentException("结束日期不能为空"); + }else { + endDate = DateUtil.truncateDay(endDate); } if (StringUtils.isBlank(periodModel)) { periodModel = "weekly"; @@ -1642,7 +1646,6 @@ public class DistrictStatServiceImpl implements DistrictStatService { sortParams.add(new SortParam("weekend", true)); List dss = this.districtStatDao.findAllByParams(params, sortParams); if (null == dss || dss.isEmpty()) {// 如果没有在小区均价表中查到均价数据,通过城市的价格计算小区均价 - List cityQueryParams = new ArrayList(); cityQueryParams.add(new QueryParam("city", city)); cityQueryParams.add(new QueryParam("region", region)); @@ -1708,15 +1711,35 @@ public class DistrictStatServiceImpl implements DistrictStatService { } List timeSeries = generateTimeSeries(weekendDates.get(0), endDate, periodModel); - Map statMap = new HashMap(); - for (DistrictStat districtStat : dss) { if (timeSeries.contains(districtStat.getWeekend())) { statMap.put(districtStat.getWeekend(), districtStat); } } - + if("monthly".equals(periodModel)){ + Date firstWeekendOfMonth = DateUtil.getFirstWeekendOfMonth(endDate); + List stats = districtStatService.findDistrictStat(new DistrictKey(city, region, name), null , firstWeekendOfMonth, endDate); + if(stats.isEmpty()){ + Date sunDay = DateUtil.getFirstDayOfWeek(endDate); + if(!timeSeries.contains(sunDay)){ + timeSeries.add(sunDay); + } + }else{ + if(DateUtil.isSunday(endDate)){ + timeSeries.remove(endDate); + }else{ + timeSeries.remove(DateUtil.getLastSunday(endDate)); + } + for(int i = stats.size()-1; i >= 0; i--){ + if (!timeSeries.contains(stats.get(i).getWeekend())){ + statMap.put(stats.get(i).getWeekend(), stats.get(i)); + timeSeries.add(stats.get(i).getWeekend()); + } + break; + } + } + } for (Date time : timeSeries) { if (!statMap.containsKey(time)) { DistrictStat districtStat = new DistrictStat(); @@ -1772,10 +1795,6 @@ public class DistrictStatServiceImpl implements DistrictStatService { monthlyDates.add(date); } } - Date sunDay = DateUtil.getFirstDayOfWeek(endDate); - if (!monthlyDates.contains(sunDay)) { - monthlyDates.add(sunDay); - } return monthlyDates; } else { throw new IllegalArgumentException("非法的计算周期");