From efe2947ec14049283d5faffe2282fba3e86386c7 Mon Sep 17 00:00:00 2001 From: wangguangyuan Date: Fri, 31 Oct 2025 14:53:58 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E7=81=B5=E5=B7=9E=E7=AB=99=E6=8A=A5?= =?UTF-8?q?=E5=91=8A=E5=90=88=E5=B9=B6=E5=B7=A1=E8=A7=86=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PatrolResultServiceImpl.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java index 9d9928f..419edf7 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java @@ -602,16 +602,20 @@ public class PatrolResultServiceImpl implements IPatrolResultService { String taskCode = patrolResult.getTaskCode(); String taskPatrolId = patrolResult.getTaskPatrolledId(); List taskNames = resultList.stream().map(PatrolResult::getTaskName).distinct().collect(Collectors.toList()); + List taskPatrolledIds = resultList.stream().map(PatrolResult::getTaskPatrolledId).distinct().collect(Collectors.toList()); String taskName = StringUtils.join(taskNames, ","); if (StringUtils.isEmpty(taskPatrolId)) { throw new ServiceException("LACK PLAN ID: " + mainId); } else { - List taskStatuses = this.patrolTaskStatusMapper.selectPatrolTaskStatusList(PatrolTaskStatus.builder().taskPatrolledId(taskPatrolId).build()); +// List taskStatuses = this.patrolTaskStatusMapper.selectPatrolTaskStatusList(PatrolTaskStatus.builder().taskPatrolledId(taskPatrolId).build()); + List taskStatuses = this.patrolTaskStatusMapper.selectPatrolTaskStatusListByTaskPatrolledIds(taskPatrolledIds); + List startTimes = taskStatuses.stream().map(PatrolTaskStatus::getStartTime).sorted().collect(Collectors.toList()); + List endTimes = taskStatuses.stream().map(PatrolTaskStatus::getEndTime).sorted().collect(Collectors.toList()); startTime = PrintUtil.useTime("INQUIRY STATUS", startTime); if (taskStatuses.isEmpty()) { throw new ServiceException("LACKING STATUS: " + mainId); } else { - PatrolTaskStatus taskStatus = taskStatuses.get(0); + PatrolTaskStatus taskStatus = taskStatuses.stream().filter(item -> taskPatrolId.equals(item.getTaskPatrolledId())).findFirst().orElse(null); List list = patrolTaskMapper.selectPatrolTaskList(PatrolTask.builder().taskCode(taskCode).build()); startTime = PrintUtil.useTime("INQUIRY TASK PLAN", startTime); if (list.isEmpty()) { @@ -663,6 +667,8 @@ public class PatrolResultServiceImpl implements IPatrolResultService { } InspectionReport report = new InspectionReport(); resetReport(report, nums[i], mainId, task, taskStatus); + report.setInspectionStartTime(startTimes.get(0)); + report.setInspectionEndTime(DateUtils.parseDate(endTimes.get(endTimes.size() - 1))); report.setTaskId(String.valueOf(task.getTaskId())); report.setEnvInfo(StringUtils.join(envoList,",")); report.setTaskPatrolledId(taskPatrolId);