add 订单状态查询接口

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

@@ -111,7 +111,7 @@ public class ExamRegistrationController extends BaseController {
     @ApiOperation(value = "获取报名信息")
     @GetMapping(value = "getExamRegistration")
     @ApiImplicitParams({@ApiImplicitParam(name = "examRegistrationId", value = "报名id", required = true, dataType = "int")})
-    public HttpResponseResult<ExamRegistration> getExamRegistration(Integer examRegistrationId) {
+    public HttpResponseResult<ExamRegistration> getExamRegistration(Long examRegistrationId) {
         return succeed(examRegistrationService.getExamRegistration(examRegistrationId));
     }
 

edu-user/edu-user-server/src/main/java/com/keao/edu/user/dao/ExamRegistrationDao.java

@@ -14,63 +14,64 @@ import java.util.Map;
 public interface ExamRegistrationDao extends BaseDAO<Long, ExamRegistration> {
 
     /**
+     * @param organIds:
+     * @return int
      * @describe 统计无教室学员
      * @author Joburgess
      * @date 2020.06.29
-     * @param organIds:
-     * @return int
      */
-    int countWithoutExamRoomStudentNum(@Param("organIds")List<Integer> organIds,
+    int countWithoutExamRoomStudentNum(@Param("organIds") List<Integer> organIds,
                                        @Param("examId") Integer examId);
 
     /**
-     * @describe 统计已分配教室学员数量
-     * @author Joburgess
-     * @date 2020.06.30
      * @param organIds:
      * @param examId:
      * @return int
+     * @describe 统计已分配教室学员数量
+     * @author Joburgess
+     * @date 2020.06.30
      */
-    int countInExamRoomStudentNum(@Param("organIds")List<Integer> organIds,
+    int countInExamRoomStudentNum(@Param("organIds") List<Integer> organIds,
                                   @Param("examId") Integer examId);
 
     /**
-     * @describe 统计总报名人数
-     * @author Joburgess
-     * @date 2020.06.30
      * @param organIds:
      * @param examId:
      * @return int
+     * @describe 统计总报名人数
+     * @author Joburgess
+     * @date 2020.06.30
      */
-    int countTotalRegistrationStudentNumWithExam(@Param("organIds")List<Integer> organIds,
+    int countTotalRegistrationStudentNumWithExam(@Param("organIds") List<Integer> organIds,
                                                  @Param("examId") Integer examId);
 
     /**
+     * @param selfOrganId: 本级合作单位编号
+     * @param organIds:    本级及子级合作单位编号
+     * @param examId:      考级项目编号
+     * @return com.keao.edu.user.dto.ExamRegistrationStatisticsDto
      * @describe 统计招生信息
      * @author Joburgess
      * @date 2020.06.30
-     * @param selfOrganId: 本级合作单位编号
-     * @param organIds: 本级及子级合作单位编号
-     * @param examId: 考级项目编号
-     * @return com.keao.edu.user.dto.ExamRegistrationStatisticsDto
      */
     ExamRegistrationStatisticsDto getExamRegistrationStaticsInfo(@Param("selfOrganId") Integer selfOrganId,
                                                                  @Param("organIds") List<Integer> organIds,
                                                                  @Param("examId") Integer examId);
 
     /**
-     * @describe 获取指定考级项目下指定学员的报名记录
-     * @author Joburgess
-     * @date 2020.07.02
      * @param examId:
      * @param studentIds:
      * @return java.util.List<com.keao.edu.user.entity.ExamRegistration>
+     * @describe 获取指定考级项目下指定学员的报名记录
+     * @author Joburgess
+     * @date 2020.07.02
      */
     List<ExamRegistration> getWithExamAndStudents(@Param("examId") Integer examId,
                                                   @Param("studentIds") List<Integer> studentIds);
 
     /**
      * COUNT学员报考记录
+     *
      * @param params
      * @return
      */
@@ -78,6 +79,7 @@ public interface ExamRegistrationDao extends BaseDAO<Long, ExamRegistration> {
 
     /**
      * 获取学员报考列表
+     *
      * @param params
      * @return
      */
@@ -85,13 +87,13 @@ public interface ExamRegistrationDao extends BaseDAO<Long, ExamRegistration> {
 
     /**
      * 学员考试记录
+     *
      * @param params
      * @return
      */
     List<ExamRecordDto> queryExamList(Map<String, Object> params);
 
     /**
-     *
      * @param params
      * @return
      */
@@ -100,7 +102,8 @@ public interface ExamRegistrationDao extends BaseDAO<Long, ExamRegistration> {
 
     /**
      * 获取报名信息
+     *
      * @return
      */
-    ExamRegistrationDto getExamRegistration(Integer examRegistrationId);
+    ExamRegistrationDto getExamRegistration(@Param("examRegistrationId") Long examRegistrationId);
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/ExamRegistrationService.java

@@ -54,7 +54,7 @@ public interface ExamRegistrationService extends BaseService<Long, ExamRegistrat
     * @param examRegistrationId
     * @return
     */
-   ExamRegistrationDto getExamRegistration(Integer examRegistrationId);
+   ExamRegistrationDto getExamRegistration(Long examRegistrationId);
 
    /**
     * 重新支付

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamRegistrationServiceImpl.java

@@ -216,7 +216,7 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
     }
 
     @Override
-    public ExamRegistrationDto getExamRegistration(Integer examRegistrationId) {
+    public ExamRegistrationDto getExamRegistration(Long examRegistrationId) {
         return examRegistrationDao.getExamRegistration(examRegistrationId);
     }
 

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamRegistrationMapper.xml

@@ -22,7 +22,7 @@
 		<result column="adviser_name_" property="adviserName" />
 		<result column="adviser_phone_" property="adviserPhone" />
 		<result column="card_no_" property="cardNo" />
-		<result column="status_" property="status" typeHandler="com.keao.edu.common.dal.CustomEnumTypeHandler"/>
+		<result column="status_" property="status" />
 		<result column="memo_" property="memo" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
@@ -302,5 +302,6 @@
 		LEFT JOIN sys_user su ON su.id_ = er.subject_id_
 		LEFT JOIN examination_basic eb ON er.examination_basic_id_ = eb.id_
 		LEFT JOIN subject s on er.subject_id_ = s.id_
+		WHERE er.id_ = #{examRegistrationId}
 	</select>
 </mapper>