Merge branch 'master' of git.yfzx.zjtys.com.cn:zjm/notes2.0

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

@@ -43,14 +43,11 @@ public class InternalServiceImpl implements InternalService {
             List<Object> lists = redisTemplate.opsForList().range(Constants.REDIS_EVENT + id, 0, -1);
             int count=0;
             for (Object object:lists){
-
+                String name =iUserService.findUserById(id).getUsername();
                 RedisPersonalWork redisPersonalWork=(RedisPersonalWork)object;
-                if (redisPersonalWork.getWorkAttribution()==WorkAttribution1.ME_RECEIVE_WORK && redisPersonalWork.getStatus().equals(WorkStatus.ONGOING)){
-                    count++;
-                }
-                if (redisPersonalWork.getExecutorEqualRelease()==1&& redisPersonalWork.getStatus().equals(WorkStatus.ONGOING)){
-                    count++;
-                }
+              if (redisPersonalWork.getExecutor().equals(name)&& WorkStatus.ONGOING.equals(redisPersonalWork.getStatus())){
+                  count++;
+              }
             }
             personnels.add(new Personnel(id,iUserService.findUserById(id).getUsername(),count));
         }
@@ -61,13 +58,11 @@ public class InternalServiceImpl implements InternalService {
     public int personnelWorkCount(String id) {
         List<Object> lists = redisTemplate.opsForList().range(Constants.REDIS_EVENT + id, 0, -1);
         int count=0;
+        String name =iUserService.findUserById(id).getUsername();
         for (Object object:lists){
 
             RedisPersonalWork redisPersonalWork=(RedisPersonalWork)object;
-            if (redisPersonalWork.getWorkAttribution()==WorkAttribution1.ME_RECEIVE_WORK && redisPersonalWork.getStatus().equals(WorkStatus.ONGOING)){
-                count++;
-            }
-            if (redisPersonalWork.getExecutorEqualRelease()==1&& redisPersonalWork.getStatus().equals(WorkStatus.ONGOING)){
+            if (redisPersonalWork.getExecutor().equals(name)&& WorkStatus.ONGOING.equals(redisPersonalWork.getStatus())){
                 count++;
             }
         }
@@ -107,7 +102,7 @@ public class InternalServiceImpl implements InternalService {
             userWorkData.setAverageWorkNum(0d);
         }
 
-        userWorkData.setCompletedNum(countOngoing);
+        userWorkData.setCompletedNum(countFinished);
         userWorkData.setUnCompletedNum(countOngoing);
         userWorkData.setUserId(userId);
       return userWorkData;