update

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/dao/StudentExamResultDao.java

@@ -2,6 +2,7 @@ package com.keao.edu.user.dao;
 
 import com.keao.edu.common.dal.BaseDAO;
 import com.keao.edu.user.api.enums.StudentExamResultApiDto;
+import com.keao.edu.user.dto.StudentExamResultDto;
 import com.keao.edu.user.dto.StudentExamResultStatisticsDto;
 import com.keao.edu.user.entity.StudentExamResult;
 import org.apache.ibatis.annotations.Param;
@@ -32,7 +33,7 @@ public interface StudentExamResultDao extends BaseDAO<Long, StudentExamResult> {
      * @param params:
      * @return java.util.List<com.keao.edu.user.entity.StudentExamResult>
      */
-    List<StudentExamResult> queryStudentExamResult(Map<String, Object> params);
+    List<StudentExamResultDto> queryStudentExamResult(Map<String, Object> params);
 
     int countStudentExamResult(Map<String, Object> params);
 

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/dto/StudentExamResultDto.java

@@ -0,0 +1,21 @@
+package com.keao.edu.user.dto;
+
+import com.keao.edu.user.api.enums.ExamModeEnum;
+import com.keao.edu.user.entity.StudentExamResult;
+
+/**
+ * @Author Joburgess
+ * @Date 2020.08.14
+ */
+public class StudentExamResultDto extends StudentExamResult {
+
+    private ExamModeEnum examMode;
+
+    public ExamModeEnum getExamMode() {
+        return examMode;
+    }
+
+    public void setExamMode(ExamModeEnum examMode) {
+        this.examMode = examMode;
+    }
+}

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/StudentExamResultService.java

@@ -4,6 +4,7 @@ import com.keao.edu.common.page.PageInfo;
 import com.keao.edu.common.service.BaseService;
 import com.keao.edu.user.api.enums.StudentExamResultApiDto;
 import com.keao.edu.user.dto.RecordNotify;
+import com.keao.edu.user.dto.StudentExamResultDto;
 import com.keao.edu.user.dto.StudentExamResultStatisticsDto;
 import com.keao.edu.user.entity.StudentExamResult;
 import com.keao.edu.user.page.StudentExamResultQueryInfo;
@@ -17,7 +18,7 @@ public interface StudentExamResultService extends BaseService<Long, StudentExamR
      * @param queryInfo:
      * @return com.keao.edu.common.page.PageInfo<com.keao.edu.user.entity.StudentExamResult>
      */
-    PageInfo<StudentExamResult> queryStudentExamResult(StudentExamResultQueryInfo queryInfo);
+    PageInfo<StudentExamResultDto> queryStudentExamResult(StudentExamResultQueryInfo queryInfo);
 
     /**
      * @describe 更新考试结果

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/impl/StudentExamResultServiceImpl.java

@@ -26,6 +26,7 @@ import com.keao.edu.user.dao.ExaminationBasicDao;
 import com.keao.edu.user.dao.StudentExamResultDao;
 import com.keao.edu.user.dto.ExaminationBasicDto;
 import com.keao.edu.user.dto.RecordNotify;
+import com.keao.edu.user.dto.StudentExamResultDto;
 import com.keao.edu.user.dto.StudentExamResultStatisticsDto;
 import com.keao.edu.user.entity.*;
 import com.keao.edu.user.enums.ExamStatusEnum;
@@ -80,15 +81,15 @@ public class StudentExamResultServiceImpl extends BaseServiceImpl<Long, StudentE
 	}
 
 	@Override
-	public PageInfo<StudentExamResult> queryStudentExamResult(StudentExamResultQueryInfo queryInfo) {
-		PageInfo<StudentExamResult> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+	public PageInfo<StudentExamResultDto> queryStudentExamResult(StudentExamResultQueryInfo queryInfo) {
+		PageInfo<StudentExamResultDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
 		Map<String, Object> params = new HashMap<String, Object>();
 		MapUtil.populateMap(params, queryInfo);
 
 		List<Integer> childOrganIds = organizationService.getChildOrganIds(queryInfo.getOrganId(), true);
 		params.put("organIds", childOrganIds);
 
-		List<StudentExamResult> dataList = new ArrayList<>();
+		List<StudentExamResultDto> dataList = new ArrayList<>();
 		int count = studentExamResultDao.countStudentExamResult(params);
 		if (count > 0) {
 			pageInfo.setTotal(count);

edu-user/edu-user-biz/src/main/resources/config/mybatis/StudentExamResultMapper.xml

@@ -27,7 +27,11 @@
 		<result column="exam_room_id_" property="examRoomId" />
 		<association property="examRegistration" columnPrefix="regist_" resultMap="com.keao.edu.user.dao.ExamRegistrationDao.ExamRegistration"/>
 	</resultMap>
-	
+
+	<resultMap id="StudentExamResultDto" type="com.keao.edu.user.dto.StudentExamResultDto" extends="StudentExamResult">
+		<result column="exam_mode_" property="examMode" typeHandler="com.keao.edu.common.dal.CustomEnumTypeHandler"/>
+	</resultMap>
+
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="StudentExamResult" >
 		SELECT * FROM student_exam_result WHERE id_ = #{id} 
@@ -203,7 +207,7 @@
 		</where>
 	</sql>
 
-	<select id="queryStudentExamResult" resultMap="StudentExamResult" parameterType="map">
+	<select id="queryStudentExamResult" resultMap="StudentExamResultDto" parameterType="map">
 		SELECT
 			ser.*,
 			er.id_ regist_id_,
@@ -211,7 +215,8 @@
 			er.student_id_ regist_student_id_,
 			er.organ_id_ regist_organ_id_,
 			er.subject_id_ regist_subject_id_,
-			er.level_ regist_level_
+			er.level_ regist_level_,
+			ero.exam_mode_
 		FROM
 			student_exam_result ser
 			LEFT JOIN examination_basic eb ON ser.examination_basic_id_=eb.id_

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/StudentExamResultController.java

@@ -8,6 +8,7 @@ import com.keao.edu.common.entity.HttpResponseResult;
 import com.keao.edu.common.page.PageInfo;
 import com.keao.edu.user.api.enums.StudentExamResultApiDto;
 import com.keao.edu.user.dto.RecordNotify;
+import com.keao.edu.user.dto.StudentExamResultDto;
 import com.keao.edu.user.dto.StudentExamResultStatisticsDto;
 import com.keao.edu.user.entity.Employee;
 import com.keao.edu.user.entity.StudentExamResult;
@@ -48,7 +49,7 @@ public class StudentExamResultController extends BaseController {
     @ApiOperation("查询考试结果")
     @GetMapping(value = "/queryStudentExamResult")
     @PreAuthorize("@pcs.hasPermissions('studentExamResult/queryStudentExamResult')")
-    public HttpResponseResult<PageInfo<StudentExamResult>> queryStudentExamResult(StudentExamResultQueryInfo queryInfo){
+    public HttpResponseResult<PageInfo<StudentExamResultDto>> queryStudentExamResult(StudentExamResultQueryInfo queryInfo){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if(!sysUser.getIsSuperAdmin()&&Objects.isNull(queryInfo.getOrganId())){
             Employee employee = employeeService.get(sysUser.getId());