新增任务管理、任务记录等搜索字段，可重复审核，添加导出任务记录字段

huliguo

2 天以前 a4bfa94e3d97406c410e6975d9ab1b625ed05fe1

 guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TaskDetailServiceImpl.java

@@ -158,21 +158,38 @@
         }
         wrapper.in("vehicleIdUnique", vehicleIdList);
      }
      if(null != vo.getStatus()){
         wrapper.eq("status", vo.getStatus());
      if(null != vo.getStatus() && !vo.getStatus().isEmpty()){
         wrapper.in("status", vo.getStatus());
      }
      if(null != vo.getSysStatus()){
         List<TaskDetailVehiclesChannel> sys_status = taskDetailVehiclesChannelService.selectList(new EntityWrapper<TaskDetailVehiclesChannel>()
               .eq("sys_status", vo.getSysStatus()));

      if(null != vo.getSysStatus() && !vo.getSysStatus().isEmpty()){
         Wrapper<TaskDetailVehiclesChannel> channelWrapper = new EntityWrapper<TaskDetailVehiclesChannel>()
               .in("sys_status", vo.getSysStatus());
         if (null != vo.getHavePic()){
            if(vo.getHavePic()==0){
               channelWrapper.isNull("image_url");
            }else if(vo.getHavePic()==1){
               channelWrapper.isNotNull("image_url");
            }
         }
         List<TaskDetailVehiclesChannel> sys_status = taskDetailVehiclesChannelService.selectList(channelWrapper);
         List<Integer> collect = sys_status.stream().map(TaskDetailVehiclesChannel::getTaskDetailVehiclesId).collect(Collectors.toList());
         if(collect.size() == 0){
            collect.add(-1);
         }
         wrapper.in("id", collect);
      }
      if(null != vo.getArtificialStatus()){
         List<TaskDetailVehiclesChannel> sys_status = taskDetailVehiclesChannelService.selectList(new EntityWrapper<TaskDetailVehiclesChannel>()
               .eq("artificial_status", vo.getArtificialStatus()));
      if(null != vo.getArtificialStatus()&& !vo.getArtificialStatus().isEmpty()){
         Wrapper<TaskDetailVehiclesChannel> channelWrapper = new EntityWrapper<TaskDetailVehiclesChannel>()
               .in("artificial_status", vo.getArtificialStatus());
         if (null != vo.getHavePic()){
            if(vo.getHavePic()==0){
               channelWrapper.isNull("image_url");
            }else if(vo.getHavePic()==1){
               channelWrapper.isNotNull("image_url");
            }
         }
         List<TaskDetailVehiclesChannel> sys_status = taskDetailVehiclesChannelService.selectList(channelWrapper);
         List<Integer> collect = sys_status.stream().map(TaskDetailVehiclesChannel::getTaskDetailVehiclesId).collect(Collectors.toList());
         if(collect.size() == 0){
            collect.add(-1);
@@ -221,15 +238,15 @@
         }
         wrapper.in("vehicleIdUnique", vehicleIdList);
      }
      if(null != vo.getStatus()){
         wrapper.eq("status", vo.getStatus());
      if(null != vo.getStatus() && !vo.getStatus().isEmpty()){
         wrapper.in("status", vo.getStatus());
      }
      List<TaskDetailVehicles> taskDetailVehiclesList = taskDetailVehiclesService.selectList(wrapper);
      List<Integer> collect = taskDetailVehiclesList.stream().map(TaskDetailVehicles::getId).collect(Collectors.toList());
      if(collect.size() > 0){
         collect.add(-1);
      }
      List<PictureDetails> pictureDetails = taskDetailVehiclesChannelService.getPictureDetails(pageInfo, collect, vo.getSysStatus(), vo.getArtificialStatus());
      List<PictureDetails> pictureDetails = taskDetailVehiclesChannelService.getPictureDetails(pageInfo, collect, vo.getSysStatus(), vo.getArtificialStatus(),vo.getHavePic());
      List<Icon> icons = iconService.selectList(null);
      for (PictureDetails pictureDetail : pictureDetails) {
         String videoChannel = pictureDetail.getVideoChannel();
@@ -260,14 +277,15 @@
   public ResultUtil manualAudit(ManualAuditVo vo, String userId) {
      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());
         taskDetailVehiclesChannel.setRemark(vo.getRemark());
         taskDetailVehiclesChannel.setArtificialCreateTime(LocalDateTime.now());
         taskDetailVehiclesChannel.setArtificialUserId(Integer.valueOf(userId));
         taskDetailVehiclesChannelService.updateById(taskDetailVehiclesChannel);
//         taskDetailVehiclesChannelService.updateById(taskDetailVehiclesChannel);
         taskDetailVehiclesChannelService.updateAudit(taskDetailVehiclesChannel);//需要将Remark字段设置为null
      }
      return ResultUtil.success();
   }
@@ -281,8 +299,8 @@
    * @param response
    */
   @Override
   public void downloadTaskRecord(List<String> ids, String code, Integer status, HttpServletResponse response) {
      List<Map<String, Object>> mapList = this.baseMapper.getDownloadTaskRecord(ids, code, status);
   public void downloadTaskRecord(List<String> ids, String code, Integer status,Integer sysStatus, HttpServletResponse response) {
      List<Map<String, Object>> mapList = this.baseMapper.getDownloadTaskRecord(ids, code, status,sysStatus);
      try {
         HSSFWorkbook hssfWorkbook = new HSSFWorkbook();
         HSSFSheet hssfSheet = hssfWorkbook.createSheet();
@@ -450,8 +468,8 @@
            hssfCell11.setCellValue("");
            if(null != map.get("sysStatus")){
               //系统审核状态（1=未执行，2=正常，3=异常）
               Integer sysStatus = Integer.valueOf(map.get("sysStatus").toString());
               hssfCell11.setCellValue(1 == sysStatus ? "未执行" : 2 == sysStatus ? "正常" : "异常");
               Integer sysStatus1 = Integer.valueOf(map.get("sysStatus").toString());
               hssfCell11.setCellValue(1 == sysStatus1 ? "未执行" : 2 == sysStatus1 ? "正常" : "异常");
            }
            //系统审核时间
            HSSFCell hssfCell12 = hssfRow.createCell(12);