feat:1、服务指标

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

@@ -520,7 +520,7 @@ public class StudentServeServiceImpl implements StudentServeService {
                     if(!CollectionUtils.isEmpty(studentHomeworks)){
                         weekServiceWithStudent.setActualExercisesNum(studentHomeworks.size()>weekServiceWithStudent.getExpectExercisesNum()?weekServiceWithStudent.getExpectExercisesNum():studentHomeworks.size());
                         long replyNum = studentHomeworks.stream().filter(e -> YesOrNoEnum.YES.equals(e.getStatus())).count();
-                        weekServiceWithStudent.setExercisesReplyNum(replyNum>0?1:0);
+                        weekServiceWithStudent.setExercisesReplyNum(replyNum>weekServiceWithStudent.getActualExercisesNum()?weekServiceWithStudent.getActualExercisesNum(): (int) replyNum);
                         long haveSubmitTimes = studentHomeworks.stream().filter(e -> Objects.nonNull(e.getSubmitTime())).count();
                         if(replyNum>0&&haveSubmitTimes>0){
                             Date lastSubmitTime = studentHomeworks.stream().filter(e->Objects.nonNull(e.getSubmitTime())).max(Comparator.comparing(StudentServeCourseHomeworkDto::getSubmitTime)).get().getSubmitTime();
@@ -540,8 +540,8 @@ public class StudentServeServiceImpl implements StudentServeService {
                                 exercisesMessageTimelyNum+=1;
                             }
                         }
-                        weekServiceWithStudent.setExercisesMessageNum(exercisesMessageNum>0?1:0);
-                        weekServiceWithStudent.setExercisesMessageTimelyNum(exercisesMessageTimelyNum>0?1:0);
+                        weekServiceWithStudent.setExercisesMessageNum(exercisesMessageNum>weekServiceWithStudent.getActualExercisesNum()?weekServiceWithStudent.getActualExercisesNum(): (int) exercisesMessageNum);
+                        weekServiceWithStudent.setExercisesMessageTimelyNum(exercisesMessageTimelyNum>weekServiceWithStudent.getActualExercisesNum()?weekServiceWithStudent.getActualExercisesNum(): (int) exercisesMessageNum);
                     }
                 }
 
