Merge branch 'dev' of http://192.168.1.245:11111/jinjilong/onlineEducation-fwd into dev

snowy-plugin/snowy-plugin-exam/snowy-plugin-exam-func/src/main/java/vip/xiaonuo/exam/controller/student/ExamPaperAnswerController.java

@@ -78,7 +78,7 @@ public class ExamPaperAnswerController extends BaseApiController {
         String scoreVm = ExamUtil.scoreToVM(userScore);
         UserEventLog userEventLog = new UserEventLog(user.getId(), user.getName(), user.getName(), new Date());
         String content = user.getName() + " 提交试卷：" + examPaperAnswerInfo.getExamPaper().getName()
-                + " 得分：" + scoreVm
+                + " 得分：" + ExamUtil.scoreFromVM(scoreVm)
                 + " 耗时：" + ExamUtil.secondToVM(examPaperAnswer.getDoTime());
         userEventLog.setContent(content);
         eventPublisher.publishEvent(new CalculateExamPaperAnswerCompleteEvent(examPaperAnswerInfo));
@@ -100,12 +100,13 @@ public class ExamPaperAnswerController extends BaseApiController {
             return CommonResult.error("试卷已完成");
         }
         String score = examPaperAnswerService.judge(examPaperSubmitVM);
+        Integer defen = ExamUtil.scoreFromVM(score);
         SaBaseLoginUser user = getCurrentUser();
         UserEventLog userEventLog = new UserEventLog(user.getId(), user.getName(), user.getName(), new Date());
-        String content = user.getName() + " 批改试卷：" + examPaperAnswer.getPaperName() + " 得分：" + score;
+        String content = user.getName() + " 批改试卷：" + examPaperAnswer.getPaperName() + " 得分：" + defen;
         userEventLog.setContent(content);
         eventPublisher.publishEvent(new UserEvent(userEventLog));
-        return CommonResult.data(score);
+        return CommonResult.data(String.valueOf(defen));
     }
     @ApiOperationSupport(order = 3)
     @ApiOperation("每次提交的错题")

snowy-plugin/snowy-plugin-exam/snowy-plugin-exam-func/src/main/java/vip/xiaonuo/exam/mapper/ExamPaperAnswerMapper.java

@@ -15,7 +15,7 @@ import java.util.Map;
 @Mapper
 public interface ExamPaperAnswerMapper extends BaseMapper<ExamPaperAnswer> {
 
-    Page<ExamPaperAnswerVo> studentPage(@Param("studentIds") List<String> studentIds , @Param("page") Page<ExamPaperAnswerVo> page,@Param("paperName") String paperName,@Param("pageType") Integer pageType);
+    Page<ExamPaperAnswerVo> studentPage(@Param("studentIds") List<String> studentIds , @Param("page") Page<ExamPaperAnswerVo> page,@Param("paperName") String paperName,@Param("paperType") Integer paperType);
 
     Integer selectAllCount();
 

snowy-plugin/snowy-plugin-exam/snowy-plugin-exam-func/src/main/java/vip/xiaonuo/exam/mapper/mapping/ExamPaperAnswerMapper.xml

@@ -248,8 +248,8 @@
         <if test="paperName!=null">
          and a.paper_name like concat('%',#{paperName},'%')
         </if>
-        <if test="pageType!=null">
-          and a.paper_type =#{pageType}
+        <if test="paperType!=null">
+          and a.paper_type =#{paperType}
         </if>
         and a.paper_type!=5
     </where>

snowy-plugin/snowy-plugin-exam/snowy-plugin-exam-func/src/main/java/vip/xiaonuo/exam/service/impl/ExamPaperAnswerServiceImpl.java

@@ -64,7 +64,7 @@ public class ExamPaperAnswerServiceImpl extends BaseServiceImpl<ExamPaperAnswer>
     public Page<ExamPaperAnswerVo> studentPage(ExamPaperAnswerPageVM requestVM, List<String> studentIds) {
         Page<ExamPaperAnswerVo> page = new Page<ExamPaperAnswerVo>(requestVM.getCurrent(), requestVM.getSize());
         page.setSearchCount(true); // 设置计算总记录数
-        return examPaperAnswerMapper.studentPage(studentIds,page,requestVM.getPaperName(),requestVM.getPageType());
+        return examPaperAnswerMapper.studentPage(studentIds,page,requestVM.getPaperName(),requestVM.getPaperType());
     }
 
 
@@ -146,7 +146,7 @@ public class ExamPaperAnswerServiceImpl extends BaseServiceImpl<ExamPaperAnswer>
         for (ExamPaperSubmitItemVM d : judgeItems) {
             ExamPaperAnswerUpdate examPaperAnswerUpdate = new ExamPaperAnswerUpdate();
             examPaperAnswerUpdate.setId(d.getId());
-            examPaperAnswerUpdate.setCustomerScore(ExamUtil.scoreFromVM(d.getScore()));
+            examPaperAnswerUpdate.setCustomerScore(Integer.valueOf(d.getScore()));
             boolean doRight = examPaperAnswerUpdate.getCustomerScore().equals(ExamUtil.scoreFromVM(d.getQuestionScore()));
             examPaperAnswerUpdate.setDoRight(doRight);
             examPaperAnswerUpdates.add(examPaperAnswerUpdate);

snowy-plugin/snowy-plugin-exam/snowy-plugin-exam-func/src/main/java/vip/xiaonuo/exam/service/impl/ExamPaperServiceImpl.java

@@ -25,7 +25,6 @@ import vip.xiaonuo.exam.mapper.QuestionMapper;
 import vip.xiaonuo.exam.service.*;
 import vip.xiaonuo.exam.service.enums.ActionEnum;
 import vip.xiaonuo.exam.utility.DateTimeUtil;
-import vip.xiaonuo.exam.utility.ExamUtil;
 import vip.xiaonuo.exam.utility.JsonUtil;
 import vip.xiaonuo.exam.utility.ModelMapperSingle;
 import vip.xiaonuo.exam.viewmodel.admin.exam.ExamPaperEditRequestVM;
@@ -229,7 +228,7 @@ public class ExamPaperServiceImpl extends BaseServiceImpl<ExamPaper> implements
                 .mapToInt(t -> t.getQuestionItems().size()).sum();
         Integer score = titleItemsVM.stream().
                 flatMapToInt(t -> t.getQuestionItems().stream()
-                        .mapToInt(q -> ExamUtil.scoreFromVM(q.getScore()))
+                        .mapToInt(q -> Integer.valueOf(q.getScore()))
                 ).sum();
         examPaper.setQuestionCount(questionCount);
         examPaper.setScore(score);

snowy-plugin/snowy-plugin-exam/snowy-plugin-exam-func/src/main/java/vip/xiaonuo/exam/viewmodel/student/exampaper/ExamPaperAnswerPageVM.java

@@ -15,7 +15,7 @@ public class ExamPaperAnswerPageVM extends BasePage {
 
     private String paperName;
 
-    private Integer pageType;
+    private Integer paperType;
 
 
     public String getPaperName() {
@@ -26,12 +26,12 @@ public class ExamPaperAnswerPageVM extends BasePage {
         this.paperName = paperName;
     }
 
-    public Integer getPageType() {
-        return pageType;
+    public Integer getPaperType() {
+        return paperType;
     }
 
-    public void setPageType(Integer pageType) {
-        this.pageType = pageType;
+    public void setPaperType(Integer paperType) {
+        this.paperType = paperType;
     }
 
     public Integer getSubjectId() {