haogh 8 月之前
父節點
當前提交
b76c9e6c2c

+ 0 - 4
src/main/java/com/qmth/exam/reserve/controller/admin/StudentApplyController.java

@@ -150,10 +150,6 @@ public class StudentApplyController extends BaseController {
     @ApiOperation(value = "自动排考")
     @PostMapping(value = "/std/auto/layout")
     public void autoLayout(@ApiParam("教学点ID") @RequestParam(required = false) Long teachingId) {
-        // LoginUser user = this.curLoginUser();
-        // if (!Role.ADMIN.equals(user.getRole())) {
-        // throw new StatusException("没有权限");
-        // }
         studentApplyService.autoLayout(teachingId);
     }
 

+ 6 - 3
src/main/java/com/qmth/exam/reserve/service/impl/ExamRoomServiceImpl.java

@@ -229,11 +229,14 @@ public class ExamRoomServiceImpl extends ServiceImpl<ExamRoomDao, ExamRoomEntity
     }
 
     private void updateExamSiteAndTeachingCapacity(Long examSiteId) {
+        ExamSiteEntity oldExamSite = examSiteService.getById(examSiteId);
         examSiteService.updateExamSiteCapacity(examSiteId);
-        ExamSiteEntity examSite = examSiteService.getById(examSiteId);
-        categoryService.updateTeachingCapacity(examSite.getCategoryId());
+        ExamSiteEntity newExamSite = examSiteService.getById(examSiteId);
+        categoryService.updateTeachingCapacity(newExamSite.getCategoryId());
+        /*//清空考点容量缓存
+        cacheService.clearApplyTotalCountCache(examSiteId);*/
         //清空考点容量缓存
-        cacheService.clearApplyTotalCountCache(examSiteId);
+        cacheService.initApplyAvailableCountCache(examSiteId, oldExamSite.getCapacity(), newExamSite.getCapacity());
     }
 
     private void checkExamRoom(ExamRoomSaveReq req) {

+ 2 - 1
src/main/java/com/qmth/exam/reserve/service/impl/ExamSiteServiceImpl.java

@@ -121,7 +121,8 @@ public class ExamSiteServiceImpl extends ServiceImpl<ExamSiteDao, ExamSiteEntity
         ExamSiteEntity site = new ExamSiteEntity();
         BeanUtils.copyProperties(req, site);
         site.setCategoryId(req.getTeachingId());
-        ExamSiteEntity beforeUpdateSite = new ExamSiteEntity();
+        new ExamSiteEntity();
+        ExamSiteEntity beforeUpdateSite;
         if (req.getId() == null) {
             site.setCapacity(0);
             site.setEnable(Boolean.TRUE);