@@ -29,8 +29,17 @@ public interface StudentRepairDao extends com.ym.mec.common.dal.BaseDAO<Integer,
/**
* 获取学生乐团列表
+ *
* @param userIds
* @return
*/
List<MusicGroup> getUserMusicGroup(@Param("userIds") Set<Integer> userIds);
+
+ /**
+ * 获取学生信息
+ * @param studentId
+ * @return
+ */
+ BasicUserDto getStudentInfo(@Param("studentId") Integer studentId);
}
@@ -20,6 +20,8 @@ public class BasicUserDto {
private String userType;
+ private Integer subjectId;
public String getUserType() {
return userType;
@@ -96,4 +98,12 @@ public class BasicUserDto {
public int hashCode() {
return Objects.hash(userId);
+ public Integer getSubjectId() {
+ return subjectId;
+ }
+ public void setSubjectId(Integer subjectId) {
+ this.subjectId = subjectId;
@@ -31,4 +31,11 @@ public interface StudentRepairService extends BaseService<Integer, StudentRepair
* @param description
void repairSuccess(Integer id, String description);
+ BasicUserDto getStudentInfo(Integer studentId);
@@ -181,4 +181,9 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
log.info("操作人 :" + sysUser.getId());
+ @Override
+ public BasicUserDto getStudentInfo(Integer studentId) {
+ return null;
@@ -243,6 +243,8 @@
<result column="gender_" property="gender"/>
<result column="music_group_id_" property="musicGroupId"/>
<result column="user_type_" property="userType"/>
+ <result column="music_group_name_" property="musicGroupName"/>
+ <result column="subject_id_" property="subjectId"/>
</resultMap>
<select id="queryUserGroups" resultMap="com.ym.mec.biz.dal.dao.ClassGroupDao.imGroupModel">
@@ -211,4 +211,11 @@
AND mg.status_='PROGRESS'
ORDER BY id_ DESC
</select>
+ <select id="getStudentInfo" resultMap="com.ym.mec.biz.dal.dao.MusicGroupDao.BasicUserDto">
+ SELECT su.username_ ,su.id_ user_id_,su.avatar_ head_url_,su.gender_,mg.id_ music_group_id_,mg.name_ music_group_name_,sr.subject_id_ FROM sys_user su
+ LEFT JOIN student_registration sr ON sr.user_id_ = su.id_
+ LEFT JOIN music_group mg ON mg.id_ = sr.music_group_id_
+ WHERE su.id_ = #{studentId}
+ ORDER BY mg.id_ DESC LIMIT 1
+ </select>
</mapper>
@@ -87,5 +87,15 @@ public class EduRepairController extends BaseController {
return succeed(subjectService.findSubSubjects(1));
+ @ApiOperation("获取学生信息")
+ @GetMapping(value = "/getStudentInfo")
+ public HttpResponseResult getStudentInfo(Integer studentId) {
+ SysUser sysUser = sysUserFeignService.queryUserInfo();
+ if (sysUser == null) {
+ return failed("用户信息获取失败");
+ return succeed(subjectService.findSubSubjects(1));