|
|
|
@ -782,6 +782,7 @@ public class TeacherServiceImpl implements TeacherService {
|
|
|
|
|
mapTeach.put("MaterialCount",scores[8]);
|
|
|
|
|
mapTeach.put("TpcplanCount",scores[9]);
|
|
|
|
|
mapTeach.put("Lessons",lessonRecords.size());
|
|
|
|
|
mapTeach.put("starLevel", sugVos.get(0).getStar_level());
|
|
|
|
|
return mapTeach;
|
|
|
|
|
|
|
|
|
|
}else if(teacherDto.getGradeName() != null) {
|
|
|
|
@ -1010,6 +1011,16 @@ public class TeacherServiceImpl implements TeacherService {
|
|
|
|
|
sugVoList.add(sugVo);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (dataMap.containsKey("member_list")) {
|
|
|
|
|
List<Map<String, Object>> memberList = (List<Map<String, Object>>) dataMap.get("member_list");
|
|
|
|
|
for (Map<String, Object> memberMap : memberList) {
|
|
|
|
|
for (SugVo sugVo : sugVoList) {
|
|
|
|
|
if (memberMap.get("habook").equals(sugVo.getHabook())) {
|
|
|
|
|
sugVo.setStar_level(Integer.parseInt(memberMap.get("star_level").toString()));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|