实际完成时间查询

platform-rest/src/main/java/com/platform/rest/controller/check/CheckJobController.java

@@ -290,6 +290,11 @@ public class CheckJobController {
     @GetMapping("/getCheckJobVO/detail")
     public R<CheckJobVO> getCheckJobVODetail(CheckJobDTO checkJobDTO) {
         return new R<>(checkJobService.getCheckJobVODetail(checkJobDTO));
+        
+        
+        
+        
+        
     }
 
 }

platform-service/src/main/java/com/platform/service/check/impl/CheckJobServiceImpl.java

@@ -96,25 +96,35 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
         CheckJobVO checkJobVO = new CheckJobVO();
         //车间id，userid
         List<CheckJobVO> checkJobVOS = getJobVO(checkJobDTO);
-        checkJobVO.setSbNum(checkJobVOS.stream().distinct().map(CheckJobVO::getSbId).collect(Collectors.toList()).size());
+        checkJobVO.setSbNum(checkJobVOS.stream().map(CheckJobVO::getSbId).distinct().collect(Collectors.toList()).size());
         checkJobVO.setCountNum(checkJobVOS.size());
-        List<String> sbIds = checkJobVOS.stream().distinct().map(CheckJobVO::getSbId).collect(Collectors.toList());
-        List<String> sbNames = checkJobVOS.stream().distinct().map(CheckJobVO::getSbName).collect(Collectors.toList());
+        List<CheckJobVO> checkJobVOS1 = checkJobVOS.stream().collect(
+                Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(
+                        Comparator.comparing(CheckJobVO::getSbId))),ArrayList::new));
+//        List<String> sbIds = checkJobVOS.stream().map(CheckJobVO::getSbId).distinct().collect(Collectors.toList());
+//        List<String> sbNames = checkJobVOS.stream().map(CheckJobVO::getSbName).distinct().collect(Collectors.toList());
         Integer waitNum = 0;
         Integer compaleteNum = 0;
         List<SbInfoVO> sbInfoVOS = new ArrayList<>();
 
-        for (int i=0;i< sbIds.size();i++){
+        for (int i=0;i< checkJobVOS1.size();i++){
             Integer checkNums = 0;
             SbInfoVO info = new SbInfoVO();
-            for (CheckJobVO vo:checkJobVOS){
-                if (vo.getSbId().equals(sbIds.get(i))){
+            for (int j=0;j<checkJobVOS.size();j++ ){
+                if (checkJobVOS.get(j).getSbId().equals(checkJobVOS1.get(i).getSbId())){
                     checkNums++;
+                    if (info.getName()==null){
+
+                        info.setName(checkJobVOS1.get(i).getSbName());
+                        info.setId(checkJobVOS1.get(i).getSbId());
+                        sbInfoVOS.add(info);
+                    }
+
+                }
+                if (j>= checkJobVOS.size()-1){
+                    info.setCheckNum(checkNums);
                 }
             }
-            info.setCheckNum(checkNums);
-            info.setName(sbNames.get(i));
-            sbInfoVOS.add(info);
         }
         if (checkJobVOS.size()>0) {
             for (CheckJobVO vo : checkJobVOS) {
@@ -130,7 +140,7 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
                 }
             }
         }
-        checkJobVO.setSbNum(sbIds.size());
+        checkJobVO.setSbNum(checkJobVOS1.size());
         checkJobVO.setWaitNum(waitNum);
         checkJobVO.setCompaleteNum(compaleteNum);
         checkJobVO.setSbInfoVOS(sbInfoVOS);