|
@@ -6,9 +6,6 @@ import java.util.stream.Collectors;
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
import javax.validation.constraints.NotNull;
|
|
import javax.validation.constraints.NotNull;
|
|
|
|
|
|
-import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
|
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
|
-import com.qmth.teachcloud.mark.dto.mark.MarkStudentVo;
|
|
|
|
import org.apache.commons.collections4.CollectionUtils;
|
|
import org.apache.commons.collections4.CollectionUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
@@ -18,6 +15,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
|
|
|
+import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
|
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.qmth.boot.core.concurrent.service.ConcurrentService;
|
|
import com.qmth.boot.core.concurrent.service.ConcurrentService;
|
|
import com.qmth.boot.core.exception.ParameterException;
|
|
import com.qmth.boot.core.exception.ParameterException;
|
|
@@ -37,6 +36,7 @@ import com.qmth.teachcloud.common.util.ServletUtil;
|
|
import com.qmth.teachcloud.mark.bean.OmrTaskItem;
|
|
import com.qmth.teachcloud.mark.bean.OmrTaskItem;
|
|
import com.qmth.teachcloud.mark.bean.OmrTaskPage;
|
|
import com.qmth.teachcloud.mark.bean.OmrTaskPage;
|
|
import com.qmth.teachcloud.mark.dto.*;
|
|
import com.qmth.teachcloud.mark.dto.*;
|
|
|
|
+import com.qmth.teachcloud.mark.dto.mark.MarkStudentVo;
|
|
import com.qmth.teachcloud.mark.entity.*;
|
|
import com.qmth.teachcloud.mark.entity.*;
|
|
import com.qmth.teachcloud.mark.enums.LockType;
|
|
import com.qmth.teachcloud.mark.enums.LockType;
|
|
import com.qmth.teachcloud.mark.enums.OmrTaskStatus;
|
|
import com.qmth.teachcloud.mark.enums.OmrTaskStatus;
|
|
@@ -374,7 +374,8 @@ public class ScanOmrTaskServiceImpl extends ServiceImpl<ScanOmrTaskMapper, ScanO
|
|
}
|
|
}
|
|
List<ScanPaperPage> pageList = pageService.listByPaperId(spe.getPaperId());
|
|
List<ScanPaperPage> pageList = pageService.listByPaperId(spe.getPaperId());
|
|
for (ScanPaperPage pageEntity : pageList) {
|
|
for (ScanPaperPage pageEntity : pageList) {
|
|
- if(pageEntity.getAbsent()!=null && !pageEntity.getAbsent().getResult()){
|
|
|
|
|
|
+ if(pageEntity.getAbsent()==null ||
|
|
|
|
+ (pageEntity.getAbsent()!=null && !pageEntity.getAbsent().getResult())){
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|
|
for (int i = 0; pageEntity.getQuestion() != null && pageEntity.getQuestion().getResult() != null
|
|
for (int i = 0; pageEntity.getQuestion() != null && pageEntity.getQuestion().getResult() != null
|