wangliang 4 anni fa
parent
commit
72c23806da
37 ha cambiato i file con 651 aggiunte e 43 eliminazioni
  1. 3 2
      themis-backend/src/main/java/com/qmth/themis/backend/api/TBExamInvigilateUserController.java
  2. 3 2
      themis-backend/src/main/java/com/qmth/themis/backend/api/TBOrgController.java
  3. 3 2
      themis-backend/src/main/java/com/qmth/themis/backend/api/TBTaskHistoryController.java
  4. 3 2
      themis-backend/src/main/java/com/qmth/themis/backend/api/TBUserController.java
  5. 3 2
      themis-backend/src/main/java/com/qmth/themis/backend/api/TEExamStudentController.java
  6. 6 4
      themis-backend/src/main/java/com/qmth/themis/backend/api/TEStudentController.java
  7. 2 1
      themis-business/src/main/java/com/qmth/themis/business/dao/TBExamInvigilateUserMapper.java
  8. 2 1
      themis-business/src/main/java/com/qmth/themis/business/dao/TBOrgMapper.java
  9. 2 1
      themis-business/src/main/java/com/qmth/themis/business/dao/TBTaskHistoryMapper.java
  10. 2 1
      themis-business/src/main/java/com/qmth/themis/business/dao/TBUserMapper.java
  11. 2 1
      themis-business/src/main/java/com/qmth/themis/business/dao/TEExamStudentMapper.java
  12. 4 2
      themis-business/src/main/java/com/qmth/themis/business/dao/TEStudentMapper.java
  13. 50 0
      themis-business/src/main/java/com/qmth/themis/business/dto/response/TBExamInvigilateUserDto.java
  14. 87 0
      themis-business/src/main/java/com/qmth/themis/business/dto/response/TBOrgDto.java
  15. 132 0
      themis-business/src/main/java/com/qmth/themis/business/dto/response/TBTaskDto.java
  16. 69 0
      themis-business/src/main/java/com/qmth/themis/business/dto/response/TBUserDto.java
  17. 122 0
      themis-business/src/main/java/com/qmth/themis/business/dto/response/TEExamStudentDto.java
  18. 105 0
      themis-business/src/main/java/com/qmth/themis/business/dto/response/TEStudentDto.java
  19. 15 0
      themis-business/src/main/java/com/qmth/themis/business/dto/response/TEStudentExamRecordDto.java
  20. 2 1
      themis-business/src/main/java/com/qmth/themis/business/service/TBExamInvigilateUserService.java
  21. 2 1
      themis-business/src/main/java/com/qmth/themis/business/service/TBOrgService.java
  22. 2 1
      themis-business/src/main/java/com/qmth/themis/business/service/TBTaskHistoryService.java
  23. 2 1
      themis-business/src/main/java/com/qmth/themis/business/service/TBUserService.java
  24. 2 1
      themis-business/src/main/java/com/qmth/themis/business/service/TEExamStudentService.java
  25. 4 2
      themis-business/src/main/java/com/qmth/themis/business/service/TEStudentService.java
  26. 2 1
      themis-business/src/main/java/com/qmth/themis/business/service/impl/TBExamInvigilateUserServiceImpl.java
  27. 2 1
      themis-business/src/main/java/com/qmth/themis/business/service/impl/TBOrgServiceImpl.java
  28. 2 1
      themis-business/src/main/java/com/qmth/themis/business/service/impl/TBTaskHistoryServiceImpl.java
  29. 2 1
      themis-business/src/main/java/com/qmth/themis/business/service/impl/TBUserServiceImpl.java
  30. 2 1
      themis-business/src/main/java/com/qmth/themis/business/service/impl/TEExamStudentServiceImpl.java
  31. 4 2
      themis-business/src/main/java/com/qmth/themis/business/service/impl/TEStudentServiceImpl.java
  32. 1 1
      themis-business/src/main/resources/mapper/TBExamInvigilateUserMapper.xml
  33. 1 1
      themis-business/src/main/resources/mapper/TBOrgMapper.xml
  34. 2 2
      themis-business/src/main/resources/mapper/TBTaskHistoryMapper.xml
  35. 1 1
      themis-business/src/main/resources/mapper/TBUserMapper.xml
  36. 1 1
      themis-business/src/main/resources/mapper/TEExamStudentMapper.xml
  37. 2 2
      themis-business/src/main/resources/mapper/TEStudentMapper.xml

+ 3 - 2
themis-backend/src/main/java/com/qmth/themis/backend/api/TBExamInvigilateUserController.java

@@ -7,6 +7,7 @@ import com.qmth.themis.business.annotation.ApiJsonObject;
 import com.qmth.themis.business.annotation.ApiJsonProperty;
 import com.qmth.themis.business.config.SystemConfig;
 import com.qmth.themis.business.constant.SystemConstant;
+import com.qmth.themis.business.dto.response.TBExamInvigilateUserDto;
 import com.qmth.themis.business.entity.*;
 import com.qmth.themis.business.enums.FieldUniqueEnum;
 import com.qmth.themis.business.enums.MqEnum;
