hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-06 09:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch '104/master'

Browse Source
This commit is contained in:
nisen
2024-10-09 17:48:11 +08:00
parent 95b63155cd 0e897b5f14
commit 3001c25590
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java
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());

4
servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamQuestionApi.java
View File

@@ -312,8 +312,8 @@ public class ExamQuestionApi extends ApiBaseController {
if(row1.getCell(1).getStringCellValue().equals("多选题")){ if(row1.getCell(1).getStringCellValue().equals("多选题")){
examQuestion.setType(2); examQuestion.setType(2);
} }
log.debug("row1.getCell(2) = " + row1.getCell(2));
if (row1.getCell(2).getStringCellValue() == null || row1.getCell(2).getStringCellValue().equals("")){ if (row1.getCell(2)==null ||row1.getCell(2).getStringCellValue() == null || row1.getCell(2).getStringCellValue().equals("")){
examQuestion.setDifficulty(null); examQuestion.setDifficulty(null);
}else{ }else{
if( row1.getCell(2).getStringCellValue().equals("中")){ if( row1.getCell(2).getStringCellValue().equals("中")){