java/vehicleInspection.git

			@@ -164,11 +164,12 @@

			if(null != vo.getSysStatus() && !vo.getSysStatus().isEmpty()){
			Wrapper<TaskDetailVehiclesChannel> channelWrapper = new EntityWrapper<TaskDetailVehiclesChannel>()
			.eq("task_detail_id", vo.getId())
			.in("sys_status", vo.getSysStatus());
			if (null != vo.getHavePic()){
			if(vo.getHavePic()==0){
			if(vo.getHavePic().equals("0")){
			channelWrapper.isNull("image_url");
			}else if(vo.getHavePic()==1){
			}else if(vo.getHavePic().equals("1")){
			channelWrapper.isNotNull("image_url");
			}
			}
			@@ -181,11 +182,12 @@
			}
			if(null != vo.getArtificialStatus()&& !vo.getArtificialStatus().isEmpty()){
			Wrapper<TaskDetailVehiclesChannel> channelWrapper = new EntityWrapper<TaskDetailVehiclesChannel>()
			.eq("task_detail_id", vo.getId())
			.in("artificial_status", vo.getArtificialStatus());
			if (null != vo.getHavePic()){
			if(vo.getHavePic()==0){
			if(vo.getHavePic().equals("0")){
			channelWrapper.isNull("image_url");
			}else if(vo.getHavePic()==1){
			}else if(vo.getHavePic().equals("1")){
			channelWrapper.isNotNull("image_url");
			}
			}
			@@ -246,7 +248,7 @@
			if(collect.size() > 0){
			collect.add(-1);
			}
			List<PictureDetails> pictureDetails = taskDetailVehiclesChannelService.getPictureDetails(pageInfo, collect, vo.getSysStatus(), vo.getArtificialStatus(),vo.getHavePic());
			List<PictureDetails> pictureDetails = taskDetailVehiclesChannelService.getPictureDetails(pageInfo, collect, vo.getSysStatus(), vo.getArtificialStatus(), vo.getHavePic() != null ? Integer.valueOf(vo.getHavePic()) : null);
			List<Icon> icons = iconService.selectList(null);
			for (PictureDetails pictureDetail : pictureDetails) {
			String videoChannel = pictureDetail.getVideoChannel();
			@@ -299,7 +301,7 @@
			* @param response
			*/
			@Override
			public void downloadTaskRecord(List<String> ids, String code, Integer status,Integer sysStatus, HttpServletResponse response) {
			public void downloadTaskRecord(List<String> ids, String code, List<Integer> status,Integer sysStatus, HttpServletResponse response) {
			List<Map<String, Object>> mapList = this.baseMapper.getDownloadTaskRecord(ids, code, status,sysStatus);
			try {
			HSSFWorkbook hssfWorkbook = new HSSFWorkbook();