|
|
@@ -1,27 +1,5 @@
|
|
|
package com.qmth.exam.reserve.service.impl;
|
|
|
|
|
|
-import java.io.File;
|
|
|
-import java.io.IOException;
|
|
|
-import java.io.InputStream;
|
|
|
-import java.time.LocalDate;
|
|
|
-import java.time.ZoneId;
|
|
|
-import java.util.*;
|
|
|
-import java.util.stream.Collectors;
|
|
|
-
|
|
|
-import com.qmth.exam.reserve.bean.applytask.CurrentApplyTaskVO;
|
|
|
-import com.qmth.exam.reserve.bean.stdapply.*;
|
|
|
-import com.qmth.exam.reserve.entity.base.BaseEntity;
|
|
|
-import com.qmth.exam.reserve.enums.Role;
|
|
|
-import com.qmth.exam.reserve.service.*;
|
|
|
-import org.apache.commons.lang3.StringUtils;
|
|
|
-import org.apache.commons.lang3.time.DateUtils;
|
|
|
-import org.redisson.api.RLock;
|
|
|
-import org.slf4j.Logger;
|
|
|
-import org.slf4j.LoggerFactory;
|
|
|
-import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.stereotype.Service;
|
|
|
-import org.springframework.transaction.annotation.Transactional;
|
|
|
-
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
|
@@ -36,22 +14,37 @@ import com.qmth.boot.tools.excel.model.DataMap;
|
|
|
import com.qmth.boot.tools.io.ZipWriter;
|
|
|
import com.qmth.exam.reserve.bean.Constants;
|
|
|
import com.qmth.exam.reserve.bean.apply.ApplyRecordCacheBean;
|
|
|
+import com.qmth.exam.reserve.bean.applytask.CurrentApplyTaskVO;
|
|
|
import com.qmth.exam.reserve.bean.login.LoginUser;
|
|
|
+import com.qmth.exam.reserve.bean.stdapply.*;
|
|
|
import com.qmth.exam.reserve.cache.CacheConstants;
|
|
|
import com.qmth.exam.reserve.cache.impl.ApplyTaskCacheService;
|
|
|
import com.qmth.exam.reserve.dao.StudentApplyDao;
|
|
|
-import com.qmth.exam.reserve.entity.ApplyTaskEntity;
|
|
|
-import com.qmth.exam.reserve.entity.CategoryEntity;
|
|
|
-import com.qmth.exam.reserve.entity.ExamRoomEntity;
|
|
|
-import com.qmth.exam.reserve.entity.ExamSiteEntity;
|
|
|
-import com.qmth.exam.reserve.entity.StudentApplyEntity;
|
|
|
-import com.qmth.exam.reserve.entity.StudentEntity;
|
|
|
-import com.qmth.exam.reserve.entity.TimePeriodEntity;
|
|
|
+import com.qmth.exam.reserve.entity.*;
|
|
|
+import com.qmth.exam.reserve.entity.base.BaseEntity;
|
|
|
import com.qmth.exam.reserve.enums.CategoryLevel;
|
|
|
import com.qmth.exam.reserve.enums.EventType;
|
|
|
+import com.qmth.exam.reserve.enums.Role;
|
|
|
+import com.qmth.exam.reserve.service.*;
|
|
|
import com.qmth.exam.reserve.util.DateUtil;
|
|
|
import com.qmth.exam.reserve.util.JsonHelper;
|
|
|
import com.qmth.exam.reserve.util.PageUtil;
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
+import org.apache.commons.lang3.time.DateUtils;
|
|
|
+import org.redisson.api.RLock;
|
|
|
+import org.slf4j.Logger;
|
|
|
+import org.slf4j.LoggerFactory;
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.stereotype.Service;
|
|
|
+import org.springframework.transaction.annotation.Transactional;
|
|
|
+
|
|
|
+import java.io.File;
|
|
|
+import java.io.IOException;
|
|
|
+import java.io.InputStream;
|
|
|
+import java.time.LocalDate;
|
|
|
+import java.time.ZoneId;
|
|
|
+import java.util.*;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
import static org.apache.commons.lang3.time.DateUtils.isSameDay;
|
|
|
|
|
|
@@ -670,6 +663,10 @@ public class StudentApplyServiceImpl extends ServiceImpl<StudentApplyDao, Studen
|
|
|
private void checkTeachingCapacity(Long taskId, List<CategoryVO> categoryList, List<TimePeriodEntity> timeList) {
|
|
|
for (CategoryVO vo : categoryList) {
|
|
|
List<ExamSiteEntity> siteList = listExamSite(vo.getId(), null);
|
|
|
+ if(siteList.isEmpty()) {
|
|
|
+ log.warn("{}下没有考点" ,vo.getName());
|
|
|
+ continue;
|
|
|
+ };
|
|
|
// 总考位数量
|
|
|
Integer total = siteList.stream().mapToInt(ExamSiteEntity::getCapacity).sum() * timeList.size();
|
|
|
// 已经预约的数量
|
haogh