update

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

@@ -69,6 +69,12 @@ public class ExamRegistrationController extends BaseController {
         return succeed(examRegistrationService.applyList(queryInfo));
     }
 
+    @ApiOperation(value = "学生端考级曲库考试列表")
+    @GetMapping(value = "studentBaseExams")
+    public HttpResponseResult<PageInfo<StudentBaseExamsDto>> studentBaseExams(QueryInfo queryInfo) {
+        return succeed(examRegistrationService.studentBaseExams(queryInfo));
+    }
+
     @ApiOperation(value = "学生端获取学员考试记录")
     @GetMapping(value = "examList")
     public HttpResponseResult<PageInfo<StudentExamListDto>> examList(ExamRecordQueryInfo queryInfo) {

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

@@ -147,4 +147,18 @@ public interface ExamRegistrationDao extends BaseDAO<Long, ExamRegistration> {
      * @return
      */
     List<Integer> queryStudentTenantId(Integer userId);
+
+    /**
+     * 学生端考级曲库考试列表
+     * @param params
+     * @return
+     */
+    int countStudentBaseExams(Map<String, Object> params);
+
+    /**
+     * 学生端考级曲库考试列表
+     * @param params
+     * @return
+     */
+    List<StudentBaseExamsDto> queryStudentBaseExams(Map<String, Object> params);
 }

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

@@ -0,0 +1,28 @@
+package com.keao.edu.user.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+
+public class StudentBaseExamsDto {
+
+    @ApiModelProperty(value = "考试名")
+    private String baseExamName;
+
+    @ApiModelProperty(value = "机构编号")
+    private Integer tenantId;
+
+    public String getBaseExamName() {
+        return baseExamName;
+    }
+
+    public void setBaseExamName(String baseExamName) {
+        this.baseExamName = baseExamName;
+    }
+
+    public Integer getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(Integer tenantId) {
+        this.tenantId = tenantId;
+    }
+}

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

@@ -65,4 +65,11 @@ public interface ExamRegistrationService extends BaseService<Long, ExamRegistrat
     * @return
     */
    Map<String,Object> repay(Integer userId,String orderNo) throws Exception;
+
+   /**
+    * 学生端考级曲库考试列表
+    * @param queryInfo
+    * @return
+    */
+   PageInfo<StudentBaseExamsDto> studentBaseExams(QueryInfo queryInfo);
 }

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

@@ -350,4 +350,26 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
         rpMap.put("payMap", payMap);
         return rpMap;
     }
+
+    @Override
+    public PageInfo<StudentBaseExamsDto> studentBaseExams(QueryInfo queryInfo) {
+        PageInfo<StudentBaseExamsDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+        Map<String, Object> params = new HashMap<>();
+        MapUtil.populateMap(params, queryInfo);
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        params.put("studentId",sysUser.getId());
+        List<StudentBaseExamsDto> dataList = null;
+        params.put("paymentStatus",1);
+        int count = examRegistrationDao.countStudentBaseExams(params);
+        if (count > 0) {
+            pageInfo.setTotal(count);
+            params.put("offset", pageInfo.getOffset());
+            dataList = examRegistrationDao.queryStudentBaseExams(params);
+        }
+        if (count == 0) {
+            dataList = new ArrayList<>();
+        }
+        pageInfo.setRows(dataList);
+        return pageInfo;
+    }
 }

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

@@ -85,7 +85,7 @@ public class ExamSongServiceImpl extends BaseServiceImpl<Integer, ExamSong> impl
         }
         Map<String, Object> params = new HashMap<String, Object>();
         MapUtil.populateMap(params, queryInfo);
-        params.put("tenantIds",tenantIds);
+//        params.put("tenantIds",tenantIds);
 
         List<ExamSong> dataList = new ArrayList<>();
         int count = examSongDao.countSongPage(params);

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

@@ -470,17 +470,17 @@
 	<sql id="queryStudentListSql">
 		<where>
 			<if test="studentId != null">
-				er.student_id_ = #{studentId}
+				AND er.student_id_ = #{studentId}
 			</if>
 			<if test="examRegistrationId != null">
-				er.id_ = #{examRegistrationId}
+				AND er.id_ = #{examRegistrationId}
 			</if>
 			<if test="paymentStatus != null and paymentStatus == 1">
 				<if test="paymentStatus == 1">
-					er.status_ = 'AUDIT_PASS'
+					AND er.status_ = 'AUDIT_PASS'
 				</if>
 				<if test="paymentStatus == 0">
-					er.status_ != 'AUDIT_PASS'
+					AND er.status_ != 'AUDIT_PASS'
 				</if>
 			</if>
 		</where>
@@ -575,4 +575,20 @@
 		SELECT DISTINCT tenant_id_ FROM exam_registration
 		WHERE student_id_ = #{userId} AND tenant_id_ IS NOT NULL
 	</select>
+
+	<select id="countStudentBaseExams" resultType="java.lang.Integer">
+		SELECT COUNT(er.id_) FROM exam_registration er
+		<include refid="queryStudentListSql"/>
+	</select>
+	<resultMap id="StudentBaseExamsDtoMap" type="com.keao.edu.user.dto.StudentBaseExamsDto">
+		<result property="baseExamName" column="examBaseName"/>
+		<result property="tenantId" column="tenant_id_"/>
+	</resultMap>
+	<select id="queryStudentBaseExams" resultMap="StudentBaseExamsDtoMap">
+		SELECT eb.name_ examBaseName,eb.tenant_id_ FROM examination_basic eb
+		LEFT JOIN exam_registration er ON er.examination_basic_id_ = eb.id_
+		<include refid="queryStudentListSql"/>
+		ORDER BY er.update_time_ DESC
+		<include refid="global.limit"/>
+	</select>
 </mapper>

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

@@ -134,11 +134,8 @@
 			<if test="level != null">
 				AND FIND_IN_SET(#{level},es.level_list_)
 			</if>
-			<if test="tenantIds != null">
-				AND es.tenant_id_ IN
-				<foreach collection="tenantIds" open="(" close=")" separator="," item="item">
-					#{item}
-				</foreach>
+			<if test="tenantId != null">
+				AND es.tenant_id_ = #{tenantId}
 			</if>
 		</where>
 	</sql>