Merge branch 'master' of http://git.dayaedu.com/yonge/mec into test

 Conflicts:

	mec-student/src/main/java/com/ym/mec/student/controller/StudentManageController.java

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

@@ -245,8 +245,9 @@
 			LEFT JOIN student_payment_order spo ON stu.user_id_=spo.user_id_ AND status_='SUCCESS' AND actual_amount_>0
 		WHERE
 			su.del_flag_=0
-		  AND su.organ_id_ IS NOT NULL
-		  AND su.user_type_ LIKE '%STUDENT%'
+			  AND su.organ_id_ IS NOT NULL
+			  AND su.user_type_ LIKE '%STUDENT%'
+			  AND DATE_FORMAT(spo.create_time_, '%Y-%m-%d')<=#{dayStr}
 		GROUP BY organ_id_
 		ORDER BY organ_id_;
 	</select>

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

@@ -119,23 +119,19 @@
 		LEFT JOIN sys_music_score ses ON ses.id_ = sesa.exam_song_id_
 		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = ses.music_score_categories_id_
 		LEFT JOIN `subject` s ON s.id_ = sesa.subject_id_
-		<where>
-			sesa.del_flag_ = 0
-			<if test="subjectId != null">
-				AND sesa.subject_id_ = #{subjectId}
-			</if>
-			<if test="sysMusicScoreId != null">
-				AND sesa.exam_song_id_ = #{sysMusicScoreId}
-			</if>
-		</where>
+		<include refid="queryPageSql"/>
 		ORDER BY sesa.id_ DESC
 		<include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM sys_music_score_accompaniment
+		SELECT COUNT(sesa.id_) FROM sys_music_score_accompaniment
+		FROM sys_music_score_accompaniment sesa
+		LEFT JOIN sys_music_score ses ON ses.id_ = sesa.exam_song_id_
+		<include refid="queryPageSql"/>
 	</select>
+
 	<select id="findSubjectByMusicScoreId" resultType="java.lang.Integer">
 		SELECT subject_id_ FROM sys_music_score_accompaniment
 		<where>

mec-student/src/main/java/com/ym/mec/student/controller/StudentManageController.java

@@ -11,6 +11,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -53,6 +54,8 @@ public class StudentManageController extends BaseController {
     private SubjectService subjectService;
     @Autowired
     private OrganizationService organizationService;
+    @Autowired
+    private StudentService studentService;
 
     private final static Logger LOGGER = LoggerFactory.getLogger(StudentManageController.class);
 
@@ -88,6 +91,18 @@ public class StudentManageController extends BaseController {
         return succeed();
     }
 
+
+    @ApiOperation(value = "获取学员基本信息")
+    @GetMapping("student/queryUserInfo")
+    public Object queryUserInfo() {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        Student student = studentService.get(user.getId());
+        return succeed(student);
+    }
+
     @ApiOperation(value = "根据群编号，获取群组所有成员基本信息")
     @GetMapping("classGroup/findGroupUsers")
     public Object findGroupUsers(Integer groupId,String search) {

mec-student/src/main/java/com/ym/mec/student/controller/SysMusicScoreAccompanimentController.java

@@ -22,4 +22,11 @@ public class SysMusicScoreAccompanimentController extends BaseController {
         queryInfo.setType("COMMON");
         return succeed(sysMusicScoreAccompanimentService.queryAccPage(queryInfo));
     }
+
+    @ApiOperation(value = "分页查询")
+    @GetMapping("/queryPageLimit")
+    public Object queryPageLimit(SysExamSongQueryInfo queryInfo) {
+        queryInfo.setType("COMMON");
+        return succeed(sysMusicScoreAccompanimentService.queryPage(queryInfo));
+    }
 }

mec-teacher/src/main/java/com/ym/mec/teacher/controller/SysMusicScoreAccompanimentController.java

@@ -51,4 +51,11 @@ public class SysMusicScoreAccompanimentController extends BaseController {
         queryInfo.setCreateUserId(sysUser.getId());
         return succeed(sysMusicScoreAccompanimentService.queryAccPage(queryInfo));
     }
+
+    @ApiOperation(value = "分页查询")
+    @GetMapping("/queryPageLimit")
+    public Object queryPageLimit(SysExamSongQueryInfo queryInfo) {
+        queryInfo.setType("COMMON");
+        return succeed(sysMusicScoreAccompanimentService.queryPage(queryInfo));
+    }
 }