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

mec-biz/src/main/resources/config/contracts/product.ftl

@@ -202,7 +202,7 @@
                 <span>日期：${.now?string("yyyy年MM月dd日")}</span>
             </div>
             </#if>
-            <div class="sign">乙方签章：
+            <div class="sign">乙方签章：${studentInfo.realName!}
                 <span>日期：${.now?string("yyyy年MM月dd日")} </span>
             </div>
         	</#if>

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

@@ -343,9 +343,10 @@
 			TRUNCATE(COUNT( DISTINCT IF((cssp.group_type_='PRACTICE' AND pg.type_='CHARGE') OR cssp.group_type_='VIP', cssp.user_id_, NULL) )/COUNT( DISTINCT sr.user_id_ )*100, 2) percent_
 		FROM
 			student_registration sr
-				LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
-				LEFT JOIN course_schedule_student_payment cssp ON sr.user_id_=cssp.user_id_
-				LEFT JOIN practice_group pg ON cssp.music_group_id_=pg.id_
+			LEFT JOIN student_pre_registration spr ON sr.user_id_ = spr.user_id_ AND sr.music_group_id_ = spr.music_group_id_
+			LEFT JOIN music_group mg ON spr.music_group_id_ = mg.id_
+			LEFT JOIN course_schedule_student_payment cssp ON sr.user_id_=cssp.user_id_
+			LEFT JOIN practice_group pg ON cssp.music_group_id_=pg.id_
 		WHERE
 			mg.del_flag_ = 0
 			AND mg.organ_id_ IS NOT NULL
@@ -387,8 +388,7 @@
 			COUNT( DISTINCT sr.user_id_ ) percent_
 		FROM
 			student_registration sr
-			LEFT JOIN student_pre_registration spr ON sr.user_id_ = spr.user_id_
-			AND sr.music_group_id_ = spr.music_group_id_
+			LEFT JOIN student_pre_registration spr ON sr.user_id_ = spr.user_id_ AND sr.music_group_id_ = spr.music_group_id_
 			LEFT JOIN music_group mg ON spr.music_group_id_ = mg.id_
 		WHERE
 			mg.del_flag_ = 0

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

@@ -499,6 +499,8 @@
             LEFT JOIN student stu ON cssp.user_id_ = stu.user_id_
         WHERE stu.service_tag_=1
             AND (stu.service_tag_update_time_ IS NULL OR stu.service_tag_update_time_<#{nextMonday})
+            AND (cs.del_flag_ IS NULL OR cs.del_flag_=0)
+            AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_)
             AND cs.class_date_>=#{monday}
             AND cs.type_ IN ('SINGLE','VIP','MIX','PRACTICE')
             AND cssp.create_time_<#{nextMonday}