Merge branch 'refs/heads/zcwy0813-yang' into dev0525

This commit is contained in:
yang
2024-09-11 17:25:12 +08:00

View File

@@ -519,12 +519,10 @@ public class CasesServiceImpl implements ICasesService {
} }
if (excellentCountMap.get(e.getAuthorId())!=null){ if (excellentCountMap.get(e.getAuthorId())!=null){
String authorTagOfExcellent = "最佳案例" + excellentCountMap.get(e.getAuthorId()) + ""; String authorTagOfExcellent = excellentCountMap.get(e.getAuthorId()) + "最佳案例";
authorTags.add(authorTagOfExcellent); authorTags.add(authorTagOfExcellent);
} }
e.setAuthorTags(authorTags); e.setAuthorTags(authorTags);
}); });
} }
@@ -1259,7 +1257,7 @@ public class CasesServiceImpl implements ICasesService {
} }
LocalDateTime startTime = month.withDayOfMonth(1); LocalDateTime startTime = month.withDayOfMonth(1);
LocalDateTime endTime = month.plusMonths(1).withDayOfMonth(1).minusDays(1); LocalDateTime endTime = month.plusMonths(1).withDayOfMonth(1).withMinute(0);
List<String> caseIdList = casesRankDao.findPopularityOfMajor(pageSize, startTime, endTime,majorId); List<String> caseIdList = casesRankDao.findPopularityOfMajor(pageSize, startTime, endTime,majorId);
QueryBuilder query = QueryBuilder.from(Cases.class); QueryBuilder query = QueryBuilder.from(Cases.class);