Merge remote-tracking branch 'yx/master-0930' into 104-master

This commit is contained in:
nisen
2024-10-08 20:18:33 +08:00

View File

@@ -1299,8 +1299,8 @@ public class CasesServiceImpl implements ICasesService {
pageSize = 10; pageSize = 10;
} }
LocalDateTime startTime = month.withDayOfMonth(1); LocalDateTime startTime = month.withDayOfMonth(1).withHour(0).withMinute(0).withSecond(0);
LocalDateTime endTime = month.plusMonths(1).withDayOfMonth(1).withMinute(0); LocalDateTime endTime = YearMonth.from(month).atEndOfMonth().atTime(23, 59, 59);
List<HashMap<String, Object>> popularityOfMajor = casesRankDao.findPopularityOfMajor(pageSize, startTime, endTime, majorId); List<HashMap<String, Object>> popularityOfMajor = casesRankDao.findPopularityOfMajor(pageSize, startTime, endTime, majorId);
List<String> caseIdList = popularityOfMajor.stream().map(map -> map.get("caseId").toString()).collect(Collectors.toList()); List<String> caseIdList = popularityOfMajor.stream().map(map -> map.get("caseId").toString()).collect(Collectors.toList());