update

edu-common/src/main/java/com/keao/edu/common/page/QueryInfo.java

@@ -34,7 +34,7 @@ public class QueryInfo {
 	 */
 	private String order = "desc";
 
-	private String tenantId= TenantContextHolder.getTenantId();
+	private String tenantId = TenantContextHolder.getTenantId();
 
 	private Integer organId= OrganContextHolder.getOrganId();
 

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

@@ -3,6 +3,7 @@ package com.keao.edu.controller;
 import com.keao.edu.common.controller.BaseController;
 import com.keao.edu.common.entity.HttpResponseResult;
 import com.keao.edu.user.dto.ExamSubjectDto;
+import com.keao.edu.user.entity.Subject;
 import com.keao.edu.user.service.ExamSubjectService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -25,7 +26,7 @@ public class ExamSubjectController extends BaseController {
     @ApiOperation("获取考试项目专业")
     @ApiImplicitParam(name = "ExamId", value = "考试项目id", required = true, dataType = "Integer")
     @GetMapping(value = "/getExamSubjects")
-    public HttpResponseResult<List<ExamSubjectDto>> getExamSubjects(Integer examId) {
+    public HttpResponseResult<List<Subject>> getExamSubjects(Integer examId) {
         return succeed(examSubjectService.getExamSubjects(examId));
     }
 

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

@@ -29,7 +29,7 @@ public interface ExamSubjectDao extends BaseDAO<Long, ExamSubject> {
      * @param examId 考级项目编号
      * @return
      */
-    List<ExamSubjectDto> getSubjectWithExamId(@Param("examId") Integer examId);
+    List<Subject> getSubjectWithExamId(@Param("examId") Integer examId,@Param("studentId") Integer studentId);
 
     /**
      * @describe 获取与考级项目无关的专业

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/page/ExamSongQueryInfo.java

@@ -15,6 +15,17 @@ public class ExamSongQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "曲目类别")
     private SongTypeEnum type;
 
+    private String tenantId;
+
+    @Override
+    public String getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(String tenantId) {
+        this.tenantId = tenantId;
+    }
+
     public Integer getLevel() {
         return level;
     }

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

@@ -17,7 +17,7 @@ public interface ExamSubjectService extends BaseService<Long, ExamSubject> {
      * @param ExamId
      * @return
      */
-    List<ExamSubjectDto> getExamSubjects(Integer ExamId);
+    List<Subject> getExamSubjects(Integer ExamId);
 
     /**
      * @describe 获取与考级项目无关的专业

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

@@ -1,5 +1,7 @@
 package com.keao.edu.user.service.impl;
 
+import com.keao.edu.auth.api.client.SysUserFeignService;
+import com.keao.edu.auth.api.entity.SysUser;
 import com.keao.edu.common.dal.BaseDAO;
 import com.keao.edu.common.service.impl.BaseServiceImpl;
 import com.keao.edu.user.dao.ExamSubjectDao;
@@ -17,6 +19,8 @@ public class ExamSubjectServiceImpl extends BaseServiceImpl<Long, ExamSubject> i
 	
 	@Autowired
 	private ExamSubjectDao examSubjectDao;
+	@Autowired
+	private SysUserFeignService sysUserFeignService;
 
 	@Override
 	public BaseDAO<Long, ExamSubject> getDAO() {
@@ -24,8 +28,9 @@ public class ExamSubjectServiceImpl extends BaseServiceImpl<Long, ExamSubject> i
 	}
 
     @Override
-    public List<ExamSubjectDto> getExamSubjects(Integer ExamId) {
-		return examSubjectDao.getSubjectWithExamId(ExamId);
+    public List<Subject> getExamSubjects(Integer ExamId) {
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		return examSubjectDao.getSubjectWithExamId(ExamId,sysUser.getId());
     }
 
 	@Override

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

@@ -84,9 +84,11 @@
 	<resultMap id="ExamSubjectDto" type="com.keao.edu.user.dto.ExamSubjectDto" extends="com.keao.edu.user.dao.SubjectDao.Subject" >
 		<result column="exam_subject_id_" property="examSubjectId" />
 	</resultMap>
-	<select id="getSubjectWithExamId" resultMap="ExamSubjectDto">
-		SELECT es.id_ exam_subject_id_ ,s.* FROM exam_subject es
-		LEFT JOIN subject s on es.subject_id_ = s.id_ WHERE examination_basic_id_ = #{examId}
+	<select id="getSubjectWithExamId" resultMap="com.keao.edu.user.dao.SubjectDao.Subject">
+		SELECT s.* FROM exam_registration er
+		LEFT JOIN subject s on er.subject_id_ = s.id_
+		WHERE er.examination_basic_id_ = #{examId} AND er.student_id_ = #{studentId}
+		GROUP BY s.id_
 	</select>
 
     <select id="getUnRelatedWithExamSubjects" resultMap="com.keao.edu.user.dao.SubjectDao.Subject">

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

@@ -24,12 +24,12 @@ public class ExamSubjectController extends BaseController {
     @Autowired
     private ExamSubjectService examSubjectService;
 
-    @ApiOperation("获取考试项目专业")
+    /*@ApiOperation("获取考试项目专业")
     @ApiImplicitParam(name = "ExamId", value = "考试项目id", required = true, dataType = "Integer")
     @GetMapping(value = "/getExamSubjects")
     public HttpResponseResult<List<ExamSubjectDto>> getExamSubjects(Integer examId) {
         return succeed(examSubjectService.getExamSubjects(examId));
-    }
+    }*/
 
     @ApiOperation("获取与考级项目相关的专业")
     @GetMapping(value = "/getUnRelatedWithExamSubjects")