| | |
| | | .in(PlatformJob::getStatus,Constants.PlatformJobStatus.WAIT_CALL.getKey(), |
| | | Constants.PlatformJobStatus.IN_WAIT.getKey(), |
| | | Constants.PlatformJobStatus.CALLED.getKey()) |
| | | .orderByDesc(PlatformJob::getStatus) |
| | | .orderByAsc(PlatformJob::getSignDate) |
| | | ); |
| | | //获取所有月台组 |
| | |
| | | .in(PlatformJob::getStatus,Constants.PlatformJobStatus.WAIT_CALL.getKey(), |
| | | Constants.PlatformJobStatus.IN_WAIT.getKey(), |
| | | Constants.PlatformJobStatus.CALLED.getKey()) |
| | | .orderByDesc(PlatformJob::getStatus) |
| | | .orderByDesc(PlatformJob::getSignDate)); |
| | | platformGroup.setSignJobList(platformJobSignInList); |
| | | //查询当前月台组下 |
| | |
| | | } |
| | | }else if(Constants.equalsInteger(objType,Constants.PlatformJobLogType.WORKING.getKey())){ |
| | | platformLog.setParam1(DateUtil.dateTypeToString(platformLog.getCreateDate(),"yyyy-MM-dd HH:mm:ss")); |
| | | platformLog.setParam3("0"); |
| | | platformLog.setParam3("0"); |
| | | platformLog.setRemark(platformJobBefor.getPlatformId().toString()); |
| | | }else{ |
| | | platformLog.setParam3("0"); |
| | | } |
| | |
| | | ); |
| | | platformDataListResponse.setWorkStatus(Constants.ONE); |
| | | //查询作业时长 |
| | | // Long workTime = this.getWorkTime(platformJob); |
| | | Long min = (System.currentTimeMillis() - platformJob.getNewStartDate().getTime())/1000/60; |
| | | platformDataListResponse.setWorkTime( |
| | | this.getWorkTime(platformJob) |
| | | min |
| | | ); |
| | | |
| | | //计算已作业时长 根据月台工作效率 计算任务量需要时间 |
| | | if (Objects.isNull(platformJob.getWorkNum()) || Objects.isNull(platformJob.getWorkRate())) { |
| | | platformDataListResponse.setFinishTime(null); |