|
@@ -22,6 +22,7 @@ import com.qmth.exam.reserve.entity.TimePeriodEntity;
|
|
import com.qmth.exam.reserve.entity.TimePeriodExamRoomEntity;
|
|
import com.qmth.exam.reserve.entity.TimePeriodExamRoomEntity;
|
|
import com.qmth.exam.reserve.enums.Role;
|
|
import com.qmth.exam.reserve.enums.Role;
|
|
import com.qmth.exam.reserve.service.ExamRoomService;
|
|
import com.qmth.exam.reserve.service.ExamRoomService;
|
|
|
|
+import com.qmth.exam.reserve.service.ExamSiteService;
|
|
import com.qmth.exam.reserve.service.TimePeriodExamRoomService;
|
|
import com.qmth.exam.reserve.service.TimePeriodExamRoomService;
|
|
import com.qmth.exam.reserve.service.TimePeriodService;
|
|
import com.qmth.exam.reserve.service.TimePeriodService;
|
|
import com.qmth.exam.reserve.util.DateUtil;
|
|
import com.qmth.exam.reserve.util.DateUtil;
|
|
@@ -64,6 +65,9 @@ public class TimePeriodExamRoomServiceImpl extends ServiceImpl<TimePeriodExamRoo
|
|
@Autowired
|
|
@Autowired
|
|
private ConcurrentService concurrentService;
|
|
private ConcurrentService concurrentService;
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ private ExamSiteService examSiteService;
|
|
|
|
+
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public List<TimePeriodExamSiteVo> ListDetail(LoginUser loginUser, Long examRoomId) {
|
|
public List<TimePeriodExamSiteVo> ListDetail(LoginUser loginUser, Long examRoomId) {
|
|
@@ -374,6 +378,8 @@ public class TimePeriodExamRoomServiceImpl extends ServiceImpl<TimePeriodExamRoo
|
|
applyTaskCacheService.refreshApplyAvailableCountCache(
|
|
applyTaskCacheService.refreshApplyAvailableCountCache(
|
|
examRoom.getExamSiteId(),
|
|
examRoom.getExamSiteId(),
|
|
item.getTimePeriodId(),
|
|
item.getTimePeriodId(),
|
|
|
|
+// examSite.getCapacity(),
|
|
|
|
+// examSite.getCapacity()- examRoom.getCapacity()
|
|
examRoom.getCapacity(),
|
|
examRoom.getCapacity(),
|
|
0
|
|
0
|
|
);
|
|
);
|
|
@@ -414,6 +420,8 @@ public class TimePeriodExamRoomServiceImpl extends ServiceImpl<TimePeriodExamRoo
|
|
applyTaskCacheService.refreshApplyAvailableCountCache(
|
|
applyTaskCacheService.refreshApplyAvailableCountCache(
|
|
examRoom.getExamSiteId(),
|
|
examRoom.getExamSiteId(),
|
|
timePeriod.getTimePeriodId(),
|
|
timePeriod.getTimePeriodId(),
|
|
|
|
+ // examSite.getCapacity(),
|
|
|
|
+ // examSite.getCapacity() - examRoom.getCapacity()
|
|
examRoom.getCapacity(),
|
|
examRoom.getCapacity(),
|
|
0
|
|
0
|
|
);
|
|
);
|
|
@@ -425,6 +433,8 @@ public class TimePeriodExamRoomServiceImpl extends ServiceImpl<TimePeriodExamRoo
|
|
applyTaskCacheService.refreshApplyAvailableCountCache(
|
|
applyTaskCacheService.refreshApplyAvailableCountCache(
|
|
examRoom.getExamSiteId(),
|
|
examRoom.getExamSiteId(),
|
|
timePeriod.getTimePeriodId(),
|
|
timePeriod.getTimePeriodId(),
|
|
|
|
+ // examSite.getCapacity(),
|
|
|
|
+ // examSite.getCapacity() + examRoom.getCapacity()
|
|
0,
|
|
0,
|
|
examRoom.getCapacity()
|
|
examRoom.getCapacity()
|
|
);
|
|
);
|