Merge branch 'zx_saas_0208' of http://git.dayaedu.com/yonge/mec into test_saas

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

@@ -567,18 +567,20 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
 		Map<Integer, List<StudentExtracurricularExercisesSituation>> teacherServeMap = teacherServeWithDate.stream().collect(Collectors.groupingBy(StudentExtracurricularExercisesSituation::getTeacherId));
 		for (TeacherServeDto teacherServeDto : dataList) {
 			List<StudentExtracurricularExercisesSituation> tss = teacherServeMap.get(teacherServeDto.getTeacherId());
-			Set<Long> courseIds = new HashSet<>();
-			for (StudentExtracurricularExercisesSituation ts : tss) {
-				if(teacherServeDto.getMonday().compareTo(ts.getMonday())!=0){
-					continue;
-				}
-				if(StringUtils.isBlank(ts.getCourseIds())){
-					continue;
+			if(tss != null){
+				Set<Long> courseIds = new HashSet<>();
+				for (StudentExtracurricularExercisesSituation ts : tss) {
+					if(teacherServeDto.getMonday().compareTo(ts.getMonday())!=0){
+						continue;
+					}
+					if(StringUtils.isBlank(ts.getCourseIds())){
+						continue;
+					}
+					Set<Long> ids = Arrays.stream(ts.getCourseIds().split(",")).map(s -> Long.valueOf(s)).collect(Collectors.toSet());
+					courseIds.addAll(ids);
 				}
-				Set<Long> ids = Arrays.stream(ts.getCourseIds().split(",")).map(s -> Long.valueOf(s)).collect(Collectors.toSet());
-				courseIds.addAll(ids);
+				teacherServeDto.setHomeworkNum(courseIds.size());
 			}
-			teacherServeDto.setHomeworkNum(courseIds.size());
 		}
 		return dataList;
 	}

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

@@ -254,6 +254,10 @@ fieldColumns = ["userId", "username", "cooperationName", "musicGroupName", "char
 headColumns = ["学员姓名","联系电话","年级","班级","老师推荐专业","是否在学习某件乐器","目前所学乐器","报名参加管乐团家长会了解相关情况","备注"]
 fieldColumns = ["userName","phone","currentGrade","currentClass","subjectName == null?'无':subjectName","musicalInstrumentsLearning?'是':'否'", "musicalInstrumentsName","joinParentMeeting?'是':'否'","remark"]
 
+[乐保导出]
+headColumns = ["交易流水号", "订单号", "订单日期", "分部", "学员姓名", "学员编号", "所属乐团", "学员状态", "维修技师", "乐器名称", "具体型号", "乐保类型"]
+fieldColumns = ["transNo", "orderNo", "createTime", "organName", "studentName", "studentId", "musicGroupName", "studentStatus.msg", "repairerName", "goodsName", "specification", "type == '0' ? '新增' : '续费'"]
+
 [服务指标导出]
 headColumns = ["分部","老师编号","老师姓名","预计安排(人次)","实际安排(人次)","布置率(%)","提交人数","点评次数","点评率(%)","及时点评次数","及时点评率(%)"]
 fieldColumns = ["organName","teacherId","teacherName","expectExercisesNum","actualExercisesNum", "100 * actualExercisesNum / expectExercisesNum","exercisesReplyNum","exercisesMessageNum", "100 * exercisesMessageNum / exercisesReplyNum", "exercisesMessageTimelyNum","100 * exercisesMessageTimelyNum / exercisesReplyNum"]