update

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

@@ -47,6 +47,17 @@ public class StudentApplyDetailDto{
     @ApiModelProperty(value = "学员缴费状态",required = false)
     private String paymentStatus;
 
+    @ApiModelProperty(value = "备注",required = false)
+    private String remark;
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
     public Integer getStudentId() {
         return studentId;
     }

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

@@ -116,26 +116,24 @@
 
     <select id="findStudentsByOrganId" resultMap="studentManageListDto">
         SELECT sr.user_id_,su.username_ real_name_,su.gender_,sr.parents_name_,sr.parents_phone_
-        FROM student_registration sr
+        FROM (SELECT * FROM student_registration WHERE id_ IN(SELECT MAX(id_) FROM student_registration GROUP BY user_id_)) sr
         LEFT JOIN sys_user su ON sr.user_id_ = su.id_
         <include refid="findStudentsByOrganIdSql"/>
+        ORDER BY sr.create_time_ DESC
         <include refid="global.limit"/>
     </select>
     <sql id="findStudentsByOrganIdSql">
-        WHERE sr.user_id_ IN (
-        (SELECT MAX(user_id_) user_id_ FROM student_registration
         <where>
+            <if test="organId != null">
+                AND su.organ_id_=#{organId}
+            </if>
+            <if test="studentName != null and studentName != ''">
+                AND su.username_ LIKE CONCAT('%',#{studentName},'%')
+            </if>
             <if test="search != null and search != ''">
-                parents_name_ LIKE CONCAT('%',#{search},'%') OR parents_phone_ LIKE CONCAT('%',#{search},'%')
+                AND (sr.parents_name_ LIKE CONCAT('%',#{search},'%') OR sr.parents_phone_ LIKE CONCAT('%',#{search},'%'))
             </if>
         </where>
-        GROUP BY parents_phone_))
-        <if test="organId != null">
-            AND su.organ_id_=#{organId}
-        </if>
-        <if test="studentName != null and studentName != ''">
-            AND su.username_ LIKE CONCAT('%',#{studentName},'%')
-        </if>
     </sql>
 
     <select id="countStudentByOrganId" resultType="java.lang.Integer">
@@ -379,7 +377,7 @@
         <result property="isNewStudent" column="is_new_student_"/>
     </resultMap>
     <select id="queryMusicGroupStudent" resultMap="MusicGroupStudentsDto">
-        SELECT sr.user_id_,su.real_name_,su.gender_,sr.parents_phone_,sr.current_grade_,
+        SELECT sr.user_id_,su.username_ real_name_,su.gender_,sr.parents_phone_,sr.current_grade_,
         sr.current_class_,sr.music_group_status_,IF(mgsf.payment_status_ IS NULL,'NON_PAYMENT',mgsf.payment_status_) payment_status_,
         s.name_ subject_name_,sr.music_group_id_,
         IF(sr.create_time_ > mg.payment_expire_date_,1,0) is_new_student_
@@ -402,18 +400,19 @@
     </select>
     <select id="countStudyNum" resultType="java.lang.Integer">
         SELECT COUNT(sr.user_id_) FROM student_registration sr
-        WHERE sr.music_group_id_ = #{musicGroupId} AND sr.payment_status_ = 1
+        WHERE sr.music_group_id_ = #{musicGroupId}
         AND sr.music_group_status_ != 'QUIT'
     </select>
     <select id="countQuitNum" resultType="java.lang.Integer">
         SELECT COUNT(sr.user_id_) FROM student_registration sr
-        WHERE sr.music_group_id_ = #{musicGroupId} AND sr.payment_status_ = 1
+        WHERE sr.music_group_id_ = #{musicGroupId}
         AND sr.music_group_status_ = 'QUIT'
     </select>
     <select id="countAddNum" resultType="java.lang.Integer">
         SELECT COUNT(sr.user_id_) FROM student_registration sr
-        LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_ AND sr.create_time_ > mg.apply_expire_date_
-        WHERE sr.music_group_id_ = #{musicGroupId} and sr.music_group_status_ != 'QUIT'
+        LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
+        WHERE sr.music_group_id_ = #{musicGroupId} AND sr.music_group_status_ != 'QUIT'
+        AND sr.create_time_ > mg.payment_expire_date_
     </select>
 
     <resultMap id="MusicGroupStudentSignDto" type="com.ym.mec.biz.dal.dto.MusicGroupStudentSignDto">

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

@@ -246,11 +246,12 @@
         <result column="gender_" property="gender"/>
         <result column="user_id_" property="studentId"/>
         <result column="id_" property="id"/>
+        <result column="remark_" property="remark"/>
     </resultMap>
     <select id="queryStudentDetailPage" resultMap="studentApplyDetail">
         SELECT sr.id_, sr.user_id_,sr.name_ username_,sr.parents_name_,sr.current_class_,sr.current_grade_,
         su.gender_,sr.is_allow_adjust_, s.name_ subject_name_,ss.name_
-        actual_subject_name_,sr.parents_phone_,sr.payment_status_
+        actual_subject_name_,sr.parents_phone_,sr.payment_status_,sr.remark_
         FROM student_registration sr
         LEFT JOIN sys_user su ON sr.user_id_ = su.id_
         LEFT JOIN `subject` s ON sr.subject_id_ = s.id_

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

@@ -386,11 +386,13 @@
     </resultMap>
     <select id="queryTeacherAttendance" resultMap="MusicGroupTeacherAttendanceDto">
         SELECT cs.class_date_,cs.start_class_time_,cs.name_,su.real_name_,
-        IF(ta.sign_in_status_ IS NULL,3,ta.sign_in_status_) sign_in_status_,IF(ta.sign_out_status_ IS NULL,3,ta.sign_out_status_) sign_out_status_
+        IF(ta.sign_in_status_ IS NULL,3,ta.sign_in_status_) sign_in_status_,
+        IF(ta.sign_out_status_ IS NULL,3,ta.sign_out_status_) sign_out_status_
         FROM course_schedule cs
         LEFT JOIN teacher_attendance ta ON cs.id_ = ta.course_schedule_id_
         LEFT JOIN sys_user su ON su.id_ = ta.teacher_id_
         <include refid="queryTeacherAttendanceSql"/>
+        ORDER BY cs.class_date_ DESC
         <include refid="global.limit"/>
     </select>
     <select id="countTeacherAttendance" resultType="java.lang.Integer">