Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentRepairDao.java

@@ -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);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/BasicUserDto.java

@@ -20,6 +20,10 @@ public class BasicUserDto {
 
     private String userType;
 
+    private Integer subjectId;
+
+    private String phone;
+
     public String getUserType() {
         return userType;
     }
@@ -96,4 +100,20 @@ public class BasicUserDto {
     public int hashCode() {
         return Objects.hash(userId);
     }
+
+    public Integer getSubjectId() {
+        return subjectId;
+    }
+
+    public void setSubjectId(Integer subjectId) {
+        this.subjectId = subjectId;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentRepair.java

@@ -103,7 +103,7 @@ public class StudentRepair {
     private String address;
 
     /**
-    * 支付状态 0-未支付 1-已支付
+    * 支付状态 0-未支付 1-支付中 2-已支付
     */
     private Integer payStatus;
 

mec-biz/src/main/java/com/ym/mec/biz/service/StudentRepairService.java

@@ -31,4 +31,11 @@ public interface StudentRepairService extends BaseService<Integer, StudentRepair
      * @param description
      */
     void repairSuccess(Integer id, String description);
+
+    /**
+     * 获取学生信息
+     * @param studentId
+     * @return
+     */
+    BasicUserDto getStudentInfo(Integer studentId);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentRepairServiceImpl.java

@@ -181,4 +181,9 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
         log.info("操作人 :" + sysUser.getId());
     }
 
+    @Override
+    public BasicUserDto getStudentInfo(Integer studentId) {
+        return null;
+    }
+
 }

mec-biz/src/main/resources/config/mybatis/MusicGroupMapper.xml

@@ -243,6 +243,9 @@
 		<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"/>
+		<result column="phone_" property="phone"/>
 	</resultMap>
 
     <select id="queryUserGroups" resultMap="com.ym.mec.biz.dal.dao.ClassGroupDao.imGroupModel">

mec-biz/src/main/resources/config/mybatis/StudentRepairMapper.xml

@@ -126,7 +126,7 @@
     </update>
 
     <select id="getStudents" resultMap="com.ym.mec.biz.dal.dao.MusicGroupDao.BasicUserDto">
-        SELECT username_ ,id_ user_id_,avatar_ head_url_,gender_
+        SELECT username_ ,id_ user_id_,avatar_ head_url_,gender_,phone_
         FROM sys_user
         WHERE FIND_IN_SET(organ_id_,#{organIdList})
         AND user_type_ LIKE '%STUDENT%'
@@ -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>

mec-web/src/main/java/com/ym/mec/web/controller/education/EduRepairController.java

@@ -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));
+    }
+
 
 }