|
@@ -3,6 +3,7 @@ package com.ruoyi.sim.service.impl;
|
|
|
import com.ruoyi.common.core.domain.AjaxResult;
|
|
|
import com.ruoyi.sim.constant.CommConst;
|
|
|
import com.ruoyi.sim.constant.FunCodeConst;
|
|
|
+import com.ruoyi.sim.domain.RealExamCollection;
|
|
|
import com.ruoyi.sim.domain.Seat;
|
|
|
import com.ruoyi.sim.domain.Sim;
|
|
|
import com.ruoyi.sim.domain.SimMsg;
|
|
@@ -359,14 +360,14 @@ public class CommCheckService {
|
|
|
* @param sim
|
|
|
* @return
|
|
|
*/
|
|
|
- public AjaxResult checkSpecialBySimType(Sim sim) {
|
|
|
+ public AjaxResult checkSpecialBySimType(final Sim sim, final String examCollectionType) {
|
|
|
String targetSimType = sim.getSimType();
|
|
|
switch (targetSimType) {
|
|
|
case Sim.TYPE_0001 -> {
|
|
|
|
|
|
}
|
|
|
case Sim.TYPE_0002 -> {
|
|
|
- {
|
|
|
+ if (StringUtils.equalsAny(examCollectionType, RealExamCollection.Type.EXERCISE, RealExamCollection.Type.EXAM)) {
|
|
|
// 是否充满电
|
|
|
Boolean isFull = simService.isChargingCountFullBySimId(sim.getSimId());
|
|
|
if (isFull == null || !isFull) {
|