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

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentManageServiceImpl.java

@@ -3,6 +3,7 @@ package com.ym.mec.biz.service.impl;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.*;
+import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.entity.SysUserCashAccount;
 import com.ym.mec.biz.dal.page.*;
 import com.ym.mec.biz.service.StudentManageService;

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

@@ -189,13 +189,13 @@
         <where>
                 cgsm.status_ != 'QUIT'
             <if test="studentId!=null">
-                and cgsm.user_id_=#{studentId}
+                and cgsm.user_id_ = #{studentId}
             </if>
             <if test="musicGroupId!=null">
-                and cg.music_group_id_=#{musicGroupId} AND cg.group_type_='MUSIC'
+                and cg.music_group_id_ = #{musicGroupId} AND cg.group_type_='MUSIC'
             </if>
             <if test="classGroupType!=null">
-                and cg.type_=#{classGroupType}
+                and cg.type_ = #{classGroupType}
             </if>
             <if test="courseStatus!=null">
                 and cs.status_=#{courseStatus}
@@ -207,7 +207,7 @@
                 and su.username_ like CONCAT("%",#{teacherName},"%")
             </if>
             <if test="vipGroupId!=null">
-                and cg.music_group_id_=#{vipGroupId} AND cg.group_type_='VIP'
+                and cg.music_group_id_ = #{vipGroupId} AND cg.group_type_='VIP'
             </if>
         </where>
     </sql>
@@ -239,14 +239,15 @@
 
     <sql id="studentManageAttendanceQueryCondition">
         <where>
+            CONCAT(cs.class_date_," ",cs.start_class_time_) &lt; NOW()
             <if test="studentId!=null">
-                and sa.user_id_=#{studentId}
+                and sa.user_id_ = #{studentId}
             </if>
             <if test="classGroupType!=null">
-                and cg.type_=#{classGroupType}
+                and cg.type_ = #{classGroupType}
             </if>
             <if test="attendanceStatus!=null">
-                and sa.status_=#{attendanceStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+                and sa.status_ = #{attendanceStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
             </if>
             <if test="classGroupName!=null">
                 and cg.name_ like CONCAT("%",#{classGroupName},"%")
@@ -319,8 +320,8 @@
         cg.total_class_times_,sa.current_class_times_,sa.status_,cssp.expect_price_,cssp.actual_price_
         FROM course_schedule_student_payment cssp
         LEFT JOIN course_schedule cs ON cssp.course_schedule_id_ = cs.id_
+        LEFT JOIN class_group cg ON cg.id_ = cs.class_group_id_
         LEFT JOIN student_attendance sa ON sa.course_schedule_id_ = cssp.course_schedule_id_ AND sa.user_id_ = cssp.user_id_
-        LEFT JOIN class_group cg ON cg.id_ = sa.class_group_id_
         <include refid="studentPaymentSql"/>
         ORDER BY cs.class_date_ DESC,cs.start_class_time_ DESC
         <include refid="global.limit"/>