管乐迷需求一大堆

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

@@ -664,9 +664,9 @@
 		</if>
 	</select>
 	<select id="queryPreCourseConsumerDetail" resultMap="StudentCourseConsumerDetailDto">
-		select o.name_ organName,su.username_,ss.user_id_,su.phone_,
-		CASE WHEN ss.no_schedule_num_ + CASE WHEN cs.course_num_ IS NULL THEN 0 ELSE cs.course_num_ END > 3
-		THEN 4 ELSE ss.no_schedule_num_ + CASE WHEN cs.course_num_ IS NULL THEN 0 ELSE cs.course_num_ END END preConsumerNum,
+		select o.name_ organName,su.username_,ss.user_id_,su.phone_,ss.no_schedule_num_,ss.sub_course_num_,
+		CASE WHEN ss.no_schedule_num_ + ss.sub_course_num_ + CASE WHEN cs.course_num_ IS NULL THEN 0 ELSE cs.course_num_ END > 3
+		THEN 4 ELSE ss.no_schedule_num_ + ss.sub_course_num_ + CASE WHEN cs.course_num_ IS NULL THEN 0 ELSE cs.course_num_ END END preConsumerNum,
 		CASE WHEN cs.course_num_ IS NULL THEN 0 ELSE cs.course_num_ END course_num_
 		from student_statistics ss
 		left join (

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

@@ -320,11 +320,11 @@ fieldColumns = ["organName","username","userId","phone","preConsumerNum","course
 
 [课耗统计导出]
 headColumns = ["分部", "在读人数", "应有课耗", "实际课耗","课耗达标率","实际课耗大于等于5节", "4节","3节","2节","1节","0节","达标占比"]
-fieldColumns = ["organName","normalNum","courseConsumerNum","courseSum","courseConsumerRate","num5","num4","num3","num2","num1","num0","standRate"]
+fieldColumns = ["organName","normalNum","courseConsumerNum","courseSum","courseConsumerRate+'%'","num5","num4","num3","num2","num1","num0","standRate+'%'"]
 
 [云教练统计导出]
 headColumns = ["分部", "在读人数","练习人数","练习率","<60分钟", "60~120分钟","120~240分钟","＞240分钟","平均练习时长","练习达标占比"]
-fieldColumns = ["organName","normalNum","trainStudentNum","trainRate","train1","train2","train3","train4","avgTrainTime","trainStandRate"]
+fieldColumns = ["organName","normalNum","trainStudentNum","trainRate+'%'","train1","train2","train3","train4","avgTrainTime","trainStandRate+'%'"]
 
 [班级列表导出]
 headColumns = ["课程组编号", "课程组名称", "分部名称", "班级名称","班级类型", "班级人数", "主教老师", "助教老师", "已上课时", "总课数"]