实际完成时间查询

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

@@ -107,22 +107,34 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
         Integer compaleteNum = 0;
         List<SbInfoVO> sbInfoVOS = new ArrayList<>();
 
+//        for (CheckJobVO vo:checkJobVOS1){
+//            Integer checkNums = 0;
+//            SbInfoVO info = new SbInfoVO();
+//            for (int i=0;i< checkJobVOS.size();i++){
+//                if (vo.getStatus()==1 && checkJobVOS.get(i).getStatus()==1 && vo.getSbId().equals(checkJobVOS.get(i).getSbId())){
+//                    checkNums++;
+//                    if (info.getId()!=null){
+//
+//                    }
+//                }
+//            }
+//        }
         for (int i=0;i< checkJobVOS1.size();i++){
             Integer checkNums = 0;
             SbInfoVO info = new SbInfoVO();
             for (int j=0;j<checkJobVOS.size();j++ ){
-                if (checkJobVOS.get(j).getSbId().equals(checkJobVOS1.get(i).getSbId())){
+                if ((checkJobVOS1.get(i).getStatus()==checkJobVOS.get(j).getStatus()&&checkJobVOS1.get(i).getStatus()==1)&&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);
+                    sbInfoVOS.add(info);
                 }
             }
         }
@@ -195,6 +207,7 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
         checkJobDTO.setSearchStartTime(LocalDateTime.parse(firstDay,df));
         checkJobDTO.setSearchEndTime(LocalDateTime.parse(lastDay,df));
         checkJobDTO.setCheckUserId(userInfo.getUserId());
+        checkJobDTO.setType(2);
         List<CheckJobVO> checkJobVOS = mapper.selectList(checkJobDTO);
         return checkJobVOS;
     }