update

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

@@ -1,16 +1,21 @@
 package com.keao.edu.controller;
 
-import com.keao.edu.common.controller.BaseController;
-import com.keao.edu.common.entity.HttpResponseResult;
-import com.keao.edu.user.entity.ExaminationBasic;
-import com.keao.edu.user.service.ExaminationBasicService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.keao.edu.common.controller.BaseController;
+import com.keao.edu.common.entity.HttpResponseResult;
+import com.keao.edu.common.page.PageInfo;
+import com.keao.edu.common.page.QueryInfo;
+import com.keao.edu.user.entity.ExaminationBasic;
+import com.keao.edu.user.service.ExaminationBasicService;
+
 /**
  * @Author Joburgess
  * @Date 2020.06.18
@@ -28,4 +33,12 @@ public class ExaminationBasicController extends BaseController {
     public HttpResponseResult<ExaminationBasic> getInfo(Integer examId){
         return succeed(examinationBasicService.getInfo(examId));
     }
+
+    @ApiOperation("分页查询")
+    @GetMapping(value = "/queryPage")
+    public HttpResponseResult<PageInfo<ExaminationBasic>> queryPage(String search) {
+    	QueryInfo queryInfo = new QueryInfo();
+    	queryInfo.setSearch(search);
+        return succeed(examinationBasicService.queryPage(queryInfo));
+    }
 }

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

@@ -9,6 +9,9 @@ public class StudentBaseExamsDto {
 
     @ApiModelProperty(value = "机构编号")
     private Integer tenantId;
+    
+    @ApiModelProperty(value = "考级项目编号")
+    private Integer examBasicId;
 
     public String getBaseExamName() {
         return baseExamName;
@@ -25,4 +28,12 @@ public class StudentBaseExamsDto {
     public void setTenantId(Integer tenantId) {
         this.tenantId = tenantId;
     }
+
+	public Integer getExamBasicId() {
+		return examBasicId;
+	}
+
+	public void setExamBasicId(Integer examBasicId) {
+		this.examBasicId = examBasicId;
+	}
 }

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

@@ -598,9 +598,10 @@
 	<resultMap id="StudentBaseExamsDtoMap" type="com.keao.edu.user.dto.StudentBaseExamsDto">
 		<result property="baseExamName" column="examBaseName"/>
 		<result property="tenantId" column="tenant_id_"/>
+		<result property="examBasicId" column="examination_basic_id_"/>
 	</resultMap>
 	<select id="queryStudentBaseExams" resultMap="StudentBaseExamsDtoMap">
-		SELECT eb.name_ examBaseName,eb.tenant_id_ FROM examination_basic eb
+		SELECT eb.name_ examBaseName,eb.tenant_id_,er.examination_basic_id_ FROM examination_basic eb
 		LEFT JOIN exam_registration er ON er.examination_basic_id_ = eb.id_
 		<include refid="queryStudentBaseExamsSql"/>
 		ORDER BY er.update_time_ DESC