导出修改

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

@@ -11,6 +11,8 @@ public class StudentVipPracticeExportDto{
 
     private Integer vipNotStartNum;
 
+    private Integer vipTotalNum;
+
     private Integer vipNotStartTeacherId;
 
     private String vipNotStartTeacherName;
@@ -53,6 +55,36 @@ public class StudentVipPracticeExportDto{
 
     private String subjectName;
 
+    //上次课时
+    private String beforeClassNum;
+
+    //年级
+    private Integer grade;
+
+    public String getBeforeClassNum() {
+        return beforeClassNum;
+    }
+
+    public void setBeforeClassNum(String beforeClassNum) {
+        this.beforeClassNum = beforeClassNum;
+    }
+
+    public Integer getGrade() {
+        return grade;
+    }
+
+    public void setGrade(Integer grade) {
+        this.grade = grade;
+    }
+
+    public Integer getVipTotalNum() {
+        return vipTotalNum;
+    }
+
+    public void setVipTotalNum(Integer vipTotalNum) {
+        this.vipTotalNum = vipTotalNum;
+    }
+
     public Integer getNormalClassTeacherId() {
         return normalClassTeacherId;
     }

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

@@ -469,7 +469,7 @@
 		<if test="courseScheduleType != null">
 		AND cs.type_= #{courseScheduleType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 		</if>
-		AND CONCAT(cs.class_date_, ' ', cs.start_class_time_) &gt; NOW() AND cs.pre_course_flag_ = 0
+		AND CONCAT(cs.class_date_, ' ', cs.start_class_time_) &gt; NOW() AND cs.pre_course_flag_ = 0 AND cs.del_flag_ = 0 AND cs.is_lock_ = 0
 	</select>
 	<select id="countStudentsNotStartCourseNumWithCourseType" resultType="map">
 		SELECT cssp.user_id_ 'key',COUNT(DISTINCT cssp.course_schedule_id_) 'value'
@@ -482,7 +482,7 @@
 		<if test="courseScheduleType != null">
 			AND cs.type_= #{courseScheduleType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 		</if>
-		AND CONCAT(cs.class_date_, ' ', cs.start_class_time_) &gt; NOW() AND cs.pre_course_flag_ = 0
+		AND CONCAT(cs.class_date_, ' ', cs.start_class_time_) &gt; NOW() AND cs.pre_course_flag_ = 0 AND cs.del_flag_ = 0 AND cs.is_lock_ = 0
 		GROUP BY cssp.user_id_
 	</select>
 	<select id="queryMidiByUserIdsAndCourseId" resultType="java.util.Map">
@@ -830,6 +830,7 @@
 		<result property="username" column="username_"/>
 		<result property="vipOverNum" column="vip_over_num_"/>
 		<result property="vipNotStartNum" column="vip_not_start_num_"/>
+		<result property="vipTotalNum" column="vip_total_num_"/>
 		<result property="practiceOverNum" column="practice_over_num_"/>
 		<result property="practiceNotStartNum" column="practice_not_start_num_"/>
 		<result property="teacherId" column="teacher_id_"/>
@@ -837,14 +838,18 @@
 		<result property="organName" column="organ_name_"/>
 		<result property="courseBalance" column="course_balance_"/>
 		<result property="subjectName" column="subject_name_"/>
+		<result property="beforeClassNum" column="before_class_num_"/>
+		<result property="grade" column="current_grade_num_"/>
 	</resultMap>
 	<select id="exportStudentVipPractice" resultMap="StudentVipPracticeExportDto">
 		SELECT s.user_id_,su.username_,o.name_ organ_name_,uca.course_balance_,sb.name_ subject_name_,
+		MAX(CASE WHEN cs.`status_` != 'NOT_START' THEN cs.`class_date_` END) before_class_num_,
+		COUNT(CASE WHEN cssp.group_type_ = 'VIP' THEN 1 ELSE NULL END) vip_total_num_,
 		COUNT(CASE WHEN cssp.group_type_ = 'VIP' AND cs.status_ != 'NOT_START' THEN 1 ELSE NULL END) vip_over_num_,
 		COUNT(CASE WHEN cssp.group_type_ = 'VIP' AND cs.status_ = 'NOT_START' THEN 1 ELSE NULL END) vip_not_start_num_,
 		COUNT(CASE WHEN cssp.group_type_ = 'PRACTICE' AND cs.status_ != 'NOT_START' THEN 1 ELSE NULL END) practice_over_num_,
 		COUNT(CASE WHEN cssp.group_type_ = 'PRACTICE' AND cs.status_ = 'NOT_START' THEN 1 ELSE NULL END) practice_not_start_num_
-		,s.teacher_id_,ste.real_name_
+		,s.teacher_id_,ste.real_name_,s.`current_grade_num_`
 		FROM student s
 		LEFT JOIN course_schedule_student_payment cssp FORCE INDEX(group_type_) ON cssp.user_id_ = s.user_id_
 		LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_

mec-web/src/main/resources/exportColumnMapper.ini

@@ -119,8 +119,8 @@ headColumns = ["序号", "学生编号", "学生姓名", "交易流水号", "订
 fieldColumns = ["id", "userId", "user.username", "transNo", "orderNo", "paymentChannel", "merNos", "orderAmount", "expectAmount", "actualAmount", "balancePaymentAmount",  "couponRemitFee",     "musicGroupCourseFee", "vipCourseFee", "practiceCourseFee", "theoryCourseFee", "degreeFee", "repairFee", "maintenanceFee", "cloudTeacherFee",     "leaseFee", "musicalFee", "teachingFee", "visitFee", "rechargeFee", "otherFee", "platformFee", "payTime", "musicGroupId", "groupType.desc","typeDesc.msg","feeMusicGroupId","feeMusicGroupName", "sporadicType", "subjectName", "organName", "schoolName", "cooperationOrganName", "eduTeacher", "memo"]
 
 [学员小课记录导出]
-headColumns = ["分部", "学员编号", "学生姓名", "课程余额", "声部" ,"声部班老师编号" ,"声部班老师", "VIP已结束课时数", "VIP未开始课时数", "已结束VIP课程组老师编号", "已结束VIP课程组老师", "未开始VIP课程组老师编号", "未开始VIP课程组老师","网管课已结束课时数", "网管课未开始课时数", "已结束网管课课程组老师编号", "已结束网管课课程组老师", "未开始网管课课程组老师编号", "未开始网管课课程组老师", "指导老师编号", "指导老师"]
-fieldColumns = ["organName","userId", "username","courseBalance", "subjectName", "normalClassTeacherId", "normalClassTeacherName", "vipOverNum", "vipNotStartNum", "vipOverTeacherId", "vipOverTeacherName", "vipNotStartTeacherId", "vipNotStartTeacherName" , "practiceOverNum", "practiceNotStartNum", "practiceOverTeacherId", "practiceOverTeacherName", "practiceNotStartTeacherId", "practiceNotStartTeacherName","teacherId","teacherName"]
+headColumns = ["分部", "学员编号", "学生姓名", "年级", "课程余额", "声部" ,"声部班老师编号" ,"声部班老师", "上次课时间", "VIP总课时数", "VIP已结束课时数", "VIP未开始课时数", "已结束VIP课程组老师编号", "已结束VIP课程组老师", "未开始VIP课程组老师编号", "未开始VIP课程组老师","网管课已结束课时数", "网管课未开始课时数", "已结束网管课课程组老师编号", "已结束网管课课程组老师", "未开始网管课课程组老师编号", "未开始网管课课程组老师", "指导老师编号", "指导老师"]
+fieldColumns = ["organName","userId", "username", "grade","courseBalance", "subjectName", "normalClassTeacherId", "normalClassTeacherName", "beforeClassNum", "vipTotalNum", "vipOverNum", "vipNotStartNum", "vipOverTeacherId", "vipOverTeacherName", "vipNotStartTeacherId", "vipNotStartTeacherName" , "practiceOverNum", "practiceNotStartNum", "practiceOverTeacherId", "practiceOverTeacherName", "practiceNotStartTeacherId", "practiceNotStartTeacherName","teacherId","teacherName"]
 
 [乐团导出学员列表]
 headColumns = ["学员编号", "学员姓名", "性别", "联系电话","入团时间", "年级", "班级", "入团专业", "学员状态", "报名缴费", "缴费金额", "是否激活","VIP/网管是否有课","关心包","加油包", "欠费金额（元）", "退团原因", "会员截止时间", "会员剩余天数"]