Merge remote-tracking branch 'origin/master'

This commit is contained in:
majintao
2025-04-27 15:33:04 +08:00
@@ -384,7 +384,8 @@ public class DistrictStatServiceImpl implements DistrictStatService {
* 获取指定时间段日期的小区均价
*
* @param districtKey
* @param date
* @param startDate
* @param endDate
* @return
*/
public List<DistrictStatBo> findDistrictStatRangDate(DistrictKey districtKey, Date startDate,Date endDate) {
@@ -1546,7 +1547,7 @@ public class DistrictStatServiceImpl implements DistrictStatService {
public Integer doFindLatestDistrictAvgPrice2B(DistrictKey districtKey, Date weekend){
DistrictStatBo statBo = districtStatService.findDistrictStat(districtKey);
DistrictStatBo statBo = districtStatService.findDistrictStat(districtKey, weekend);
if (statBo != null && statBo.getDefaultDistrictStat() != null) {
if (statBo.getDefaultDistrictStat().getAvg_price_2b() != null && statBo.getDefaultDistrictStat().getAvg_price_2b() > 0) {
return statBo.getDefaultDistrictStat().getAvg_price_2b();