Pu Zhibing
2024-12-30 443dffce29daf6ed03b3c2137738925e315fb09f
guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TaskDetailServiceImpl.java
@@ -124,12 +124,15 @@
      info.setName(patrolTask.getName());
      info.setStatus(taskDetail.getStatus());
      info.setExecutionTime(taskDetail.getExecutionTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
      long offlineNum = taskDetailVehiclesList.stream().filter(s -> s.getStatus() == 3).count();
      //执行状态(1=待执行,2=执行中,3=成功,4=离线,5=失败)
      long offlineNum = taskDetailVehiclesList.stream().filter(s -> s.getStatus() == 4).count();
      info.setOfflineNum(offlineNum);
      long normalNum = taskDetailVehiclesList.stream().filter(s -> s.getStatus() == 2).count();
      long normalNum = taskDetailVehiclesList.stream().filter(s -> s.getStatus() == 3).count();
      info.setNormalNum(normalNum);
      long abnormalNum = taskDetailVehiclesList.stream().filter(s -> s.getStatus() == 4).count();
      long abnormalNum = taskDetailVehiclesList.stream().filter(s -> s.getStatus() == 5).count();
      info.setAbnormalNum(abnormalNum);
      long underway = taskDetailVehiclesList.stream().filter(s -> s.getStatus() == 2).count();
      info.setUnderway(underway);
      return info;
   }
   
@@ -237,7 +240,7 @@
   public ResultUtil manualAudit(ManualAuditVo vo) {
      List<TaskDetailVehiclesChannel> taskDetailVehiclesChannels = taskDetailVehiclesChannelService.selectBatchIds(vo.getId());
      for (TaskDetailVehiclesChannel taskDetailVehiclesChannel : taskDetailVehiclesChannels) {
         if(null != taskDetailVehiclesChannel.getArtificialStatus() && 1 == taskDetailVehiclesChannel.getArtificialStatus()){
         if(null != taskDetailVehiclesChannel.getArtificialStatus() && 1 != taskDetailVehiclesChannel.getArtificialStatus()){
            return ResultUtil.error("不能重复审核");
         }
         taskDetailVehiclesChannel.setArtificialStatus(vo.getStatus());