@@ -551,8 +551,8 @@ public class StudentServeServiceImpl implements StudentServeService {
                     if(!CollectionUtils.isEmpty(studentExercises)){
                         weekServiceWithStudent.setActualExercisesNum(studentExercises.size()>weekServiceWithStudent.getExpectExercisesNum()?weekServiceWithStudent.getExpectExercisesNum():studentExercises.size());
                         long replyNum = studentExercises.stream().filter(e -> e.getStatus()==1).count();
-                        if(weekServiceWithStudent.getExercisesReplyNum()<=0){
-                            weekServiceWithStudent.setExercisesReplyNum(replyNum>0?1:0);
+                        if(weekServiceWithStudent.getExercisesReplyNum()<weekServiceWithStudent.getActualExercisesNum()){
+                            weekServiceWithStudent.setExercisesReplyNum(replyNum>weekServiceWithStudent.getActualExercisesNum()?weekServiceWithStudent.getActualExercisesNum(): (int) replyNum);
                         }
                         long haveSubmitTimes = studentExercises.stream().filter(e->Objects.nonNull(e.getSubmitTime())).count();
                         if(replyNum>0&&haveSubmitTimes>0){
@@ -575,11 +575,11 @@ public class StudentServeServiceImpl implements StudentServeService {
                                 exercisesMessageTimelyNum+=1;
                             }
                         }
-                        if(weekServiceWithStudent.getExercisesMessageNum()<=0){
-                            weekServiceWithStudent.setExercisesMessageNum(exercisesMessageNum>0?1:0);
+                        if(weekServiceWithStudent.getExercisesMessageNum()<weekServiceWithStudent.getActualExercisesNum()){
+                            weekServiceWithStudent.setExercisesMessageNum(exercisesMessageNum>weekServiceWithStudent.getActualExercisesNum()?weekServiceWithStudent.getActualExercisesNum(): (int) exercisesMessageNum);
                         }
-                        if(weekServiceWithStudent.getExercisesMessageTimelyNum()<=0){
-                            weekServiceWithStudent.setExercisesMessageTimelyNum(exercisesMessageTimelyNum>0?1:0);
+                        if(weekServiceWithStudent.getExercisesMessageTimelyNum()<weekServiceWithStudent.getActualExercisesNum()){
+                            weekServiceWithStudent.setExercisesMessageTimelyNum(exercisesMessageTimelyNum>weekServiceWithStudent.getActualExercisesNum()?weekServiceWithStudent.getActualExercisesNum(): (int) exercisesMessageTimelyNum);
                         }
                     }
                 }
@@ -712,7 +712,7 @@ public class StudentServeServiceImpl implements StudentServeService {
                 if(!CollectionUtils.isEmpty(studentHomeworks)){
                     weekServiceWithStudent.setActualExercisesNum(studentHomeworks.size()>weekServiceWithStudent.getExpectExercisesNum()?weekServiceWithStudent.getExpectExercisesNum():studentHomeworks.size());
                     long replyNum = studentHomeworks.stream().filter(e -> YesOrNoEnum.YES.equals(e.getStatus())).count();
-                    weekServiceWithStudent.setExercisesReplyNum(replyNum>0?1:0);
+                    weekServiceWithStudent.setExercisesReplyNum(replyNum>weekServiceWithStudent.getActualExercisesNum()?weekServiceWithStudent.getActualExercisesNum(): (int) replyNum);
                     long haveSubmitTimes = studentHomeworks.stream().filter(e -> Objects.nonNull(e.getSubmitTime())).count();
                     if(replyNum>0&&haveSubmitTimes>0){
                         Date lastSubmitTime = studentHomeworks.stream().filter(e->Objects.nonNull(e.getSubmitTime())).max(Comparator.comparing(StudentServeCourseHomeworkDto::getSubmitTime)).get().getSubmitTime();
@@ -732,8 +732,8 @@ public class StudentServeServiceImpl implements StudentServeService {
                             exercisesMessageTimelyNum+=1;
                         }
                     }
-                    weekServiceWithStudent.setExercisesMessageNum(exercisesMessageNum>0?1:0);
-                    weekServiceWithStudent.setExercisesMessageTimelyNum(exercisesMessageTimelyNum>0?1:0);
+                    weekServiceWithStudent.setExercisesMessageNum(exercisesMessageNum>weekServiceWithStudent.getActualExercisesNum()?weekServiceWithStudent.getActualExercisesNum(): (int) exercisesMessageNum);
+                    weekServiceWithStudent.setExercisesMessageTimelyNum(exercisesMessageTimelyNum>weekServiceWithStudent.getActualExercisesNum()?weekServiceWithStudent.getActualExercisesNum(): (int) exercisesMessageTimelyNum);
                 }
             }
 
@@ -743,8 +743,8 @@ public class StudentServeServiceImpl implements StudentServeService {
                 if(!CollectionUtils.isEmpty(studentExercises)){
                     weekServiceWithStudent.setActualExercisesNum(studentExercises.size()>weekServiceWithStudent.getExpectExercisesNum()?weekServiceWithStudent.getExpectExercisesNum():studentExercises.size());
                     long replyNum = studentExercises.stream().filter(e -> e.getStatus()==1).count();
-                    if(weekServiceWithStudent.getExercisesReplyNum()<=0){
-                        weekServiceWithStudent.setExercisesReplyNum(replyNum>0?1:0);
+                    if(weekServiceWithStudent.getExercisesReplyNum()<weekServiceWithStudent.getActualExercisesNum()){
+                        weekServiceWithStudent.setExercisesReplyNum(replyNum>weekServiceWithStudent.getActualExercisesNum()?weekServiceWithStudent.getActualExercisesNum(): (int) replyNum);
                     }
                     long haveSubmitTimes = studentExercises.stream().filter(e->Objects.nonNull(e.getSubmitTime())).count();
                     if(replyNum>0&&haveSubmitTimes>0){
@@ -767,11 +767,11 @@ public class StudentServeServiceImpl implements StudentServeService {
                             exercisesMessageTimelyNum+=1;
                         }
                     }
-                    if(weekServiceWithStudent.getExercisesMessageNum()<=0){
-                        weekServiceWithStudent.setExercisesMessageNum(exercisesMessageNum>0?1:0);
+                    if(weekServiceWithStudent.getExercisesMessageNum()<weekServiceWithStudent.getActualExercisesNum()){
+                        weekServiceWithStudent.setExercisesMessageNum(exercisesMessageNum>weekServiceWithStudent.getActualExercisesNum()?weekServiceWithStudent.getActualExercisesNum(): (int) exercisesMessageNum);
                     }
-                    if(weekServiceWithStudent.getExercisesMessageTimelyNum()<=0){
-                        weekServiceWithStudent.setExercisesMessageTimelyNum(exercisesMessageTimelyNum>0?1:0);
+                    if(weekServiceWithStudent.getExercisesMessageTimelyNum()<weekServiceWithStudent.getActualExercisesNum()){
+                        weekServiceWithStudent.setExercisesMessageTimelyNum(exercisesMessageTimelyNum>weekServiceWithStudent.getActualExercisesNum()?weekServiceWithStudent.getActualExercisesNum(): (int) exercisesMessageTimelyNum);
                     }
                 }
             }