|
@@ -1,19 +1,6 @@
|
|
package cn.com.qmth.print.manage.service.impl;
|
|
package cn.com.qmth.print.manage.service.impl;
|
|
|
|
|
|
import cn.com.qmth.print.manage.dao.ExamDao;
|
|
import cn.com.qmth.print.manage.dao.ExamDao;
|
|
-import java.io.IOException;
|
|
|
|
-import java.util.ArrayList;
|
|
|
|
-import java.util.List;
|
|
|
|
-import java.util.StringJoiner;
|
|
|
|
-import java.util.concurrent.atomic.AtomicLong;
|
|
|
|
-
|
|
|
|
-import org.apache.commons.collections4.CollectionUtils;
|
|
|
|
-import org.apache.commons.lang.StringUtils;
|
|
|
|
-import org.springframework.stereotype.Service;
|
|
|
|
-import org.springframework.transaction.annotation.Transactional;
|
|
|
|
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
|
|
|
|
-import org.springframework.web.multipart.MultipartFile;
|
|
|
|
-
|
|
|
|
import cn.com.qmth.print.manage.dao.ExamStudentDao;
|
|
import cn.com.qmth.print.manage.dao.ExamStudentDao;
|
|
import cn.com.qmth.print.manage.dto.StudentDTO;
|
|
import cn.com.qmth.print.manage.dto.StudentDTO;
|
|
import cn.com.qmth.print.manage.entity.ExamEntity;
|
|
import cn.com.qmth.print.manage.entity.ExamEntity;
|
|
@@ -23,7 +10,6 @@ import cn.com.qmth.print.manage.service.ExamStudentService;
|
|
import cn.com.qmth.print.manage.service.query.ExamStudentQuery;
|
|
import cn.com.qmth.print.manage.service.query.ExamStudentQuery;
|
|
import cn.com.qmth.print.manage.utils.excel.ExcelError;
|
|
import cn.com.qmth.print.manage.utils.excel.ExcelError;
|
|
import cn.com.qmth.print.manage.utils.excel.ExcelReader;
|
|
import cn.com.qmth.print.manage.utils.excel.ExcelReader;
|
|
-
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
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.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
@@ -32,8 +18,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.qmth.boot.core.exception.StatusException;
|
|
import com.qmth.boot.core.exception.StatusException;
|
|
import org.apache.commons.collections4.CollectionUtils;
|
|
import org.apache.commons.collections4.CollectionUtils;
|
|
import org.apache.commons.lang.StringUtils;
|
|
import org.apache.commons.lang.StringUtils;
|
|
-import org.checkerframework.checker.signature.qual.PolySignature;
|
|
|
|
-import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.interceptor.TransactionAspectSupport;
|
|
import org.springframework.transaction.interceptor.TransactionAspectSupport;
|
|
@@ -45,7 +29,6 @@ import java.util.ArrayList;
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.StringJoiner;
|
|
import java.util.StringJoiner;
|
|
-import java.util.concurrent.atomic.AtomicInteger;
|
|
|
|
import java.util.concurrent.atomic.AtomicLong;
|
|
import java.util.concurrent.atomic.AtomicLong;
|
|
|
|
|
|
@Service
|
|
@Service
|
|
@@ -108,16 +91,16 @@ public class ExamStudentServiceImpl extends ServiceImpl<ExamStudentDao, ExamStud
|
|
}
|
|
}
|
|
queryWrapper.lambda().eq(ExamStudentEntity::getExamId, query.getExamId());
|
|
queryWrapper.lambda().eq(ExamStudentEntity::getExamId, query.getExamId());
|
|
if (StringUtils.isNotBlank(query.getExamNumber())) {
|
|
if (StringUtils.isNotBlank(query.getExamNumber())) {
|
|
- queryWrapper.lambda().eq(ExamStudentEntity::getExamNumber, query.getExamNumber());
|
|
|
|
|
|
+ queryWrapper.lambda().like(ExamStudentEntity::getExamNumber, "%" + query.getExamNumber() + "%");
|
|
}
|
|
}
|
|
if (StringUtils.isNotBlank(query.getCourseCode())) {
|
|
if (StringUtils.isNotBlank(query.getCourseCode())) {
|
|
- queryWrapper.lambda().eq(ExamStudentEntity::getCourseCode, query.getCourseCode());
|
|
|
|
|
|
+ queryWrapper.lambda().like(ExamStudentEntity::getCourseCode, "%" + query.getCourseCode() + "%");
|
|
}
|
|
}
|
|
if (StringUtils.isNotBlank(query.getExamSite())) {
|
|
if (StringUtils.isNotBlank(query.getExamSite())) {
|
|
- queryWrapper.lambda().eq(ExamStudentEntity::getExamSite, query.getExamSite());
|
|
|
|
|
|
+ queryWrapper.lambda().like(ExamStudentEntity::getExamSite, "%" + query.getExamSite() + "%");
|
|
}
|
|
}
|
|
if (StringUtils.isNotBlank(query.getExamRoom())) {
|
|
if (StringUtils.isNotBlank(query.getExamRoom())) {
|
|
- queryWrapper.lambda().eq(ExamStudentEntity::getExamRoom, query.getExamRoom());
|
|
|
|
|
|
+ queryWrapper.lambda().like(ExamStudentEntity::getExamRoom, "%" + query.getExamRoom() + "%");
|
|
}
|
|
}
|
|
Page page = new Page(query.getPageNumber(), query.getPageSize());
|
|
Page page = new Page(query.getPageNumber(), query.getPageSize());
|
|
return this.page(page, queryWrapper);
|
|
return this.page(page, queryWrapper);
|