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

mec-biz/src/main/java/com/ym/mec/biz/dal/page/PhotoQueryInfo.java

@@ -18,6 +18,16 @@ public class PhotoQueryInfo extends QueryInfo {
 
 	private String timeLine;
 
+	private String year;
+
+	public String getYear() {
+		return year;
+	}
+
+	public void setYear(String year) {
+		this.year = year;
+	}
+
 	public String getTimeLine() {
 		return timeLine;
 	}

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

@@ -119,6 +119,9 @@
 			<if test="timeLine != null and timeLine != ''">
 				AND DATE_FORMAT(time_line_,"%Y%m") = #{timeLine}
 			</if>
+			<if test="year != null and year != ''">
+				AND DATE_FORMAT(time_line_,"%Y") = #{year}
+			</if>
 			<if test="type != null and type != ''">
 				AND type_ = #{type}
 			</if>

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

@@ -484,7 +484,7 @@
     </select>
     <sql id="findStudentAttendanceSql">
         <where>
-            cs.del_flag_ = 0 AND cs.pre_course_flag_ = 0
+            cs.del_flag_ = 0 AND cs.pre_course_flag_ = 0 AND cs.is_lock_ = 0
             <if test="visitFlag != null">
                 <if test="visitFlag == 1">
                     AND sa.visit_flag_ = 1

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

@@ -8,6 +8,7 @@ import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.entity.MusicGroupTrainPlanSaveDto;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.biz.dal.page.MusicGroupPerformanceQueryInfo;
+import com.ym.mec.biz.dal.page.MusicGroupTeachersQueryInfo;
 import com.ym.mec.biz.dal.page.PhotoQueryInfo;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.controller.BaseController;
@@ -57,7 +58,7 @@ public class MusicGroupDetailController extends BaseController {
 
     @ApiOperation(value = "分页查询乐团资讯")
     @GetMapping("/queryNewsPage")
-    public Object queryNewsPage(QueryInfo queryInfo) {
+    public Object queryNewsPage(MusicGroupTeachersQueryInfo queryInfo) {
         return succeed(musicGroupNewsService.queryPage(queryInfo));
     }