productDev/dmvisit.git

			@@ -22,6 +22,7 @@
			import com.doumee.dao.business.join.PlatformJobJoinMapper;
			import com.doumee.dao.business.join.PlatformJoinMapper;
			import com.doumee.dao.business.model.*;
			import com.doumee.dao.business.vo.LargeScreenDataVO;
			import com.doumee.dao.openapi.request.*;
			import com.doumee.dao.openapi.response.*;
			import com.doumee.dao.system.model.SystemUser;
			@@ -45,10 +46,7 @@

			import java.math.BigDecimal;
			import java.math.RoundingMode;
			import java.util.ArrayList;
			import java.util.Date;
			import java.util.List;
			import java.util.Objects;
			import java.util.*;
			import java.util.stream.Collectors;

			/**
			@@ -256,6 +254,7 @@
			.eq(pageWrap.getModel().getPlatformGroupId() != null, PlatformJob::getPlatformGroupId, pageWrap.getModel().getPlatformGroupId())

			.apply(pageWrap.getModel().getQueryStatus() != null, " find_in_set(t.`STATUS`,'"+pageWrap.getModel().getQueryStatus()+"')")
			.apply(pageWrap.getModel().getQueryType() != null, " find_in_set(t.TYPE,'"+pageWrap.getModel().getQueryType()+"')")
			.ge(pageWrap.getModel().getBeginWorkDateStart() != null, PlatformJob::getStartDate, Utils.Date.getStart(pageWrap.getModel().getBeginWorkDateStart()))
			.le(pageWrap.getModel().getBeginWorkDateEnd() != null, PlatformJob::getStartDate, Utils.Date.getEnd(pageWrap.getModel().getBeginWorkDateEnd()))

			@@ -290,11 +289,13 @@
			Utils.MP.blankToNull(pageWrap.getModel());
			queryWrapper
			.selectAll(PlatformJob.class)
			.selectAs(PlatformBooks::getId,PlatformJob::getBookId)
			.selectAs(Platform::getName,PlatformJob::getPlatformName)
			.selectAs(Platform::getWorkRate,PlatformJob::getWorkRate)
			.selectAs(PlatformWmsJob::getCarrierName,PlatformJob::getCarrierName)
			.leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
			.leftJoin(PlatformWmsJob.class,PlatformWmsJob::getCarryBillCode,PlatformJob::getBillCode)
			.leftJoin(PlatformBooks.class,PlatformBooks::getJobId,PlatformJob::getId)
			.eq(pageWrap.getModel().getPlatformGroupId() != null, PlatformJob::getPlatformGroupId, pageWrap.getModel().getPlatformGroupId())
			.like(pageWrap.getModel().getCarCodeFront() != null, PlatformJob::getCarCodeFront, pageWrap.getModel().getCarCodeFront())

			@@ -556,7 +557,14 @@
			\|\| System.currentTimeMillis() < DateUtil.getDateByString(DateUtil.getCurrDate() + " " + platformGroup.getStartTime() + ":00" ).getTime()){
			throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"未在工作时间["+platformGroup.getStartTime() + "-" + platformGroup.getEndTime() +"]，无法进行签到");
			}

			//查询今日最大的签到数
			List<PlatformJob> signList = platformJobMapper.selectList(new QueryWrapper<PlatformJob>().lambda().apply(" DATE(SIGN_DATE) = DATE(NOW()) and sign_date is not null "));
			if(CollectionUtils.isEmpty(signList)){
			platformJob.setSignNum(Constants.ONE);
			} else{
			int maxNumber = Collections.max(signList.stream().map(i->i.getSignNum()).collect(Collectors.toList()));
			platformJob.setSignNum(maxNumber + Constants.ONE);
			}
			platformJob.setSignDate(new Date());
			platformJob.setSingType(signInDTO.getSignType());
			platformJob.setStatus(Constants.PlatformJobStatus.WAIT_CALL.getKey());
			@@ -842,10 +850,10 @@
			ParkReservationAddResponse parkReservationAddResponse = (ParkReservationAddResponse) response.getData();
			visitPark.setHkId(parkReservationAddResponse.getReserveOrderNo());
			visitPark.setHkStatus(Constants.ONE);
			visitPark.setRemark("包期成功");
			visitPark.setRemark("车辆权限下发成功");
			}else{
			visitPark.setHkStatus(Constants.TWO);
			visitPark.setRemark("包期失败~");
			visitPark.setRemark("车辆权限下发失败~");
			//下发失败标记主业务状态为下发失败
			sendStatus = false;
			}
			@@ -1665,5 +1673,51 @@
			}


			@Override
			public LargeScreenDataVO getLargeScreenData(){
			LargeScreenDataVO largeScreenDataVO = new LargeScreenDataVO();
			List<PlatformJob> platformJobList = platformJobJoinMapper.selectJoinList(PlatformJob.class,new MPJLambdaWrapper<PlatformJob>()
			.selectAll(PlatformJob.class)
			.selectAs(Platform::getWorkRate,PlatformJob::getWorkRate)
			.select(" ( select pl.CREATE_DATE from platform_log pl where t.id = pl.obj_id and pl.OBJ_TYPE = 5 order by pl.CREATE_DATE desc limit 1 ) as newStartDate ")
			.select(" ( select pl.CREATE_DATE from platform_log pl where t.id = pl.obj_id and pl.OBJ_TYPE = 4 order by pl.CREATE_DATE desc limit 1 ) as newCallDate ")
			.leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
			.in(PlatformJob::getStatus,
			Constants.PlatformJobStatus.WAIT_CALL.getKey(),
			Constants.PlatformJobStatus.WORKING.getKey(),
			Constants.PlatformJobStatus.CALLED.getKey(),
			Constants.PlatformJobStatus.IN_WAIT.getKey()
			)
			.orderByDesc(PlatformJob::getStatus)
			.orderByAsc(PlatformJob::getSignDate)
			);
			if(CollectionUtils.isEmpty(platformJobList)){
			for (PlatformJob platformJob:platformJobList) {
			if(Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WORKING.getKey())){
			//计算已作业时长根据月台工作效率计算任务量需要时间
			if(Objects.isNull(platformJob.getTotalNum()) \|\| Objects.isNull(platformJob.getWorkRate())){
			platformJob.setOptTime(0L);
			}else{
			Integer workMinute = platformJob.getTotalNum().multiply(new BigDecimal(60)).divide(platformJob.getWorkRate()).intValue();
			Date overDate = DateUtil.getXMinuteAfterDate(platformJob.getNewStartDate(),workMinute);
			platformJob.setOptTime(overDate.getTime()/1000);
			}
			}else if(Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.CALLED.getKey())){
			//计算已叫号时间
			platformJob.dealTime();
			}
			}
			largeScreenDataVO.setAllList(platformJobList);
			List<PlatformJob> calledList = platformJobList.stream().filter(i->Constants.equalsInteger(i.getStatus(),Constants.PlatformJobStatus.CALLED.getKey())).collect(Collectors.toList());
			largeScreenDataVO.setWaitWorkList(calledList);
			}
			largeScreenDataVO.setQrCode(systemDictDataBiz.queryByCode(Constants.PLATFORM,Constants.SIGN_IN_QRCODE).getCode());
			return largeScreenDataVO;

			}





			}