|  | @ -32,15 +32,16 @@ public class ArchiveUploadJob implements IBaseJob {
 | 
	
		
			
				|  |  |         Map<String, Object> condition = new HashMap<>();
 | 
	
		
			
				|  |  |         Date begin = job.getRepeatStartTime();
 | 
	
		
			
				|  |  |         Date end = job.getRepeatEndTime();
 | 
	
		
			
				|  |  |         if (end == null) {
 | 
	
		
			
				|  |  |             //调整截止时间,当前时间-偏移量
 | 
	
		
			
				|  |  |             end = DateUtil.addDate(-job.getDelayTime(), DateUtil.getSysDateTime());
 | 
	
		
			
				|  |  |         if (!job.getJobType().equals("0")) {
 | 
	
		
			
				|  |  |             if (end == null) {
 | 
	
		
			
				|  |  |                 //调整截止时间,当前时间-偏移量
 | 
	
		
			
				|  |  |                 end = DateUtil.addDate(-job.getDelayTime(), DateUtil.getSysDateTime());
 | 
	
		
			
				|  |  |             }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |             if ((end.getTime() - begin.getTime()) <= 0) {
 | 
	
		
			
				|  |  |                 return; //结束时间小于开始时间时,不获取
 | 
	
		
			
				|  |  |             }
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |         if ((end.getTime() - begin.getTime()) <= 0) {
 | 
	
		
			
				|  |  |             return; //结束时间小于开始时间时,不获取
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |         condition.put("beginDate", begin);
 | 
	
		
			
				|  |  |         condition.put("endDate", end);
 | 
	
		
			
				|  |  | 
 | 
	
	
		
			
				|  | @ -48,8 +49,10 @@ public class ArchiveUploadJob implements IBaseJob {
 | 
	
		
			
				|  |  |         condition.put("datasetList", result.getDetailModelList());
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |         CrawlerManager.getInstance().dataCrawler(condition);
 | 
	
		
			
				|  |  |         job.setRepeatStartTime(end);
 | 
	
		
			
				|  |  |         job.setRepeatEndTime(DateUtil.formatYMDToYMDHMS(DateUtil.getSysDateTime().toString()));
 | 
	
		
			
				|  |  |         if (!job.getJobType().equals("0")) {
 | 
	
		
			
				|  |  |             job.setRepeatStartTime(end);
 | 
	
		
			
				|  |  |             job.setRepeatEndTime(DateUtil.formatYMDToYMDHMS(DateUtil.getSysDateTime().toString()));
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |         datacollect.updateJob(job);
 | 
	
		
			
				|  |  |         return;
 | 
	
		
			
				|  |  |     }
 |