Browse Source

体验人数,直接查student表

周箭河 5 years ago
parent
commit
f8f86f4c4e

+ 9 - 9
mec-biz/src/main/java/com/ym/mec/biz/service/impl/TeacherServiceImpl.java

@@ -454,10 +454,10 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 			List<TeacherExercisesServiceDto> teacherExercisesServiceSituations = studentExtracurricularExercisesSituationDao.findTeacherExercisesServiceSituations(monDayDate.toString(), new ArrayList<>(teachers));
 			Map<Integer, TeacherExercisesServiceDto> teacherServiceMap = teacherExercisesServiceSituations.stream().collect(Collectors.toMap(TeacherExercisesServiceDto::getTeacherId, t -> t));
 
-			Map<Integer,Integer> operatingStudentsNum = MapUtil.convertMybatisMap(studentDao.getTeacherOperatingStudentsNum(teacherIds));
-			Map<Integer,Integer> practiceStudentsNum = MapUtil.convertMybatisMap(studentDao.getBuyNums(teacherIds, GroupType.PRACTICE));
-			Map<Integer,Integer> vipStudentsNum = MapUtil.convertMybatisMap(studentDao.getBuyNums(teacherIds, GroupType.VIP));
-			Map<Integer,Integer> practiceAndVipStudentsNum = MapUtil.convertMybatisMap(studentDao.getPracticeAndVipNums(teacherIds));
+			Map<Integer,String> operatingStudentsNum = MapUtil.convertMybatisMap(studentDao.getTeacherOperatingStudentsNum(teacherIds));
+			Map<Integer,String> practiceStudentsNum = MapUtil.convertMybatisMap(studentDao.getBuyNums(teacherIds, GroupType.PRACTICE));
+			Map<Integer,String> vipStudentsNum = MapUtil.convertMybatisMap(studentDao.getBuyNums(teacherIds, GroupType.VIP));
+			Map<Integer,String> practiceAndVipStudentsNum = MapUtil.convertMybatisMap(studentDao.getPracticeAndVipNums(teacherIds));
 
 			rows.forEach(e->{
 //				e.setSubjectName(subjectDao.findBySubIds(e.getSubjectId()));
@@ -478,12 +478,12 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 					e.setServiceIndex(BigDecimal.ZERO);
 				}
 				//运营指标
-				Integer studentNum = operatingStudentsNum.get(e.getId());
+				String studentNum = operatingStudentsNum.get(e.getId());
 				if(studentNum != null){
-					Integer practiceNum = practiceStudentsNum.get(e.getId()) ==null ? 0 : practiceStudentsNum.get(e.getId());
-					Integer vipNum = vipStudentsNum.get(e.getId()) ==null ? 0 : vipStudentsNum.get(e.getId());
-					Integer practiceAndVipNum = practiceAndVipStudentsNum.get(e.getId()) ==null ? 0 : practiceAndVipStudentsNum.get(e.getId());
-					Integer allNum = practiceNum+vipNum+practiceAndVipNum;
+					String practiceNum = practiceStudentsNum.get(e.getId()) ==null ? "0" : practiceStudentsNum.get(e.getId());
+					String vipNum = vipStudentsNum.get(e.getId()) ==null ? "0" : vipStudentsNum.get(e.getId());
+					String practiceAndVipNum = practiceAndVipStudentsNum.get(e.getId()) ==null ? "0" : practiceAndVipStudentsNum.get(e.getId());
+					int allNum = Integer.parseInt(practiceNum) + Integer.parseInt(vipNum) + Integer.parseInt(practiceAndVipNum);
 					BigDecimal operatingIndex = new BigDecimal(allNum).multiply(new BigDecimal(100)).divide(new BigDecimal(studentNum), CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP);
 					e.setOperatingIndex(operatingIndex);
 				}else {