修改

notes-job/src/main/java/com/zjty/tynotes/job/status/entity/vo/UserWorkData.java

@@ -28,4 +28,7 @@ public class UserWorkData {
     @ApiModelProperty(value = "进行中任务个数", example = "2")
     private Integer unCompletedNum;
 
+    @ApiModelProperty(value = "任务平均工作量数", example = "2")
+    private Double averageWorkNum;
+
 }

notes-job/src/main/java/com/zjty/tynotes/job/status/service/impl/InternalServiceImpl.java

@@ -81,7 +81,7 @@ public class InternalServiceImpl implements InternalService {
         int countOngoing=0;
         int countFinished=0;
         Double countScore=0d;
-
+        Double countWork=0d;
         List<Work> works=  workRepository.findByExecutorAndStateTimeBetween(userId,startTime,endTime);
         for (Work work:works){
 
@@ -92,15 +92,21 @@ public class InternalServiceImpl implements InternalService {
             if (work.getStatus().equals(WorkStatus.FINISHED)){
                 countFinished++;
                 ScoreCoefficient scoreCoefficient= scoreCoefficientRepository.findByWordId(work.getId());
-                countScore=countScore+scoreCoefficient.getEndWorkLoad();
+                countWork=countWork+scoreCoefficient.getEndWorkLoad();
+
+                countScore=countScore+(Integer.valueOf(scoreCoefficient.getJustScore4())+Integer.valueOf(scoreCoefficient.getViceScore3()))/2;
+
             }
         }
         if (countFinished!=0){
             userWorkData.setAverageScore(countScore/countFinished);
+            userWorkData.setAverageWorkNum(countWork/countFinished);
         }
         else {
             userWorkData.setAverageScore(0d);
+            userWorkData.setAverageWorkNum(0d);
         }
+
         userWorkData.setCompletedNum(countOngoing);
         userWorkData.setUnCompletedNum(countOngoing);
         userWorkData.setUserId(userId);
@@ -113,6 +119,7 @@ public class InternalServiceImpl implements InternalService {
         int countOngoing=0;
         int countFinished=0;
         Double countScore=0d;
+        Double countWork=0d;
         List<Work> works=  workRepository.findByExecutor(userId);
         for (Work work:works){
 
@@ -123,14 +130,18 @@ public class InternalServiceImpl implements InternalService {
             if (work.getStatus().equals(WorkStatus.FINISHED)){
                 countFinished++;
                 ScoreCoefficient scoreCoefficient= scoreCoefficientRepository.findByWordId(work.getId());
-                countScore=countScore+scoreCoefficient.getEndWorkLoad();
+                countWork=countWork+scoreCoefficient.getEndWorkLoad();
+
+                countScore=countScore+(Integer.valueOf(scoreCoefficient.getJustScore4())+Integer.valueOf(scoreCoefficient.getViceScore3()))/2;
             }
         }
         if (countFinished!=0){
             userWorkData.setAverageScore(countScore/countFinished);
+            userWorkData.setAverageWorkNum(countWork/countFinished);
         }
         else {
             userWorkData.setAverageScore(0d);
+            userWorkData.setAverageWorkNum(0d);
         }
         userWorkData.setCompletedNum(countOngoing);
         userWorkData.setUnCompletedNum(countOngoing);