Merge remote-tracking branch 'origin/master'

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

@@ -4,6 +4,8 @@ import com.ym.mec.biz.dal.entity.CourseSchedule;
 import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
 import com.ym.mec.biz.dal.enums.CourseStatusEnum;
 import com.ym.mec.biz.dal.enums.StudentAttendanceStatusEnum;
+import com.ym.mec.biz.dal.enums.TeachModeEnum;
+
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
@@ -48,6 +50,9 @@ public class StudentManageCourseListDto {
     
     @ApiModelProperty(value = "课程编号",required = false)
     private Long courseScheduleId;
+    
+    @ApiModelProperty(value = "教学模式（线上/线下）",required = false)
+    private TeachModeEnum teachMode;
 
     public CourseSchedule.CourseScheduleType getCourseScheduleType() {
         return courseScheduleType;
@@ -144,4 +149,12 @@ public class StudentManageCourseListDto {
 	public void setCourseScheduleId(Long courseScheduleId) {
 		this.courseScheduleId = courseScheduleId;
 	}
+
+	public TeachModeEnum getTeachMode() {
+		return teachMode;
+	}
+
+	public void setTeachMode(TeachModeEnum teachMode) {
+		this.teachMode = teachMode;
+	}
 }

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

@@ -98,14 +98,19 @@ public class PayServiceImpl implements PayService {
                 company = "yaming";
             }
         }
-        //深圳，广州，上海分部收到深圳大雅
-        Set<Integer> organIds = new HashSet<>();
-        organIds.add(16);
-        organIds.add(3);
-        organIds.add(15);
-        if(organIds.contains(organId)){
+        //深圳收到深圳大雅
+        Set<Integer> sDaYaOrganIds = new HashSet<>();
+        sDaYaOrganIds.add(16);
+        if(sDaYaOrganIds.contains(organId)){
             company = "sdaya";
         }
+        //广州，上海分部收到武汉大雅
+        Set<Integer> wDaYaOrganIds = new HashSet<>();
+        wDaYaOrganIds.add(3);
+        wDaYaOrganIds.add(15);
+        if(wDaYaOrganIds.contains(organId)){
+            company = "daya";
+        }
 
         //支付通道决策
         Map<String, Object> unionPay = new HashMap<>();

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

@@ -17,6 +17,7 @@
         <result property="totalClassTimes" column="total_class_times_" />
         <result property="attendanceStatus" column="status_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result property="courseStatus" column="courseStatus" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result property="teachMode" column="teach_mode_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
     </resultMap>
 
     <resultMap id="studentManageAccountBaseInfo" type="com.ym.mec.biz.dal.dto.StudentManageAccountBaseInfoDto">
@@ -244,7 +245,8 @@
             cg.type_ class_group_type_,
             CONCAT(cs.class_date_," ",cs.start_class_time_) course_date_,
             cs.status_ course_status_,
-            su.real_name_ teacher_name_
+            su.real_name_ teacher_name_,
+            cs.teach_mode_
         FROM class_group cg
             LEFT JOIN class_group_student_mapper cgsm ON cg.id_=cgsm.class_group_id_
             LEFT JOIN course_schedule cs ON cg.id_=cs.class_group_id_
@@ -302,7 +304,8 @@
             IF(sa.status_ IS NULL,'TRUANT',sa.status_) status_,
             sa.current_class_times_,
             cg.total_class_times_,
-            cs.status_ courseStatus
+            cs.status_ courseStatus,
+            cs.teach_mode_
         FROM course_schedule_student_payment cssp
             LEFT JOIN student_attendance sa ON cssp.course_schedule_id_ = sa.course_schedule_id_ AND cssp.user_id_ = sa.user_id_
             LEFT JOIN class_group cg ON cssp.class_group_id_ = cg.id_

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

@@ -198,7 +198,7 @@
         FROM course_schedule_student_payment cssp
         LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_
         LEFT JOIN practice_group pg ON pg.`id_` = cs.`music_group_id_` AND cs.`group_type_` = 'PRACTICE'
-        WHERE cs.status_ IN ('NOT_START','UNDERWAY') AND (cs.is_lock_ IS NULL OR cs.is_lock_=0) AND (cs.del_flag_ IS NULL OR cs.is_lock_=0)
+        WHERE cs.status_ IN ('NOT_START','UNDERWAY') AND (cs.is_lock_ IS NULL OR cs.is_lock_=0) AND (cs.del_flag_ IS NULL OR cs.del_flag_=0)
         GROUP BY cssp.user_id_
         ) a on a.user_id_ = s.user_id_
         LEFT JOIN (
@@ -223,7 +223,7 @@
         FROM course_schedule_student_payment cssp
         LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_
         LEFT JOIN practice_group pg ON pg.`id_` = cs.`music_group_id_` AND cs.`group_type_` = 'PRACTICE'
-        WHERE cs.status_ IN ('NOT_START','UNDERWAY') AND (cs.is_lock_ IS NULL OR cs.is_lock_=0) AND (cs.del_flag_ IS NULL OR cs.is_lock_=0)
+        WHERE cs.status_ IN ('NOT_START','UNDERWAY') AND (cs.is_lock_ IS NULL OR cs.is_lock_=0) AND (cs.del_flag_ IS NULL OR cs.del_flag_=0)
         GROUP BY cssp.user_id_
         ) a on a.user_id_ = s.user_id_
         LEFT JOIN (

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

@@ -1321,7 +1321,7 @@ public class ExportController extends BaseController {
     }
 
 
-    @ApiOperation(value = "课外训练-教学导出")
+    @ApiOperation(value = "运营指标管理导出")
     @GetMapping("export/operatingStudents")
     @PreAuthorize("@pcs.hasPermissions('export/operatingStudents')")
     public void operatingStudents(StudentOperatingQueryInfo queryInfo, HttpServletResponse response) {