From 5594e07264da54ca2b79eeaf8691cfc394c0ba8d Mon Sep 17 00:00:00 2001 From: yang <1175@qq.com> Date: Mon, 8 Jul 2024 14:49:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=88=90=E9=95=BF=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E5=9B=BE=EF=BC=8C=E8=80=83=E8=AF=95=E8=AE=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AloneExamServiceImpl.java | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) 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 deb4fdd5..b8232225 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 @@ -93,10 +93,13 @@ public class AloneExamServiceImpl implements IAloneExamService{ //更新状态,状态是未完成的，这里会有问题 if(scoreType!=null && scoreType==2) { + AloneExam ae=aeDao.findOne(FieldFilters.eq("aid", aea.getAid()),FieldFilters.eq("testId", aea.getTestId())); + long currentTimes = ae.getTimes() != null ? ae.getTimes() : 0; //最后一次的分数为准 aeDao.update(UpdateBuilder.from(AloneExam.class) .addUpdateField("status", aea.getStatus()) .addUpdateField("score", aea.getScore()) + .addUpdateField("times", currentTimes+1) .addFilter(FieldFilters.eq("aid", aea.getAid())) .addFilter(FieldFilters.eq("testId", aea.getTestId())) .builder()); @@ -111,6 +114,8 @@ public class AloneExamServiceImpl implements IAloneExamService{ }else { aeDao.updateMultiFieldById(ae.getId(), UpdateBuilder.create("status", aea.getStatus()),UpdateBuilder.create("score", aea.getScore())); } + long currentTimes = ae.getTimes() != null ? ae.getTimes() : 0; + aeDao.updateFieldById(ae.getId(), "times", currentTimes+1); } // else { // //这种情况汶是不存在的 @@ -501,7 +506,7 @@ public class AloneExamServiceImpl implements IAloneExamService{ aloneExamAnswer.setAid(userId); aloneExamAnswer.setName(examScoreDto.getUserName()); aloneExamAnswer.setUcode(examScoreDto.getWorkNum()); - aloneExamAnswer.setUseSecond(examScoreDto.getUseMinute()*60); +// aloneExamAnswer.setUseSecond(examScoreDto.getUseMinute()*60); ExamTest examTest = examTestDao.get(examScoreDto.getTestId()); aloneExamAnswer.setPassLine(examTest.getPassLine()); @@ -509,34 +514,29 @@ public class AloneExamServiceImpl implements IAloneExamService{ aloneExamAnswer.setTestDuration(examTest.getTestDuration()); // 获取考试任务ID - String aloneExamId = (String) aeDao.findField("id", - FieldFilters.eq("aid", userId), - FieldFilters.eq("testId", examScoreDto.getTestId()) - ); - aloneExamAnswer.setAloneId(aloneExamId); + AloneExam aloneExam=aeDao.findOne(FieldFilters.eq("aid", userId),FieldFilters.eq("testId", examScoreDto.getTestId())); + aloneExamAnswer.setAloneId(aloneExam.getId()); // 添加答卷 dao.save(aloneExamAnswer); // 更新状态,状态是未完成的，这里会有问题 + long currentTimes = aloneExam.getTimes() != null ? aloneExam.getTimes() : 0; if(examTest.getScoringType()!=null && examTest.getScoringType()==2) { //最后一次的分数为准 aeDao.update(UpdateBuilder.from(AloneExam.class) .addUpdateField("status", examScoreDto.getStatus()) .addUpdateField("score", examScoreDto.getScore()) + .addUpdateField("times", currentTimes+1) .addFilter(FieldFilters.eq("aid", userId)) .addFilter(FieldFilters.eq("testId", examScoreDto.getTestId())) .builder()); - }else { - //更新状态 - AloneExam ae=aeDao.findOne(FieldFilters.eq("aid", userId),FieldFilters.eq("testId", examScoreDto.getTestId())); - if(ae!=null) { - if(ae.getStatus()==AloneExam.STATUS_FINISH) { - if(ae.getScore() Date: Mon, 8 Jul 2024 14:49:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=88=90=E9=95=BF=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E5=9B=BE=EF=BC=8C=E5=AF=BC=E5=85=A5=E8=80=83=E8=AF=95=E5=8E=BB?= =?UTF-8?q?=E9=99=A4=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/exam/dto/SaveExamScoreDto.java | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) 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 3b8bb3f6..ea9d2275 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 @@ -27,10 +27,10 @@ public class SaveExamScoreDto { */ private String testId; - /** - * 考试名称 - */ - private String testName; +// /** +// * 考试名称 +// */ +// private String testName; // /** // * 考试时长 分钟 @@ -77,10 +77,10 @@ public class SaveExamScoreDto { */ private Float realScore; - /** - * 用时秒 - */ - private Integer useMinute; +// /** +// * 用时秒 +// */ +// private Integer useMinute; /** @@ -106,17 +106,17 @@ public class SaveExamScoreDto { */ private Integer status; - /** - * 考试次数 - */ - private Integer times; +// /** +// * 考试次数 +// */ +// private Integer times; - /** - * 记录最后的操作时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss") - private LocalDateTime lastTime; +// /** +// * 记录最后的操作时间 +// */ +// @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss") +// private LocalDateTime lastTime; }