类名称修改

src/main/java/com/qmth/exam/reserve/bean/stdapply/StdApplyReq.java → src/main/java/com/qmth/exam/reserve/bean/stdapply/StudentApplyReq.java

@@ -8,7 +8,7 @@ import lombok.Setter;
 
 @Getter
 @Setter
-public class StdApplyReq extends PagerReq {
+public class StudentApplyReq extends PagerReq {
 
     private static final long serialVersionUID = -4945630927057518990L;
 

src/main/java/com/qmth/exam/reserve/bean/stdapply/StdApplyVO.java → src/main/java/com/qmth/exam/reserve/bean/stdapply/StudentApplyVO.java

@@ -8,7 +8,7 @@ import lombok.Setter;
 
 @Getter
 @Setter
-public class StdApplyVO implements IModel {
+public class StudentApplyVO implements IModel {
 
     private static final long serialVersionUID = 1246902696359595118L;
 

src/main/java/com/qmth/exam/reserve/bean/stdapply/StdImportVO.java → src/main/java/com/qmth/exam/reserve/bean/stdapply/StudentImportVO.java

@@ -10,7 +10,7 @@ import lombok.Setter;
 
 @Getter
 @Setter
-public class StdImportVO implements IModel {
+public class StudentImportVO implements IModel {
 
     private static final long serialVersionUID = 4346725022580732100L;
 

src/main/java/com/qmth/exam/reserve/controller/admin/StudentApplyController.java

@@ -23,8 +23,8 @@ import com.qmth.boot.core.collection.PageResult;
 import com.qmth.boot.core.exception.StatusException;
 import com.qmth.exam.reserve.bean.login.LoginUser;
 import com.qmth.exam.reserve.bean.stdapply.CategoryVO;
-import com.qmth.exam.reserve.bean.stdapply.StdApplyReq;
-import com.qmth.exam.reserve.bean.stdapply.StdApplyVO;
+import com.qmth.exam.reserve.bean.stdapply.StudentApplyReq;
+import com.qmth.exam.reserve.bean.stdapply.StudentApplyVO;
 import com.qmth.exam.reserve.controller.BaseController;
 import com.qmth.exam.reserve.service.ApplyTaskService;
 import com.qmth.exam.reserve.service.CategoryService;
@@ -75,7 +75,7 @@ public class StudentApplyController extends BaseController {
 
     @ApiOperation(value = "考生预约名单详情分页")
     @PostMapping(value = "/std/page")
-    public PageResult<StdApplyVO> page(@RequestBody StdApplyReq req) {
+    public PageResult<StudentApplyVO> page(@RequestBody StudentApplyReq req) {
         return studentApplyService.page(req);
     }
 

src/main/java/com/qmth/exam/reserve/dao/StudentApplyDao.java

@@ -5,11 +5,11 @@ import org.apache.ibatis.annotations.Param;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qmth.exam.reserve.bean.stdapply.StdApplyReq;
-import com.qmth.exam.reserve.bean.stdapply.StdApplyVO;
+import com.qmth.exam.reserve.bean.stdapply.StudentApplyReq;
+import com.qmth.exam.reserve.bean.stdapply.StudentApplyVO;
 import com.qmth.exam.reserve.entity.StudentApplyEntity;
 
 public interface StudentApplyDao extends BaseMapper<StudentApplyEntity> {
 
-    IPage<StdApplyVO> page(Page<StdApplyVO> page, @Param(value = "req") StdApplyReq req);
+    IPage<StudentApplyVO> page(Page<StudentApplyVO> page, @Param(value = "req") StudentApplyReq req);
 }

src/main/java/com/qmth/exam/reserve/service/StudentApplyService.java

@@ -7,13 +7,13 @@ import java.util.Map;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.boot.core.collection.PageResult;
 import com.qmth.exam.reserve.bean.login.LoginUser;
-import com.qmth.exam.reserve.bean.stdapply.StdApplyReq;
-import com.qmth.exam.reserve.bean.stdapply.StdApplyVO;
+import com.qmth.exam.reserve.bean.stdapply.StudentApplyReq;
+import com.qmth.exam.reserve.bean.stdapply.StudentApplyVO;
 import com.qmth.exam.reserve.entity.StudentApplyEntity;
 
 public interface StudentApplyService extends IService<StudentApplyEntity> {
 
-    PageResult<StdApplyVO> page(StdApplyReq req);
+    PageResult<StudentApplyVO> page(StudentApplyReq req);
 
     void cancel(LoginUser user, Long id);
 

src/main/java/com/qmth/exam/reserve/service/impl/ExamSiteServiceImp.java → src/main/java/com/qmth/exam/reserve/service/impl/ExamSiteServiceImpl.java

@@ -14,7 +14,7 @@ import com.qmth.exam.reserve.entity.ExamSiteEntity;
 import com.qmth.exam.reserve.service.ExamSiteService;
 
 @Service
-public class ExamSiteServiceImp extends ServiceImpl<ExamSiteDao, ExamSiteEntity> implements ExamSiteService {
+public class ExamSiteServiceImpl extends ServiceImpl<ExamSiteDao, ExamSiteEntity> implements ExamSiteService {
 
     @Override
     public List<CategoryVO> listExamSite(Long teachingId) {

src/main/java/com/qmth/exam/reserve/service/impl/StudentApplyServiceImp.java → src/main/java/com/qmth/exam/reserve/service/impl/StudentApplyServiceImpl.java

@@ -27,9 +27,9 @@ import com.qmth.boot.tools.excel.enums.ExcelType;
 import com.qmth.boot.tools.excel.model.DataMap;
 import com.qmth.exam.reserve.bean.login.LoginUser;
 import com.qmth.exam.reserve.bean.stdapply.AgentAndTimeVO;
-import com.qmth.exam.reserve.bean.stdapply.StdApplyReq;
-import com.qmth.exam.reserve.bean.stdapply.StdApplyVO;
-import com.qmth.exam.reserve.bean.stdapply.StdImportVO;
+import com.qmth.exam.reserve.bean.stdapply.StudentApplyReq;
+import com.qmth.exam.reserve.bean.stdapply.StudentApplyVO;
+import com.qmth.exam.reserve.bean.stdapply.StudentImportVO;
 import com.qmth.exam.reserve.dao.ApplyTaskDao;
 import com.qmth.exam.reserve.dao.OperateLogDao;
 import com.qmth.exam.reserve.dao.StudentApplyDao;
@@ -52,7 +52,7 @@ import com.qmth.exam.reserve.util.JsonHelper;
 import com.qmth.exam.reserve.util.PageUtil;
 
 @Service
-public class StudentApplyServiceImp extends ServiceImpl<StudentApplyDao, StudentApplyEntity>
+public class StudentApplyServiceImpl extends ServiceImpl<StudentApplyDao, StudentApplyEntity>
         implements StudentApplyService {
 
     private static final String[] EXCEL_HEADER = new String[] { "学号", "姓名", "证件号", "所属教学点", "预约考点1", "预约时段1", "预约考点2",
@@ -77,9 +77,9 @@ public class StudentApplyServiceImp extends ServiceImpl<StudentApplyDao, Student
     private ExamSiteService examSiteService;
 
     @Override
-    public PageResult<StdApplyVO> page(StdApplyReq req) {
-        IPage<StdApplyVO> iPage = this.baseMapper.page(new Page<StdApplyVO>(req.getPageNumber(), req.getPageSize()),
-                req);
+    public PageResult<StudentApplyVO> page(StudentApplyReq req) {
+        IPage<StudentApplyVO> iPage = this.baseMapper
+                .page(new Page<StudentApplyVO>(req.getPageNumber(), req.getPageSize()), req);
         return PageUtil.of(iPage);
     }
 
@@ -135,12 +135,12 @@ public class StudentApplyServiceImp extends ServiceImpl<StudentApplyDao, Student
         Map<String, Long> teachingCache = getTeachingCache();
         Map<String, Long> agentCache = getAgentCache(teachingId);
         Map<String, Long> timeCache = getTimePeriodCache();
-        List<StdImportVO> applyList = new ArrayList<>();
+        List<StudentImportVO> applyList = new ArrayList<>();
         AgentAndTimeVO agentTime = new AgentAndTimeVO();
         for (int i = 0; i < lineList.size(); i++) {
             List<AgentAndTimeVO> agentTimeList = new ArrayList<>();
             DataMap line = lineList.get(i);
-            StdImportVO apply = new StdImportVO();
+            StudentImportVO apply = new StudentImportVO();
             StringBuilder msg = new StringBuilder();
             String studentCode = trimAndNullIfBlank(line.get(EXCEL_HEADER[0]));
             if (StringUtils.isBlank(studentCode)) {
@@ -280,7 +280,7 @@ public class StudentApplyServiceImp extends ServiceImpl<StudentApplyDao, Student
             return failRecords;
         }
         for (int i = 0; i < applyList.size(); i++) {
-            StdImportVO vo = applyList.get(i);
+            StudentImportVO vo = applyList.get(i);
             try {
                 saveStdApply(vo);
             } catch (StatusException e) {
@@ -306,7 +306,7 @@ public class StudentApplyServiceImp extends ServiceImpl<StudentApplyDao, Student
         // DateUtil.isBetwwen(start, end)
     }
 
-    private void saveStdApply(StdImportVO vo) {
+    private void saveStdApply(StudentImportVO vo) {
         List<AgentAndTimeVO> agentTimeList = vo.getAgentTimeList();
         LambdaQueryWrapper<StudentApplyEntity> lm = new LambdaQueryWrapper<>();
         lm.eq(StudentApplyEntity::getStudentId, vo.getStudentId());