fix: 修改了devcloudInfo的计数逻辑

src/main/java/com/seecoder/dataanalysis/analysis/impl/DevcloudDataAnalysisServiceImpl.java

@@ -812,11 +812,12 @@ public class DevcloudDataAnalysisServiceImpl implements DevcloudDataAnalysisServ
             //遍历devInfo中的commit信息
             List<CommitInfo> commitInfos = devcloudInfo.getCommitList();
 //            System.out.println("commitInfosSize: "+commitInfos.size());
-            commit_times += commitInfos.size();
+//            commit_times += commitInfos.size();
             for(CommitInfo commitInfo : commitInfos){
-                if(commitInfo.getUserId() == null){
+                if(commitInfo.getUserId() == null || isInGroup(commitInfo.getUserId(),userIds)==false){
                     continue;
                 }else{
+                    commit_times++;
                     commit_msg_overview.add(commitInfo.getMessage());
                     //如果是需求的commit
                     if(commitInfo.getType().toLowerCase().equals("tree_id")||commitInfo.getMessage().startsWith("feat:")){
@@ -854,11 +855,12 @@ public class DevcloudDataAnalysisServiceImpl implements DevcloudDataAnalysisServ
             }
             //遍历devInfo中的test信息
             List<TestInfo> testInfos = devcloudInfo.getTestList();
-            test_times += testInfos.size();
+//            test_times += testInfos.size();
             for(TestInfo testInfo : testInfos){
-                if(testInfo.getUserId() == null){
+                if(testInfo.getUserId() == null || isInGroup(testInfo.getUserId(),userIds)==false){
                     continue;
                 }else {
+                    test_times++;
                     test_success += testInfo.getSuccess();
                     test_failure += testInfo.getFailure();
                     test_concurrency_count += testInfo.getSuccess();
@@ -900,7 +902,7 @@ public class DevcloudDataAnalysisServiceImpl implements DevcloudDataAnalysisServ
 //                    }
 //                }
                 for(RecordInfo recordInfo : recordInfos){
-                    if(recordInfo.getUserId() == null){
+                    if(recordInfo.getUserId() == null || isInGroup(recordInfo.getUserId(),userIds)==false){
                         continue;
                     }else {
                         pipeline_deploy++;
@@ -925,7 +927,7 @@ public class DevcloudDataAnalysisServiceImpl implements DevcloudDataAnalysisServ
             //遍历devInfo中的bugList信息
             List<BugInfo> bugInfos = devcloudInfo.getBugList();
             for(BugInfo bugInfo : bugInfos){
-                if(bugInfo.getUserId() == null){
+                if(bugInfo.getUserId() == null || isInGroup(bugInfo.getUserId(),userIds)==false){
                     continue;
                 }else {
                     bug_times++;
@@ -955,7 +957,7 @@ public class DevcloudDataAnalysisServiceImpl implements DevcloudDataAnalysisServ
             //遍历devInfo的treeNode信息
             List<TreeNodeInfo> treeNodeInfos = devcloudInfo.getTreeNodeList();
             for(TreeNodeInfo treeNodeInfo : treeNodeInfos){
-                if(treeNodeInfo.getUserId() == null){
+                if(treeNodeInfo.getUserId() == null || isInGroup(treeNodeInfo.getUserId(),userIds)==false){
                     continue;
                 }else {
                     treeNode_times++;
@@ -1092,4 +1094,17 @@ public class DevcloudDataAnalysisServiceImpl implements DevcloudDataAnalysisServ
         return formatGroup;
     }
 
+
+    //判断该记录是否为组员提交的方法
+    boolean isInGroup(int id,List<Integer> userIds){
+        for(Integer userId : userIds){
+//            System.out.println("userid: "+userId);
+//            System.out.println("now Id: "+id);
+            if(userId == id){
+                return true;
+            }
+        }
+        return false;
+    }
+
 }