Merge remote-tracking branch 'origin/master'

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

@@ -78,6 +78,17 @@ public class EndCourseScheduleQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "ERR_ATTENDANCE 考勤异常，NO_ATTENDANCE 课程异常")
     private String searchType;
 
+    @ApiModelProperty(value = "课程编号搜索")
+    private Long courseIdSearch;
+
+    public Long getCourseIdSearch() {
+        return courseIdSearch;
+    }
+
+    public void setCourseIdSearch(Long courseIdSearch) {
+        this.courseIdSearch = courseIdSearch;
+    }
+
     public String getSearchType() {
         return searchType;
     }

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

@@ -2532,8 +2532,11 @@
         <if test="organIdList!=null">
             AND FIND_IN_SET(cs.organ_id_,#{organIdList})
         </if>
-        <if test="search!=null">
-            AND (cs.music_group_id_=#{search} OR cs.id_=#{search} OR cs.name_ LIKE CONCAT( '%', #{search}, '%' ))
+        <if test="search != null and search != ''">
+            AND (cs.music_group_id_ = #{search} OR cs.name_ LIKE CONCAT('%' ,#{search}, '%' ))
+        </if>
+        <if test="courseIdSearch != null">
+            AND cs.id_ = #{courseIdSearch}
         </if>
         <if test="searchType == 'ERR_ATTENDANCE'">
             AND ta.teacher_id_ = cs.actual_teacher_id_