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

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

Browse Source
This commit is contained in:
yang
2024-06-23 17:56:17 +08:00
parent 77c8991d13 7c4a6feb78
commit 21b990898d
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -713,7 +713,8 @@ public class AloneExamApi extends ApiBaseController {
*/
@PostMapping("/examScoreBatchAdd")
public JsonResponse examScoreBatchAdd(HttpServletRequest request, @RequestBody List<SaveExamScoreDto> saveExamScoreDtoList){
return success(service.examScoreBatchAdd(request, saveExamScoreDtoList));
service.examScoreBatchAdd(request, saveExamScoreDtoList);
return success("导入成功");
}
}

2
servers/boe-server-all/src/main/java/com/xboe/module/exam/dto/SaveExamScoreDto.java
View File

@@ -80,7 +80,7 @@ public class SaveExamScoreDto {
/**
* 用时秒
*/
private Integer useSecond;
private Integer useMinute;
/**

2
servers/boe-server-all/src/main/java/com/xboe/module/exam/service/IAloneExamService.java
View File

@@ -160,6 +160,6 @@ public interface IAloneExamService {
*/
PageList<TestUserDto> findTestUserAnswers(TestUserQuery params) throws Exception;
HashMap<String, String> examScoreBatchAdd(HttpServletRequest request, List<SaveExamScoreDto> saveExamScoreDtoList);
void examScoreBatchAdd(HttpServletRequest request, List<SaveExamScoreDto> saveExamScoreDtoList);
}

7
servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/AloneExamServiceImpl.java
View File

@@ -445,7 +445,7 @@ public class AloneExamServiceImpl implements IAloneExamService{
@Override
public HashMap<String, String> examScoreBatchAdd(HttpServletRequest request, List<SaveExamScoreDto> saveExamScoreDtoList) {
public void examScoreBatchAdd(HttpServletRequest request, List<SaveExamScoreDto> saveExamScoreDtoList) {
HashMap<String, String> saveErrorMsgMap = new HashMap<>();
List<String> workNumList = saveExamScoreDtoList.stream().map(SaveExamScoreDto::getWorkNum).collect(Collectors.toList());
@@ -474,6 +474,8 @@ public class AloneExamServiceImpl implements IAloneExamService{
String userId = userIdAndWorkNumMap.get(examScoreDto.getWorkNum());
aloneExamAnswer.setAid(userId);
aloneExamAnswer.setName(examScoreDto.getUserName());
aloneExamAnswer.setUcode(examScoreDto.getWorkNum());
aloneExamAnswer.setUseSecond(examScoreDto.getUseMinute()*60);
ExamTest examTest = examTestDao.get(examScoreDto.getTestId());
aloneExamAnswer.setPassLine(examTest.getPassLine());
@@ -503,9 +505,8 @@ public class AloneExamServiceImpl implements IAloneExamService{
if (status != null && !status.isCompleted()) {
transactionManager.rollback(status);
}
saveErrorMsgMap.put(examScoreDto.getWorkNum(), e.getMessage());
throw new RuntimeException(e);
}
});
return saveErrorMsgMap;
}
}