productDev/dmvisit.git

			@@ -1776,6 +1776,7 @@
			.selectAll(Retention.class)
			.selectAs(Company::getType,Retention::getCompanyType)
			.leftJoin(Company.class,Company::getId,Retention::getCompanyId)
			.eq(Retention::getIsdeleted,Constants.ZERO)
			);

			//今日在园人数
			@@ -1888,9 +1889,13 @@
			}else{
			platformDurationVO.setWorkType(Constants.ZERO);//如果是卸货
			}
			Integer workMinute = Constants.formatBigdecimal(job.getWorkNum()).multiply(new BigDecimal(60)).divide(model.getWorkRate(),0,BigDecimal.ROUND_HALF_UP).intValue();
			Date overDate = DateUtil.getXMinuteAfterDate(job.getNewStartDate(),workMinute + model.getWorkTimeoutAlarmTime());//预计完成时间
			platformDurationVO.setFinishTimeStr(DateUtil.DateToStr(overDate,"HH:mm"));
			Integer workMinute = 0;
			Date overDate =null;
			if(model.getWorkRate()!=null && model.getWorkRate().compareTo(new BigDecimal(0)) !=0){
			workMinute = Constants.formatBigdecimal(job.getWorkNum()).multiply(new BigDecimal(60)).divide(model.getWorkRate(),0,BigDecimal.ROUND_HALF_UP).intValue();
			overDate = DateUtil.getXMinuteAfterDate(job.getNewStartDate(),workMinute + model.getWorkTimeoutAlarmTime());//预计完成时间
			platformDurationVO.setFinishTimeStr(DateUtil.DateToStr(overDate,"HH:mm"));
			}

			platformDurationVO.setWorkNum(Constants.formatBigdecimal(job.getWorkNum()).intValue());
			platformDurationVO.setCarNo(job.getCarCodeFront());//车牌号
			@@ -1899,7 +1904,7 @@
			}else{
			platformDurationVO.setStatus(Constants.ZERO); //作业中
			platformDurationVO.setWorkTime(PlatformJobServiceImpl.getWorkTime(job,platformLogMapper));//已工作时间
			if(overDate.getTime() < System.currentTimeMillis() ){
			if(overDate!=null && overDate.getTime() < System.currentTimeMillis() ){
			model.setStatus(Constants.TWO); //作业已超时
			}
			}
			@@ -2042,7 +2047,7 @@
			.select("count(id)" ,PlatformJob::getCountum)
			.eq(PlatformJob::getIsdeleted,Constants.ZERO)
			.apply("to_days(create_date) = to_days(now())" )
			.groupBy(PlatformJob::getStatus )
			.groupBy(PlatformJob::getStatus)
			);
			if(jobList!=null){