增加任务分配项目检测量

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSampleItemServiceImpl.java

@@ -836,19 +836,41 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
         }).collect(Collectors.toList());
 
 
+        /* 检测中的所有项目 */
         List<EntrustSampleItem> experimentList = super.list(Condition.create().in("tester_id",userIdsList).eq("status",EntrustSampleItemStatusEnum.TEST));
+        /* 未检测 -- 还未填写原始记录 */
+        List<EntrustSampleItem> notTestingItems = experimentList.stream().
+                filter(item -> isNotTesting(item)).collect(Collectors.toList());
+        /* 真正的检测中 */
+        experimentList.removeAll(notTestingItems);
+        /* 已完成 */
+        List<EntrustSampleItem> TestedItem = super.list(Condition.create().in("tester_id", userIdsList).eq("status", EntrustSampleItemStatusEnum.END));
 
 
         List<LmsUserRelGroupVO> groupVOS = new ArrayList<>();
         for (LmsUserRelGroup group:groupList) {
             LmsUserRelGroupVO vo = group.convert(LmsUserRelGroupVO.class);
-            int num = 0;
+            int num = 0,notTestingNum = 0,TestedNum = 0;
             for (EntrustSampleItem experiment:experimentList) {
                 if (experiment.getTesterId().equals(group.getUserId())){
                     num++;
                 }
             }
+            /* 未检测 */
+            for (EntrustSampleItem notTestingItem : notTestingItems) {
+                if (notTestingItem.getTesterId().equals(group.getUserId())){
+                    notTestingNum++;
+                }
+            }
+            /* 已完成 */
+            for (EntrustSampleItem notTestingItem : TestedItem) {
+                if (notTestingItem.getTesterId().equals(group.getUserId())){
+                    TestedNum++;
+                }
+            }
             vo.setTotal(num);
+            vo.setNotTesting(notTestingNum);
+            vo.setTested(TestedNum);
             groupVOS.add(vo);
         }
         page.setRecords(groupVOS);
@@ -862,4 +884,10 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
     public List<TesterWorkloadStatsVO> getTesterWorkloadStatusQuery(QueryDTO queryDTO){
         return baseMapper.selectTesterWorkloadStatus(queryDTO);
     }
+
+    /* 项目是否未检测 */
+    public Boolean isNotTesting(EntrustSampleItem item) {
+        return entrustSampleItemIndexService.list(Condition.create()
+                .eq("entrust_sample_item_id", item.getId())).size() == 0;
+    }
 }