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

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

@@ -76,6 +76,8 @@ public class StudentManageListDto {
     private String teacherName;
     
     private Integer teacherId;
+    
+    private String subjectIdList;
 
     public BigDecimal getBalance() {
         return balance;
@@ -284,4 +286,12 @@ public class StudentManageListDto {
 	public void setTeacherId(Integer teacherId) {
 		this.teacherId = teacherId;
 	}
+
+	public String getSubjectIdList() {
+		return subjectIdList;
+	}
+
+	public void setSubjectIdList(String subjectIdList) {
+		this.subjectIdList = subjectIdList;
+	}
 }

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

@@ -117,7 +117,7 @@
         <where>
             del_flag_ != 1
             <if test="search != null">
-                AND organ_id_ = #{search}
+                AND (id_ LIKE CONCAT('%',#{search},'%') OR name_ LIKE CONCAT('%',#{search},'%'))
             </if>
 	        <if test="organId != null">
 	            AND FIND_IN_SET(organ_id_,#{organId})

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

@@ -115,7 +115,7 @@
         SELECT su.id_ user_id_,su.username_,su.gender_,su.phone_ parents_phone_,su.real_name_,
         su.birthdate_,su.nation_,su.organ_id_,
         CASE WHEN su.password_ IS NULL THEN 0 ELSE 1 END isActive_,
-        IF(st.service_tag_=2,0,st.service_tag_) service_tag_,st.operating_tag_,tu.real_name_ teacher_name_,st.teacher_id_,suca.balance_
+        IF(st.service_tag_=2,0,st.service_tag_) service_tag_,st.operating_tag_,tu.real_name_ teacher_name_,st.teacher_id_,st.subject_id_list_,suca.balance_
         FROM sys_user su
         LEFT JOIN student st ON st.user_id_ = su.id_
         LEFT JOIN sys_user tu ON tu.id_ = st.teacher_id_
@@ -751,6 +751,7 @@
         <result property="operatingTag" column="operating_tag_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result property="teacherName" column="teacher_name_"/>
         <result property="teacherId" column="teacher_id_"/>
+        <result property="subjectIdList" column="subject_id_list_"/>
     </resultMap>
     <select id="queryHasCourseStudent" resultMap="studentManageListDto">
         SELECT su.id_ user_id_,su.username_,su.gender_,GROUP_CONCAT(DISTINCT sr.parents_name_)parents_name_,

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

@@ -311,7 +311,7 @@
         LEFT JOIN teacher_attendance ta ON ta.course_schedule_id_ = cs.id_
         LEFT JOIN teacher t ON t.id_ = ta.teacher_id_
         LEFT JOIN sys_user su ON su.id_ = t.id_
-        LEFT JOIN organization o ON o.id_ = t.organ_id_
+        LEFT JOIN organization o ON o.id_ = cs.organ_id_
         <include refid="queryTeacherAttendancesCondition"/>
         ORDER BY cs.class_date_ ASC,cs.start_class_time_ ASC
         <include refid="global.limit"/>