@@ -64,9 +65,9 @@ public class TBExamInvigilateUserController {
 
     @ApiOperation(value = "监考员查询接口")
     @RequestMapping(value = "/query", method = RequestMethod.GET)
-    @ApiResponses({@ApiResponse(code = 200, message = "监考员信息", response = TEExamStudent.class)})
+    @ApiResponses({@ApiResponse(code = 200, message = "监考员信息", response = TBExamInvigilateUserDto.class)})
     public Result query(@ApiParam(value = "考场代码", required = false) @RequestParam(required = false) String roomCode, @ApiParam(value = "用户id", required = false) @RequestParam(required = false) Long userId, @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber, @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
-        IPage<Map> examInvigilateUserQuery = tbExamInvigilateUserService.examInvigilateUserQuery(new Page<>(pageNumber, pageSize), roomCode, userId);
+        IPage<TBExamInvigilateUserDto> examInvigilateUserQuery = tbExamInvigilateUserService.examInvigilateUserQuery(new Page<>(pageNumber, pageSize), roomCode, userId);
         Map map = new HashMap<>();
         map.put(SystemConstant.RECORDS, examInvigilateUserQuery);
         return ResultUtil.ok(map);

+ 3 - 2
themis-backend/src/main/java/com/qmth/themis/backend/api/TBOrgController.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.themis.business.annotation.ApiJsonObject;
 import com.qmth.themis.business.annotation.ApiJsonProperty;
 import com.qmth.themis.business.constant.SystemConstant;
+import com.qmth.themis.business.dto.response.TBOrgDto;
 import com.qmth.themis.business.entity.TBOrg;
 import com.qmth.themis.business.entity.TBUser;
 import com.qmth.themis.business.service.TBOrgService;
@@ -52,9 +53,9 @@ public class TBOrgController {
 //    @Cacheable(value = "org_cache", key = "#p0")
     @ApiOperation(value = "机构查询分页接口")
     @RequestMapping(value = "/query", method = RequestMethod.GET)
-    @ApiResponses({@ApiResponse(code = 200, message = "机构信息", response = TBOrg.class)})
+    @ApiResponses({@ApiResponse(code = 200, message = "机构信息", response = TBOrgDto.class)})
     public Result queryByPage(@ApiParam(value = "机构代码", required = false) @RequestParam(required = false) String code, @ApiParam(value = "机构名称", required = false) @RequestParam(required = false) String name, @ApiParam(value = "是否启用", required = false) @RequestParam(required = false) Integer enable, @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber, @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
-        IPage<Map> tborgIPage = tbOrgService.queryByPage(new Page<>(pageNumber, pageSize), code, name, enable);
+        IPage<TBOrgDto> tborgIPage = tbOrgService.queryByPage(new Page<>(pageNumber, pageSize), code, name, enable);
         Map map = new HashMap<>();
         map.put(SystemConstant.RECORDS, tborgIPage);
         return ResultUtil.ok(map);

+ 3 - 2
themis-backend/src/main/java/com/qmth/themis/backend/api/TBTaskHistoryController.java

@@ -3,6 +3,7 @@ package com.qmth.themis.backend.api;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.themis.business.constant.SystemConstant;
+import com.qmth.themis.business.dto.response.TBTaskDto;
 import com.qmth.themis.business.entity.TBTaskHistory;
 import com.qmth.themis.business.enums.TaskStatusEnum;
 import com.qmth.themis.business.enums.TaskTypeEnum;
@@ -39,7 +40,7 @@ public class TBTaskHistoryController {
 
     @ApiOperation(value = "任务查询接口")
     @RequestMapping(value = "/query", method = RequestMethod.GET)
-    @ApiResponses({@ApiResponse(code = 200, message = "任务信息", response = TBTaskHistory.class)})
+    @ApiResponses({@ApiResponse(code = 200, message = "任务信息", response = TBTaskDto.class)})
     public Result query(@ApiParam(value = "任务id", required = false) @RequestParam(required = false) Long id, @ApiParam(value = "业务对象id", required = false) @RequestParam(required = false) Long entityId, @ApiParam(value = "任务类型", required = true) @RequestParam TaskTypeEnum type, @ApiParam(value = "任务状态", required = false) @RequestParam(required = false) TaskStatusEnum status, @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber, @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
         if (Objects.isNull(type) || Objects.equals(type, "")) {
             throw new BusinessException(ExceptionResultEnum.TASK_TYPE_IS_NULL);
@@ -47,7 +48,7 @@ public class TBTaskHistoryController {
         if (Objects.isNull(TaskTypeEnum.valueOf(type.name()))) {
             throw new BusinessException(ExceptionResultEnum.TASK_TYPE_ERROR);
         }
-        IPage<Map> teExamStudentIPage = tbTaskHistoryService.taskQuery(new Page<>(pageNumber, pageSize), id, entityId, type, status);
+        IPage<TBTaskDto> teExamStudentIPage = tbTaskHistoryService.taskQuery(new Page<>(pageNumber, pageSize), id, entityId, type, status);
         Map map = new HashMap<>();
         map.put(SystemConstant.RECORDS, teExamStudentIPage);
         return ResultUtil.ok(map);

+ 3 - 2
themis-backend/src/main/java/com/qmth/themis/backend/api/TBUserController.java

@@ -9,6 +9,7 @@ import com.qmth.themis.business.annotation.ApiJsonObject;
 import com.qmth.themis.business.annotation.ApiJsonProperty;
 import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.dto.AuthDto;
+import com.qmth.themis.business.dto.response.TBUserDto;
 import com.qmth.themis.business.entity.TBOrg;
 import com.qmth.themis.business.entity.TBSession;
 import com.qmth.themis.business.entity.TBUser;
@@ -545,9 +546,9 @@ public class TBUserController {
     //    @CachePut(value = "user_cache", key = "'userCacheQuery'")
     @ApiOperation(value = "用户查询接口")
     @RequestMapping(value = "/query", method = RequestMethod.GET)
-    @ApiResponses({@ApiResponse(code = 200, message = "用户信息", response = TBUser.class)})
+    @ApiResponses({@ApiResponse(code = 200, message = "用户信息", response = TBUserDto.class)})
     public Result query(@ApiParam(value = "用户id", required = false) @RequestParam(required = false) Long id, @ApiParam(value = "登录名", required = false) @RequestParam(required = false) String loginName, @ApiParam(value = "姓名", required = false) @RequestParam(required = false) String name, @ApiParam(value = "角色", required = false) @RequestParam(required = false) String role, @ApiParam(value = "是否启用", required = false) @RequestParam(required = false) Integer enable, @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber, @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
-        IPage<Map> tbUserIPage = tbUserService.userQuery(new Page<>(pageNumber, pageSize), id, loginName, name, role, enable);
+        IPage<TBUserDto> tbUserIPage = tbUserService.userQuery(new Page<>(pageNumber, pageSize), id, loginName, name, role, enable);
         Map map = new HashMap<>();
         map.put(SystemConstant.RECORDS, tbUserIPage);
         return ResultUtil.ok(map);

+ 3 - 2
themis-backend/src/main/java/com/qmth/themis/backend/api/TEExamStudentController.java

@@ -7,6 +7,7 @@ import com.qmth.themis.business.annotation.ApiJsonObject;
 import com.qmth.themis.business.annotation.ApiJsonProperty;
 import com.qmth.themis.business.config.SystemConfig;
 import com.qmth.themis.business.constant.SystemConstant;
+import com.qmth.themis.business.dto.response.TEExamStudentDto;
 import com.qmth.themis.business.entity.*;
 import com.qmth.themis.business.enums.MqEnum;
 import com.qmth.themis.business.enums.TaskStatusEnum;
@@ -74,12 +75,12 @@ public class TEExamStudentController {
 
     @ApiOperation(value = "考生查询接口")
     @RequestMapping(value = "/query", method = RequestMethod.GET)
-    @ApiResponses({@ApiResponse(code = 200, message = "考生信息", response = TEExamStudent.class)})
+    @ApiResponses({@ApiResponse(code = 200, message = "考生信息", response = TEExamStudentDto.class)})
     public Result query(@ApiParam(value = "考试批次id", required = true) @RequestParam Long examId, @ApiParam(value = "考试批次id", required = false) @RequestParam(required = false) Long activityId, @ApiParam(value = "证件号", required = false) @RequestParam(required = false) String identity, @ApiParam(value = "姓名", required = false) @RequestParam(required = false) String name, @ApiParam(value = "考场代码", required = false) @RequestParam(required = false) String roomCode, @ApiParam(value = "科目代码", required = false) @RequestParam(required = false) String courseCode, @ApiParam(value = "年级", required = false) @RequestParam String grade, @ApiParam(value = "是否启用", required = false) @RequestParam(required = false) Integer enable, @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber, @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
         if (Objects.isNull(examId) || Objects.equals(examId, "")) {
             throw new BusinessException(ExceptionResultEnum.EXAM_ID_IS_NULL);
         }
-        IPage<Map> teExamStudentIPage = teExamStudentService.examStudentQuery(new Page<>(pageNumber, pageSize), examId, activityId, identity, name, roomCode, courseCode, grade, enable);
+        IPage<TEExamStudentDto> teExamStudentIPage = teExamStudentService.examStudentQuery(new Page<>(pageNumber, pageSize), examId, activityId, identity, name, roomCode, courseCode, grade, enable);
         Map map = new HashMap<>();
         map.put(SystemConstant.RECORDS, teExamStudentIPage);
         return ResultUtil.ok(map);

+ 6 - 4
themis-backend/src/main/java/com/qmth/themis/backend/api/TEStudentController.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.themis.business.annotation.ApiJsonObject;
 import com.qmth.themis.business.annotation.ApiJsonProperty;
 import com.qmth.themis.business.constant.SystemConstant;
+import com.qmth.themis.business.dto.response.TEStudentDto;
+import com.qmth.themis.business.dto.response.TEStudentExamRecordDto;
 import com.qmth.themis.business.entity.TBUser;
 import com.qmth.themis.business.entity.TEExamStudent;
 import com.qmth.themis.business.entity.TEStudent;
@@ -41,9 +43,9 @@ public class TEStudentController {
 
     @ApiOperation(value = "学生查询接口")
     @RequestMapping(value = "/query", method = RequestMethod.GET)
-    @ApiResponses({@ApiResponse(code = 200, message = "考生信息", response = TEExamStudent.class)})
+    @ApiResponses({@ApiResponse(code = 200, message = "考生信息", response = TEStudentDto.class)})
     public Result query(@ApiParam(value = "证件号", required = false) @RequestParam(required = false) String identity, @ApiParam(value = "姓名", required = false) @RequestParam(required = false) String name, @ApiParam(value = "是否启用", required = false) @RequestParam(required = false) Integer enable, @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber, @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
-        IPage<Map> teExamStudentIPage = teStudentService.studentQuery(new Page<>(pageNumber, pageSize), identity, name, enable);
+        IPage<TEStudentDto> teExamStudentIPage = teStudentService.studentQuery(new Page<>(pageNumber, pageSize), identity, name, enable);
         Map map = new HashMap<>();
         map.put(SystemConstant.RECORDS, teExamStudentIPage);
         return ResultUtil.ok(map);
@@ -105,12 +107,12 @@ public class TEStudentController {
 
     @ApiOperation(value = "学生考试记录查询接口")
     @RequestMapping(value = "/studentExamRecordQuery", method = RequestMethod.GET)
-    @ApiResponses({@ApiResponse(code = 200, message = "考生信息", response = TEExamStudent.class)})
+    @ApiResponses({@ApiResponse(code = 200, message = "考生信息", response = TEStudentExamRecordDto.class)})
     public Result studentExamRecordQuery(@ApiParam(value = "学生id", required = true) @RequestParam Long id, @ApiParam(value = "批次名称", required = false) @RequestParam(required = false) String name, @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber, @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
         if (Objects.isNull(id) || Objects.equals(id, "")) {
             throw new BusinessException(ExceptionResultEnum.STUDENT_ID_IS_NULL);
         }
-        IPage<Map> studentExamRecordQuery = teStudentService.studentExamRecordQuery(new Page<>(pageNumber, pageSize), id, name);
+        IPage<TEStudentExamRecordDto> studentExamRecordQuery = teStudentService.studentExamRecordQuery(new Page<>(pageNumber, pageSize), id, name);
         Map map = new HashMap<>();
         map.put(SystemConstant.RECORDS, studentExamRecordQuery);
         return ResultUtil.ok(map);

+ 2 - 1
themis-business/src/main/java/com/qmth/themis/business/dao/TBExamInvigilateUserMapper.java

@@ -3,6 +3,7 @@ package com.qmth.themis.business.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.qmth.themis.business.dto.RoomCodeExportDto;
+import com.qmth.themis.business.dto.response.TBExamInvigilateUserDto;
 import com.qmth.themis.business.entity.TBExamInvigilateUser;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -28,7 +29,7 @@ public interface TBExamInvigilateUserMapper extends BaseMapper<TBExamInvigilateU
      * @param userId
      * @return
      */
-    public IPage<Map> examInvigilateUserQuery(IPage<Map> iPage, @Param("roomCode") String roomCode, @Param("userId") Long userId);
+    public IPage<TBExamInvigilateUserDto> examInvigilateUserQuery(IPage<Map> iPage, @Param("roomCode") String roomCode, @Param("userId") Long userId);
 
     /**
      * 监考员导出

+ 2 - 1
themis-business/src/main/java/com/qmth/themis/business/dao/TBOrgMapper.java

@@ -2,6 +2,7 @@ package com.qmth.themis.business.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.qmth.themis.business.dto.response.TBOrgDto;
 import com.qmth.themis.business.entity.TBOrg;
 import com.qmth.themis.business.enums.TaskStatusEnum;
 import com.qmth.themis.business.enums.TaskTypeEnum;
@@ -29,5 +30,5 @@ public interface TBOrgMapper extends BaseMapper<TBOrg> {
      * @param enable
      * @return
      */
-    public IPage<Map> queryByPage(IPage<Map> iPage, @Param("code") String code, @Param("name") String name, @Param("enable") Integer enable);
+    public IPage<TBOrgDto> queryByPage(IPage<Map> iPage, @Param("code") String code, @Param("name") String name, @Param("enable") Integer enable);
 }

+ 2 - 1
themis-business/src/main/java/com/qmth/themis/business/dao/TBTaskHistoryMapper.java

@@ -2,6 +2,7 @@ package com.qmth.themis.business.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.qmth.themis.business.dto.response.TBTaskDto;
 import com.qmth.themis.business.entity.TBTaskHistory;
 import com.qmth.themis.business.enums.TaskStatusEnum;
 import com.qmth.themis.business.enums.TaskTypeEnum;
@@ -30,5 +31,5 @@ public interface TBTaskHistoryMapper extends BaseMapper<TBTaskHistory> {
      * @param status
      * @return
      */
-    public IPage<Map> taskQuery(IPage<Map> iPage, @Param("taskId") Long taskId, @Param("entityId") Long entityId, @Param("type") TaskTypeEnum type, @Param("status") TaskStatusEnum status);
+    public IPage<TBTaskDto> taskQuery(IPage<Map> iPage, @Param("taskId") Long taskId, @Param("entityId") Long entityId, @Param("type") TaskTypeEnum type, @Param("status") TaskStatusEnum status);
 }

+ 2 - 1
themis-business/src/main/java/com/qmth/themis/business/dao/TBUserMapper.java

@@ -2,6 +2,7 @@ package com.qmth.themis.business.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.qmth.themis.business.dto.response.TBUserDto;
 import com.qmth.themis.business.entity.TBUser;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -30,5 +31,5 @@ public interface TBUserMapper extends BaseMapper<TBUser> {
      * @param enable
      * @return
      */
-    IPage<Map> userQuery(IPage<Map> iPage,@Param("id") Long id, @Param("loginName") String loginName, @Param("name") String name, @Param("role") String role, @Param("enable") Integer enable);
+    IPage<TBUserDto> userQuery(IPage<Map> iPage, @Param("id") Long id, @Param("loginName") String loginName, @Param("name") String name, @Param("role") String role, @Param("enable") Integer enable);
 }

+ 2 - 1
themis-business/src/main/java/com/qmth/themis/business/dao/TEExamStudentMapper.java

@@ -2,6 +2,7 @@ package com.qmth.themis.business.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.qmth.themis.business.dto.response.TEExamStudentDto;
 import com.qmth.themis.business.entity.TEExamStudent;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -32,5 +33,5 @@ public interface TEExamStudentMapper extends BaseMapper<TEExamStudent> {
      * @param enable
      * @return
      */
-    public IPage<Map> examStudentQuery(IPage<Map> iPage, @Param("examId") Long examId, @Param("activityId") Long activityId, @Param("identity") String identity, @Param("name") String name, @Param("roomCode") String roomCode, @Param("courseCode") String courseCode, @Param("grade") String grade, @Param("enable") Integer enable);
+    public IPage<TEExamStudentDto> examStudentQuery(IPage<Map> iPage, @Param("examId") Long examId, @Param("activityId") Long activityId, @Param("identity") String identity, @Param("name") String name, @Param("roomCode") String roomCode, @Param("courseCode") String courseCode, @Param("grade") String grade, @Param("enable") Integer enable);
 }

+ 4 - 2
themis-business/src/main/java/com/qmth/themis/business/dao/TEStudentMapper.java

@@ -2,6 +2,8 @@ package com.qmth.themis.business.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.qmth.themis.business.dto.response.TEStudentDto;
+import com.qmth.themis.business.dto.response.TEStudentExamRecordDto;
 import com.qmth.themis.business.entity.TEStudent;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -27,7 +29,7 @@ public interface TEStudentMapper extends BaseMapper<TEStudent> {
      * @param enable
      * @return
      */
-    public IPage<Map> studentQuery(IPage<Map> iPage, @Param("identity") String identity, @Param("name") String name, @Param("enable") Integer enable);
+    public IPage<TEStudentDto> studentQuery(IPage<Map> iPage, @Param("identity") String identity, @Param("name") String name, @Param("enable") Integer enable);
 
     /**
      * 学生考试记录查询
@@ -37,5 +39,5 @@ public interface TEStudentMapper extends BaseMapper<TEStudent> {
      * @param name
      * @return
      */
-    public IPage<Map> studentExamRecordQuery(IPage<Map> iPage, @Param("id") Long id, @Param("name") String name);
+    public IPage<TEStudentExamRecordDto> studentExamRecordQuery(IPage<Map> iPage, @Param("id") Long id, @Param("name") String name);
 }

+ 50 - 0
themis-business/src/main/java/com/qmth/themis/business/dto/response/TBExamInvigilateUserDto.java

@@ -0,0 +1,50 @@
+package com.qmth.themis.business.dto.response;
+
+import java.io.Serializable;
+
+/** 
+* @Description: 监考设置 dto
+* @Param:  
+* @return:  
+* @Author: wangliang
+* @Date: 2020/8/3 
+*/ 
+public class TBExamInvigilateUserDto implements Serializable {
+    
+    private String roomCode;//考场代码
+    private String roomName;//考场名称
+    private String userId;//老师id
+    private String name;//老师名称
+
+    public String getRoomCode() {
+        return roomCode;
+    }
+
+    public void setRoomCode(String roomCode) {
+        this.roomCode = roomCode;
+    }
+
+    public String getRoomName() {
+        return roomName;
+    }
+
+    public void setRoomName(String roomName) {
+        this.roomName = roomName;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

+ 87 - 0
themis-business/src/main/java/com/qmth/themis/business/dto/response/TBOrgDto.java

@@ -0,0 +1,87 @@
+package com.qmth.themis.business.dto.response;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/** 
+* @Description: 机构 dto
+* @Param:  
+* @return:  
+* @Author: wangliang
+* @Date: 2020/8/3 
+*/ 
+public class TBOrgDto implements Serializable {
+
+    private Long id;//机构id
+    private String name;//机构名称
+    private String code;//机构代码
+    private Integer enable;//是否启用
+    private String contactName;//联系人
+    private String contactPhone;//联系电话
+    private String updateName;//更新人
+    private Date updateTime;//更新时间
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public Integer getEnable() {
+        return enable;
+    }
+
+    public void setEnable(Integer enable) {
+        this.enable = enable;
+    }
+
+    public String getContactName() {
+        return contactName;
+    }
+
+    public void setContactName(String contactName) {
+        this.contactName = contactName;
+    }
+
+    public String getContactPhone() {
+        return contactPhone;
+    }
+
+    public void setContactPhone(String contactPhone) {
+        this.contactPhone = contactPhone;
+    }
+
+    public String getUpdateName() {
+        return updateName;
+    }
+
+    public void setUpdateName(String updateName) {
+        this.updateName = updateName;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+}

+ 132 - 0
themis-business/src/main/java/com/qmth/themis/business/dto/response/TBTaskDto.java

@@ -0,0 +1,132 @@
+package com.qmth.themis.business.dto.response;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: task dto
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2020/8/3
+ */
+public class TBTaskDto implements Serializable {
+
+    private Long id;//id
+    private String type;//类型
+    private Long entityId;//实体id
+    private String status;//状态
+    private String summary;//任务状态,init:未开始,running:开始执行,finish:执行结束
+    private Double progress;//进度
+    private String hasResultFile;//结果文件路径
+    private String hasErrorFile;//错误文件路径
+    private Date createTime;//创建时间
+    private Date startTime;//开始时间
+    private Date finishTime;//结束时间
+    private Long createId;//创建人id
+    private String createName;//创建人
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Long getEntityId() {
+        return entityId;
+    }
+
+    public void setEntityId(Long entityId) {
+        this.entityId = entityId;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getSummary() {
+        return summary;
+    }
+
+    public void setSummary(String summary) {
+        this.summary = summary;
+    }
+
+    public Double getProgress() {
+        return progress;
+    }
+
+    public void setProgress(Double progress) {
+        this.progress = progress;
+    }
+
+    public String getHasResultFile() {
+        return hasResultFile;
+    }
+
+    public void setHasResultFile(String hasResultFile) {
+        this.hasResultFile = hasResultFile;
+    }
+
+    public String getHasErrorFile() {
+        return hasErrorFile;
+    }
+
+    public void setHasErrorFile(String hasErrorFile) {
+        this.hasErrorFile = hasErrorFile;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getFinishTime() {
+        return finishTime;
+    }
+
+    public void setFinishTime(Date finishTime) {
+        this.finishTime = finishTime;
+    }
+
+    public Long getCreateId() {
+        return createId;
+    }
+
+    public void setCreateId(Long createId) {
+        this.createId = createId;
+    }
+
+    public String getCreateName() {
+        return createName;
+    }
+
+    public void setCreateName(String createName) {
+        this.createName = createName;
+    }
+}

+ 69 - 0
themis-business/src/main/java/com/qmth/themis/business/dto/response/TBUserDto.java

@@ -0,0 +1,69 @@
+package com.qmth.themis.business.dto.response;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 用户查询response dto
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2020/8/3
+ */
+public class TBUserDto implements Serializable {
+
+    private Long id;//id
+    private String name;//姓名
+    private String roleName;//角色名
+    private Integer enable;//状态
+    private String updateName;//更新人
+    private Date updateTime;//更新时间
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getRoleName() {
+        return roleName;
+    }
+
+    public void setRoleName(String roleName) {
+        this.roleName = roleName;
+    }
+
+    public Integer getEnable() {
+        return enable;
+    }
+
+    public void setEnable(Integer enable) {
+        this.enable = enable;
+    }
+
+    public String getUpdateName() {
+        return updateName;
+    }
+
+    public void setUpdateName(String updateName) {
+        this.updateName = updateName;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+}

+ 122 - 0
themis-business/src/main/java/com/qmth/themis/business/dto/response/TEExamStudentDto.java

@@ -0,0 +1,122 @@
+package com.qmth.themis.business.dto.response;
+
+import java.io.Serializable;
+
+/** 
+* @Description: 考生dto
+* @Param:  
+* @return:  
+* @Author: wangliang
+* @Date: 2020/8/3 
+*/ 
+public class TEExamStudentDto implements Serializable {
+
+    private Long id;//考生id
+    private String examName;//考试批次名称
+    private String name;//考生姓名
+    private String identity;//证件号
+    private String code;//考试场次代码
+    private String courseCode;//科目代码
+    private String courseName;//科目名称
+    private Integer enable;//考生是否启用
+    private String roomCode;//考场代码
+    private String roomName;//考场名称
+    private String grade;//年级
+    private String classNo;//教学班级
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getExamName() {
+        return examName;
+    }
+
+    public void setExamName(String examName) {
+        this.examName = examName;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getIdentity() {
+        return identity;
+    }
+
+    public void setIdentity(String identity) {
+        this.identity = identity;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getCourseCode() {
+        return courseCode;
+    }
+
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
+    public Integer getEnable() {
+        return enable;
+    }
+
+    public void setEnable(Integer enable) {
+        this.enable = enable;
+    }
+
+    public String getRoomCode() {
+        return roomCode;
+    }
+
+    public void setRoomCode(String roomCode) {
+        this.roomCode = roomCode;
+    }
+
+    public String getRoomName() {
+        return roomName;
+    }
+
+    public void setRoomName(String roomName) {
+        this.roomName = roomName;
+    }
+
+    public String getGrade() {
+        return grade;
+    }
+
+    public void setGrade(String grade) {
+        this.grade = grade;
+    }
+
+    public String getClassNo() {
+        return classNo;
+    }
+
+    public void setClassNo(String classNo) {
+        this.classNo = classNo;
+    }
+}

+ 105 - 0
themis-business/src/main/java/com/qmth/themis/business/dto/response/TEStudentDto.java

@@ -0,0 +1,105 @@
+package com.qmth.themis.business.dto.response;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: examStudent dto
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2020/8/3
+ */
+public class TEStudentDto implements Serializable {
+
+    private Long id;//id
+    private String name;//姓名
+    private String identity;//证件号
+    private String orgName;//机构名称
+    private Integer enable;//是否启用
+    private String basePhotoPath;//底照地址
+    private String createName;//创建人
+    private String updateName;//更新人
+    private Date createTime;//创建时间
+    private Date updateTime;//更新时间
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getIdentity() {
+        return identity;
+    }
+
+    public void setIdentity(String identity) {
+        this.identity = identity;
+    }
+
+    public String getOrgName() {
+        return orgName;
+    }
+
+    public void setOrgName(String orgName) {
+        this.orgName = orgName;
+    }
+
+    public Integer getEnable() {
+        return enable;
+    }
+
+    public void setEnable(Integer enable) {
+        this.enable = enable;
+    }
+
+    public String getBasePhotoPath() {
+        return basePhotoPath;
+    }
+
+    public void setBasePhotoPath(String basePhotoPath) {
+        this.basePhotoPath = basePhotoPath;
+    }
+
+    public String getCreateName() {
+        return createName;
+    }
+
+    public void setCreateName(String createName) {
+        this.createName = createName;
+    }
+
+    public String getUpdateName() {
+        return updateName;
+    }
+
+    public void setUpdateName(String updateName) {
+        this.updateName = updateName;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+}

+ 15 - 0
themis-business/src/main/java/com/qmth/themis/business/dto/response/TEStudentExamRecordDto.java

@@ -0,0 +1,15 @@
+package com.qmth.themis.business.dto.response;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 学生考试记录 dto
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2020/8/3
+ */
+public class TEStudentExamRecordDto implements Serializable {
+
+    private Long id;
+}

+ 2 - 1
themis-business/src/main/java/com/qmth/themis/business/service/TBExamInvigilateUserService.java

@@ -3,6 +3,7 @@ package com.qmth.themis.business.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.themis.business.dto.RoomCodeExportDto;
+import com.qmth.themis.business.dto.response.TBExamInvigilateUserDto;
 import com.qmth.themis.business.entity.TBExamInvigilateUser;
 
 import java.util.List;
@@ -25,7 +26,7 @@ public interface TBExamInvigilateUserService extends IService<TBExamInvigilateUs
      * @param userId
      * @return
      */
-    public IPage<Map> examInvigilateUserQuery(IPage<Map> iPage, String roomCode, Long userId);
+    public IPage<TBExamInvigilateUserDto> examInvigilateUserQuery(IPage<Map> iPage, String roomCode, Long userId);
 
     /**
      * 监考员导出

+ 2 - 1
themis-business/src/main/java/com/qmth/themis/business/service/TBOrgService.java

@@ -2,6 +2,7 @@ package com.qmth.themis.business.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.themis.business.dto.response.TBOrgDto;
 import com.qmth.themis.business.entity.TBOrg;
 
 import java.util.Map;
@@ -24,5 +25,5 @@ public interface TBOrgService extends IService<TBOrg> {
      * @param enable
      * @return
      */
-    public IPage<Map> queryByPage(IPage<Map> iPage, String code, String name, Integer enable);
+    public IPage<TBOrgDto> queryByPage(IPage<Map> iPage, String code, String name, Integer enable);
 }

+ 2 - 1
themis-business/src/main/java/com/qmth/themis/business/service/TBTaskHistoryService.java

@@ -2,6 +2,7 @@ package com.qmth.themis.business.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.themis.business.dto.response.TBTaskDto;
 import com.qmth.themis.business.entity.TBTaskHistory;
 import com.qmth.themis.business.enums.TaskStatusEnum;
 import com.qmth.themis.business.enums.TaskTypeEnum;
@@ -28,5 +29,5 @@ public interface TBTaskHistoryService extends IService<TBTaskHistory> {
      * @param status
      * @return
      */
-    public IPage<Map> taskQuery(IPage<Map> iPage, Long taskId, Long entityId, TaskTypeEnum type, TaskStatusEnum status);
+    public IPage<TBTaskDto> taskQuery(IPage<Map> iPage, Long taskId, Long entityId, TaskTypeEnum type, TaskStatusEnum status);
 }

+ 2 - 1
themis-business/src/main/java/com/qmth/themis/business/service/TBUserService.java

@@ -2,6 +2,7 @@ package com.qmth.themis.business.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.themis.business.dto.response.TBUserDto;
 import com.qmth.themis.business.entity.TBUser;
 
 import java.util.Map;
@@ -26,5 +27,5 @@ public interface TBUserService extends IService<TBUser> {
      * @param enable
      * @return
      */
-    IPage<Map> userQuery(IPage<Map> iPage,Long id, String loginName, String name, String role, Integer enable);
+    IPage<TBUserDto> userQuery(IPage<Map> iPage, Long id, String loginName, String name, String role, Integer enable);
 }

+ 2 - 1
themis-business/src/main/java/com/qmth/themis/business/service/TEExamStudentService.java

@@ -3,6 +3,7 @@ package com.qmth.themis.business.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.themis.business.cache.bean.ExamStudentCacheBean;
+import com.qmth.themis.business.dto.response.TEExamStudentDto;
 import com.qmth.themis.business.entity.TEExamStudent;
 
 import java.util.Map;
@@ -30,7 +31,7 @@ public interface TEExamStudentService extends IService<TEExamStudent> {
      * @param enable
      * @return
      */
-    public IPage<Map> examStudentQuery(IPage<Map> iPage, Long examId, Long activityId, String identity, String name, String roomCode, String courseCode, String grade, Integer enable);
+    public IPage<TEExamStudentDto> examStudentQuery(IPage<Map> iPage, Long examId, Long activityId, String identity, String name, String roomCode, String courseCode, String grade, Integer enable);
 
 	ExamStudentCacheBean getExamStudnetCacheBean(Long examStudentId);
 }

+ 4 - 2
themis-business/src/main/java/com/qmth/themis/business/service/TEStudentService.java

@@ -2,6 +2,8 @@ package com.qmth.themis.business.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.themis.business.dto.response.TEStudentDto;
+import com.qmth.themis.business.dto.response.TEStudentExamRecordDto;
 import com.qmth.themis.business.entity.TEStudent;
 
 import java.util.Map;
@@ -24,7 +26,7 @@ public interface TEStudentService extends IService<TEStudent> {
      * @param enable
      * @return
      */
-    public IPage<Map> studentQuery(IPage<Map> iPage, String identity, String name, Integer enable);
+    public IPage<TEStudentDto> studentQuery(IPage<Map> iPage, String identity, String name, Integer enable);
 
     /**
      * 学生考试记录查询
@@ -34,5 +36,5 @@ public interface TEStudentService extends IService<TEStudent> {
      * @param name
      * @return
      */
-    public IPage<Map> studentExamRecordQuery(IPage<Map> iPage, Long id, String name);
+    public IPage<TEStudentExamRecordDto> studentExamRecordQuery(IPage<Map> iPage, Long id, String name);
 }

+ 2 - 1
themis-business/src/main/java/com/qmth/themis/business/service/impl/TBExamInvigilateUserServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.themis.business.dao.TBExamInvigilateUserMapper;
 import com.qmth.themis.business.dto.RoomCodeExportDto;
+import com.qmth.themis.business.dto.response.TBExamInvigilateUserDto;
 import com.qmth.themis.business.entity.TBExamInvigilateUser;
 import com.qmth.themis.business.service.TBExamInvigilateUserService;
 import org.springframework.stereotype.Service;
@@ -34,7 +35,7 @@ public class TBExamInvigilateUserServiceImpl extends ServiceImpl<TBExamInvigilat
      * @return
      */
     @Override
-    public IPage<Map> examInvigilateUserQuery(IPage<Map> iPage, String roomCode, Long userId) {
+    public IPage<TBExamInvigilateUserDto> examInvigilateUserQuery(IPage<Map> iPage, String roomCode, Long userId) {
         return tbExamInvigilateUserMapper.examInvigilateUserQuery(iPage, roomCode, userId);
     }
 

+ 2 - 1
themis-business/src/main/java/com/qmth/themis/business/service/impl/TBOrgServiceImpl.java

@@ -3,6 +3,7 @@ package com.qmth.themis.business.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.themis.business.dao.TBOrgMapper;
+import com.qmth.themis.business.dto.response.TBOrgDto;
 import com.qmth.themis.business.entity.TBOrg;
 import com.qmth.themis.business.service.TBOrgService;
 import org.springframework.stereotype.Service;
@@ -33,7 +34,7 @@ public class TBOrgServiceImpl extends ServiceImpl<TBOrgMapper, TBOrg> implements
      * @return
      */
     @Override
-    public IPage<Map> queryByPage(IPage<Map> iPage, String code, String name, Integer enable) {
+    public IPage<TBOrgDto> queryByPage(IPage<Map> iPage, String code, String name, Integer enable) {
         return tbOrgMapper.queryByPage(iPage, code, name, enable);
     }
 }

+ 2 - 1
themis-business/src/main/java/com/qmth/themis/business/service/impl/TBTaskHistoryServiceImpl.java

@@ -3,6 +3,7 @@ package com.qmth.themis.business.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.themis.business.dao.TBTaskHistoryMapper;
+import com.qmth.themis.business.dto.response.TBTaskDto;
 import com.qmth.themis.business.entity.TBTaskHistory;
 import com.qmth.themis.business.enums.TaskStatusEnum;
 import com.qmth.themis.business.enums.TaskTypeEnum;
@@ -36,7 +37,7 @@ public class TBTaskHistoryServiceImpl extends ServiceImpl<TBTaskHistoryMapper, T
      * @return
      */
     @Override
-    public IPage<Map> taskQuery(IPage<Map> iPage, Long taskId, Long entityId, TaskTypeEnum type, TaskStatusEnum status) {
+    public IPage<TBTaskDto> taskQuery(IPage<Map> iPage, Long taskId, Long entityId, TaskTypeEnum type, TaskStatusEnum status) {
         return tbTaskHistoryMapper.taskQuery(iPage, taskId, entityId, type, status);
     }
 }

+ 2 - 1
themis-business/src/main/java/com/qmth/themis/business/service/impl/TBUserServiceImpl.java

@@ -3,6 +3,7 @@ package com.qmth.themis.business.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.themis.business.dao.TBUserMapper;
+import com.qmth.themis.business.dto.response.TBUserDto;
 import com.qmth.themis.business.entity.TBUser;
 import com.qmth.themis.business.service.TBUserService;
 import org.springframework.stereotype.Service;
@@ -36,7 +37,7 @@ public class TBUserServiceImpl extends ServiceImpl<TBUserMapper, TBUser> impleme
      * @return
      */
     @Override
-    public IPage<Map> userQuery(IPage<Map> iPage, Long id, String loginName, String name, String role, Integer enable) {
+    public IPage<TBUserDto> userQuery(IPage<Map> iPage, Long id, String loginName, String name, String role, Integer enable) {
         return tbUserMapper.userQuery(iPage, id, loginName, name, role, enable);
     }
 }

+ 2 - 1
themis-business/src/main/java/com/qmth/themis/business/service/impl/TEExamStudentServiceImpl.java

@@ -4,6 +4,7 @@ import java.util.Map;
 
 import javax.annotation.Resource;
 
+import com.qmth.themis.business.dto.response.TEExamStudentDto;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -41,7 +42,7 @@ public class TEExamStudentServiceImpl extends ServiceImpl<TEExamStudentMapper, T
      * @return
      */
     @Override
-    public IPage<Map> examStudentQuery(IPage<Map> iPage, Long examId, Long activityId, String identity, String name, String roomCode, String courseCode, String grade, Integer enable) {
+    public IPage<TEExamStudentDto> examStudentQuery(IPage<Map> iPage, Long examId, Long activityId, String identity, String name, String roomCode, String courseCode, String grade, Integer enable) {
         return teExamStudentMapper.examStudentQuery(iPage, examId, activityId, identity, name, roomCode, courseCode, grade, enable);
     }
     

+ 4 - 2
themis-business/src/main/java/com/qmth/themis/business/service/impl/TEStudentServiceImpl.java

@@ -3,6 +3,8 @@ package com.qmth.themis.business.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.themis.business.dao.TEStudentMapper;
+import com.qmth.themis.business.dto.response.TEStudentDto;
+import com.qmth.themis.business.dto.response.TEStudentExamRecordDto;
 import com.qmth.themis.business.entity.TEStudent;
 import com.qmth.themis.business.service.TEStudentService;
 import org.springframework.stereotype.Service;
@@ -33,7 +35,7 @@ public class TEStudentServiceImpl extends ServiceImpl<TEStudentMapper, TEStudent
      * @return
      */
     @Override
-    public IPage<Map> studentQuery(IPage<Map> iPage, String identity, String name, Integer enable) {
+    public IPage<TEStudentDto> studentQuery(IPage<Map> iPage, String identity, String name, Integer enable) {
         return teStudentMapper.studentQuery(iPage, identity, name, enable);
     }
 
@@ -46,7 +48,7 @@ public class TEStudentServiceImpl extends ServiceImpl<TEStudentMapper, TEStudent
      * @return
      */
     @Override
-    public IPage<Map> studentExamRecordQuery(IPage<Map> iPage, Long id, String name) {
+    public IPage<TEStudentExamRecordDto> studentExamRecordQuery(IPage<Map> iPage, Long id, String name) {
         return teStudentMapper.studentExamRecordQuery(iPage, id, name);
     }
 }

+ 1 - 1
themis-business/src/main/resources/mapper/TBExamInvigilateUserMapper.xml

@@ -25,7 +25,7 @@
         ) t
     </sql>
 
-    <select id="examInvigilateUserQuery" resultType="java.util.Map">
+    <select id="examInvigilateUserQuery" resultType="com.qmth.themis.business.dto.response.TBExamInvigilateUserDto">
         select
         t.roomCode,
         t.roomName,

+ 1 - 1
themis-business/src/main/resources/mapper/TBOrgMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.qmth.themis.business.dao.TBOrgMapper">
 
-    <select id="queryByPage" resultType="java.util.Map">
+    <select id="queryByPage" resultType="com.qmth.themis.business.dto.response.TBOrgDto">
         select
             t.id,
             t.name,

+ 2 - 2
themis-business/src/main/resources/mapper/TBTaskHistoryMapper.xml

@@ -2,11 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.qmth.themis.business.dao.TBTaskHistoryMapper">
 
-    <select id="taskQuery" resultType="java.util.Map">
+    <select id="taskQuery" resultType="com.qmth.themis.business.dto.response.TBTaskDto">
         select
             tbth.id,
             tbth.`type`,
-            tbth.entity_id as entityid,
+            tbth.entity_id as entityId,
             tbth.status,
             tbth.summary,
             tbth.progress,

+ 1 - 1
themis-business/src/main/resources/mapper/TBUserMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.qmth.themis.business.dao.TBUserMapper">
 
-    <select id="userQuery" resultType="java.util.Map">
+    <select id="userQuery" resultType="com.qmth.themis.business.dto.response.TBUserDto">
         select
             t.id,
             t.name,

+ 1 - 1
themis-business/src/main/resources/mapper/TEExamStudentMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.qmth.themis.business.dao.TEExamStudentMapper">
 
-    <select id="examStudentQuery" resultType="java.util.Map">
+    <select id="examStudentQuery" resultType="com.qmth.themis.business.dto.response.TEExamStudentDto">
         select
             tees.id,
             tee.name as examName,

+ 2 - 2
themis-business/src/main/resources/mapper/TEStudentMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.qmth.themis.business.dao.TEStudentMapper">
 
-    <select id="studentQuery" resultType="java.util.Map">
+    <select id="studentQuery" resultType="com.qmth.themis.business.dto.response.TEStudentDto">
         select
             tes.id,
             tes.name,
@@ -31,7 +31,7 @@
         </where>
     </select>
 
-    <select id="studentExamRecordQuery" resultType="java.util.Map">
+    <select id="studentExamRecordQuery" resultType="com.qmth.themis.business.dto.response.TEStudentExamRecordDto">
 
     </select>
 </mapper>