diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/AloneExamApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/AloneExamApi.java index 9e046329..6021c186 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/AloneExamApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/AloneExamApi.java @@ -713,7 +713,8 @@ public class AloneExamApi extends ApiBaseController { */ @PostMapping("/examScoreBatchAdd") public JsonResponse examScoreBatchAdd(HttpServletRequest request, @RequestBody List saveExamScoreDtoList){ - return success(service.examScoreBatchAdd(request, saveExamScoreDtoList)); + service.examScoreBatchAdd(request, saveExamScoreDtoList); + return success("导入成功"); } } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/exam/dto/SaveExamScoreDto.java b/servers/boe-server-all/src/main/java/com/xboe/module/exam/dto/SaveExamScoreDto.java index 0c9fceb3..3b8bb3f6 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/dto/SaveExamScoreDto.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/dto/SaveExamScoreDto.java @@ -80,7 +80,7 @@ public class SaveExamScoreDto { /** * 用时秒 */ - private Integer useSecond; + private Integer useMinute; /** diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/IAloneExamService.java b/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/IAloneExamService.java index 1446a05b..4546a777 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/IAloneExamService.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/IAloneExamService.java @@ -160,6 +160,6 @@ public interface IAloneExamService { */ PageList findTestUserAnswers(TestUserQuery params) throws Exception; - HashMap examScoreBatchAdd(HttpServletRequest request, List saveExamScoreDtoList); + void examScoreBatchAdd(HttpServletRequest request, List saveExamScoreDtoList); } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/AloneExamServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/AloneExamServiceImpl.java index 845ec53a..7bb0a452 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/AloneExamServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/AloneExamServiceImpl.java @@ -445,7 +445,7 @@ public class AloneExamServiceImpl implements IAloneExamService{ @Override - public HashMap examScoreBatchAdd(HttpServletRequest request, List saveExamScoreDtoList) { + public void examScoreBatchAdd(HttpServletRequest request, List saveExamScoreDtoList) { HashMap saveErrorMsgMap = new HashMap<>(); List 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; } }