fix:灵州站报告合并巡视时间逻辑修改

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<String> taskNames = resultList.stream().map(PatrolResult::getTaskName).distinct().collect(Collectors.toList());
+            List<String> 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<PatrolTaskStatus> taskStatuses = this.patrolTaskStatusMapper.selectPatrolTaskStatusList(PatrolTaskStatus.builder().taskPatrolledId(taskPatrolId).build());
+//                List<PatrolTaskStatus> taskStatuses = this.patrolTaskStatusMapper.selectPatrolTaskStatusList(PatrolTaskStatus.builder().taskPatrolledId(taskPatrolId).build());
+                List<PatrolTaskStatus> taskStatuses = this.patrolTaskStatusMapper.selectPatrolTaskStatusListByTaskPatrolledIds(taskPatrolledIds);
+                List<Date> startTimes = taskStatuses.stream().map(PatrolTaskStatus::getStartTime).sorted().collect(Collectors.toList());
+                List<String> 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<PatrolTask> 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);