smartor.git - Gitblit

			@@ -14,6 +14,7 @@
			import com.ruoyi.common.utils.StringUtils;
			import com.ruoyi.common.utils.poi.ExcelUtil;
			import com.smartor.domain.*;
			import com.smartor.domain.entity.ServiceSubtaskEntity;
			import com.smartor.service.IServiceSubtaskService;
			import com.smartor.service.IServiceTaskService;
			import io.swagger.annotations.Api;
			@@ -64,7 +65,7 @@
			@ApiOperation("查询任务列表")
			//@PreAuthorize("@ss.hasPermi('smartor:ServiceTask:list')")
			@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
			@PostMapping("list")
			@PostMapping("/list")
			public TableDataInfo list(@RequestBody ServiceTask serviceTask) {
			PageUtils.startPageByPost(serviceTask.getPageNum(), serviceTask.getPageSize());
			// List<ServiceTask> list = serviceTaskService.selectServiceTaskList(serviceTask);
			@@ -73,16 +74,16 @@

			List<Long> taskIds = list.stream().map(ServiceTask::getTaskid).collect(Collectors.toList());

			ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
			serviceSubtaskVO.setTaskIds(taskIds);
			serviceSubtaskVO.setStartOutHospTime(serviceTask.getStartOutHospTime());
			serviceSubtaskVO.setEndOutHospTime(serviceTask.getEndOutHospTime());
			ServiceSubtaskEntity serviceSubtaskEntity = new ServiceSubtaskEntity();
			serviceSubtaskEntity.setTaskIds(taskIds);
			serviceSubtaskEntity.setStartOutHospTime(serviceTask.getStartOutHospTime());
			serviceSubtaskEntity.setEndOutHospTime(serviceTask.getEndOutHospTime());
			// 批量查询所有子任务
			Map<String, List<ServiceSubtask>> subtaskMap = iServiceSubtaskService
			.selectServiceSubtaskList(serviceSubtaskVO)
			.selectServiceSubtaskList(serviceSubtaskEntity)
			.stream()
			.filter(subtask -> subtask.getTaskid() != null) // 添加过滤
			.collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getLeavehospitaldistrictcode()).orElse("Unknown")));
			.collect(Collectors.groupingBy(subtask -> Optional.of(subtask.getTaskid().toString()).orElse("Unknown")));


			if (CollectionUtils.isNotEmpty(serviceTaskVOS)) {