监考日志修改

themis-backend/src/main/java/com/qmth/themis/backend/api/TEExamCourseController.java

@@ -6,10 +6,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.themis.business.base.BasePage;
 import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.dto.response.TEExamCourseDto;
+import com.qmth.themis.business.entity.TBUser;
 import com.qmth.themis.business.entity.TEExamCourse;
 import com.qmth.themis.business.enums.FieldUniqueEnum;
 import com.qmth.themis.business.service.TEExamCourseService;
 import com.qmth.themis.business.util.JacksonUtil;
+import com.qmth.themis.business.util.ServletUtil;
 import com.qmth.themis.common.enums.ExceptionResultEnum;
 import com.qmth.themis.common.exception.BusinessException;
 import com.qmth.themis.common.util.Result;
@@ -49,6 +51,7 @@ public class TEExamCourseController {
             throw new BusinessException(ExceptionResultEnum.COURSE_INFO_IS_NULL);
         }
         try {
+            TBUser tbUser = (TBUser) ServletUtil.getRequestAccount();
             QueryWrapper<TEExamCourse> teExamCourseQueryWrapper = new QueryWrapper<>();
             teExamCourseQueryWrapper.lambda().eq(TEExamCourse::getExamId, teExamCourse.getExamId()).eq(TEExamCourse::getCourseCode, teExamCourse.getCourseCode());
             List<TEExamCourse> teExamCourseList = teExamCourseService.list(teExamCourseQueryWrapper);
@@ -56,6 +59,7 @@ public class TEExamCourseController {
                 teExamCourseList.forEach(s -> {
                     s.setObjectiveShuffle(teExamCourse.getObjectiveShuffle());
                     s.setOptionShuffle(teExamCourse.getOptionShuffle());
+                    s.setUpdateId(tbUser.getId());
                 });
             }
             teExamCourseService.updateBatchById(teExamCourseList);

themis-backend/src/main/java/com/qmth/themis/backend/api/TEExamPaperController.java

@@ -9,7 +9,6 @@ import com.qmth.themis.business.enums.*;
 import com.qmth.themis.business.service.*;
 import com.qmth.themis.business.util.JacksonUtil;
 import com.qmth.themis.business.util.ServletUtil;
-import com.qmth.themis.common.contanst.Constants;
 import com.qmth.themis.common.enums.ExceptionResultEnum;
 import com.qmth.themis.common.exception.BusinessException;
 import com.qmth.themis.common.util.Result;
@@ -21,10 +20,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 
 /**
  * @Description: 考试试卷 前端控制器
@@ -84,15 +80,15 @@ public class TEExamPaperController {
         }
         try {
             TBUser tbUser = (TBUser) ServletUtil.getRequestAccount();
+            List<TEExamPaper> teExamPaperUpdate = new ArrayList<>();
             teExamPaperList.forEach(s -> {
-                if (Objects.nonNull(s.getId())) {
-                    s.setUpdateId(tbUser.getId());
-                } else {
-                    s.setId(Constants.idGen.next());
-                    s.setCreateId(tbUser.getId());
-                }
+                TEExamPaper teExamPaper = teExamPaperService.getById(s.getId());
+                teExamPaper.setWeight(s.getWeight());
+                teExamPaper.setAudioPlayCount(s.getAudioPlayCount());
+                teExamPaper.setUpdateId(tbUser.getId());
+                teExamPaperUpdate.add(teExamPaper);
             });
-            teExamPaperService.saveOrUpdateBatch(teExamPaperList);
+            teExamPaperService.updateBatchById(teExamPaperUpdate);
         } catch (Exception e) {
             e.printStackTrace();
             if (e instanceof DuplicateKeyException) {