Merge branch 'feature/0529-live' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -38,6 +38,7 @@
         <result column="current_schedule_id_" property="courseSchedule.id"/>
         <result column="course_schedule_name_" property="courseSchedule.name"/>
         <result column="class_date_" property="courseSchedule.classDate"/>
+        <result column="class_date_str_" property="courseSchedule.startClassTimeStr"/>
         <result column="start_class_time_" property="courseSchedule.startClassTime"/>
         <result column="end_class_time_" property="courseSchedule.endClassTime"/>
         <result column="new_course_id_" property="courseSchedule.newCourseId"/>
@@ -474,7 +475,9 @@
                CASE WHEN sa.status_ IS NULL and cs.status_ = 'OVER' THEN 'TRUANT' ELSE sa.status_ END status_,
         su.username_,su.phone_,su.avatar_,cs.teach_mode_,cs.type_ course_type_,o.name_ organ_name_,tu.real_name_ teacher_name_,tu.avatar_ teacher_avatar_,
         cs.name_ course_schedule_name_,cs.status_ course_status_,
-        cs.actual_teacher_id_ teacher_id_,cs.class_date_ ,cs.start_class_time_,cs.end_class_time_ ,cs.new_course_id_,
+        cs.actual_teacher_id_ teacher_id_,
+        CONCAT(cs.class_date_,' ',cs.start_class_time_,'-',cs.end_class_time_) class_date_str_,
+        cs.class_date_ ,cs.start_class_time_,cs.end_class_time_ ,cs.new_course_id_,
         CASE WHEN sa.visit_flag_ IS NULL THEN 0 ELSE sa.visit_flag_ END visitFlag,
         CASE WHEN sa.status_ IS NULL OR sa.status_ = 'TRUANT' THEN '1LEAVE' ELSE sa.status_ END status_1
         FROM course_schedule_student_payment cssp

mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -2802,7 +2802,7 @@ public class ExportController extends BaseController {
             HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部", "学员姓名", "学员编号", "老师姓名", "老师编号",
                     "课程组编号", "课程编号", "课程名称", "课程组类型", "课程类型", "上课时间","签到时间", "签退时间", "考勤状态"}, new String[]{
                     "courseSchedule.organization.name", "username", "userId", "courseSchedule.teacherName", "teacherId", "musicGroupId", "courseScheduleId",
-                    "courseSchedule.name", "groupType.desc", "courseSchedule.type.msg", "courseSchedule.classDate", "signInTime",
+                    "courseSchedule.name", "groupType.desc", "courseSchedule.type.msg", "courseSchedule.startClassTimeStr", "signInTime",
                     "signOutTime", "status.msg"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attac:wq" +

mec-web/src/main/java/com/ym/mec/web/controller/VipGroupManageController.java

@@ -360,7 +360,7 @@ public class VipGroupManageController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('vipGroupManage/stopVipGroup')")
     public Object stopVipGroup(Long vipGroupId,String stopReason){
         if(Objects.isNull(vipGroupId)|| StringUtils.isBlank(stopReason)){
-            return failed("请指定vip课并指定取消原因");
+            return failed("请指定课程组并指定取消原因");
         }
         vipGroupService.stopGroup(vipGroupId,stopReason);
         return succeed();