服务指标导出

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

@@ -42,7 +42,7 @@ public class TeacherServeDto {
     private JobNatureEnum jobNature;
 
     /** 预期训练次数 */
-    private Integer expectExercisesNum;
+    private int expectExercisesNum;
 
     /** 实际训练次数 */
     private int actualExercisesNum;
@@ -86,11 +86,11 @@ public class TeacherServeDto {
         this.submitRate = submitRate;
     }
 
-    public Integer getExpectExercisesNum() {
+    public int getExpectExercisesNum() {
         return expectExercisesNum;
     }
 
-    public void setExpectExercisesNum(Integer expectExercisesNum) {
+    public void setExpectExercisesNum(int expectExercisesNum) {
         this.expectExercisesNum = expectExercisesNum;
     }
 

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

@@ -212,7 +212,7 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
 			List<StudentExtracurricularExercisesSituation> teacherServeWithDate = studentExtracurricularExercisesSituationDao.findTeacherServeWithDate(queryInfo.getMonday(), queryInfo.getSunday(), teacherIds, null);
 			Map<Integer, List<StudentExtracurricularExercisesSituation>> teacherServeMap = teacherServeWithDate.stream().collect(Collectors.groupingBy(StudentExtracurricularExercisesSituation::getTeacherId));
 			for (TeacherServeDto teacherServeDto : dataList) {
-				teacherServeDto.setHomeworkStuNum(teacherServeDto.getActualExercisesNum() - teacherServeDto.getExerciseNum());
+				teacherServeDto.setHomeworkStuNum(teacherServeDto.getExpectExercisesNum() - teacherServeDto.getExerciseNum());
 				List<StudentExtracurricularExercisesSituation> tss = teacherServeMap.get(teacherServeDto.getTeacherId());
 				Set<Long> courseIds = new HashSet<>();
 				for (StudentExtracurricularExercisesSituation ts : tss) {