|
|
@ -225,7 +225,12 @@ public class ResourceInspectTaskServiceImpl extends ServiceImpl<ResourceInspectT
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public ResourceInspectTask getInspectTaskByResource(ResourceInspectTaskDto resourceInspectTaskDto) {
|
|
|
|
public ResourceInspectTask getInspectTaskByResource(ResourceInspectTaskDto resourceInspectTaskDto) {
|
|
|
|
resourceInspectTaskDto.setSite(CommonMethods.getSite());
|
|
|
|
String site = CommonMethods.getSite();
|
|
|
|
|
|
|
|
String currentUser = CommonMethods.getUser();
|
|
|
|
|
|
|
|
String userBo = HandleEnum.USR.getHandle(site, currentUser);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
resourceInspectTaskDto.setSite(site);
|
|
|
|
|
|
|
|
resourceInspectTaskDto.setCurrentUser(userBo);
|
|
|
|
LocalDateTime now = LocalDateTime.now();
|
|
|
|
LocalDateTime now = LocalDateTime.now();
|
|
|
|
LocalDateTime compareStart = now.minusHours(now.getHour()).minusMinutes(now.getMinute());
|
|
|
|
LocalDateTime compareStart = now.minusHours(now.getHour()).minusMinutes(now.getMinute());
|
|
|
|
LocalDateTime compareEnd = compareStart.plusDays(1);
|
|
|
|
LocalDateTime compareEnd = compareStart.plusDays(1);
|
|
|
@ -241,10 +246,6 @@ public class ResourceInspectTaskServiceImpl extends ServiceImpl<ResourceInspectT
|
|
|
|
resourceInspectTaskAll.setResourceDescription(resourceInspectTaskList.get(0).getResourceDescription());
|
|
|
|
resourceInspectTaskAll.setResourceDescription(resourceInspectTaskList.get(0).getResourceDescription());
|
|
|
|
return resourceInspectTaskAll;
|
|
|
|
return resourceInspectTaskAll;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// 获取任务详情
|
|
|
|
|
|
|
|
/*if (resourceInspectTaskList.size() > 1){
|
|
|
|
|
|
|
|
throw BusinessException.build("当前设备当日点检任务不止一个!");
|
|
|
|
|
|
|
|
}*/
|
|
|
|
|
|
|
|
throw BusinessException.build("未找到当日的点检任务!");
|
|
|
|
throw BusinessException.build("未找到当日的点检任务!");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|