java/smart_screen.git

			@@ -21,10 +21,7 @@
			import javax.validation.Valid;
			import java.math.BigDecimal;
			import java.math.RoundingMode;
			import java.util.ArrayList;
			import java.util.Comparator;
			import java.util.List;
			import java.util.Map;
			import java.util.*;
			import java.util.stream.Collectors;

			import static java.util.stream.Collectors.groupingBy;
			@@ -185,7 +182,7 @@
			}


			@ApiOperation(value = "获取设备详情检查列表",response = DeviceDetailCheckListVo.class)
			@ApiOperation(value = "获取检查计划列表",response = DeviceDetailCheckListVo.class)
			@PostMapping("/getDeviceDetailCheckList")
			public R<Page<DeviceDetailCheckListVo>> getDeviceDetailCheckList(@RequestBody DeviceDetailCheckListQuery query) {
			Page<DeviceDetailCheckListVo> page = new Page<>(query.getPageNum(), query.getPageSize());
			@@ -195,14 +192,25 @@
			}


			@ApiOperation(value = "获取设备详情检查资料列表")
			@ApiOperation(value = "获取检查资料列表")
			@GetMapping("/getDeviceDetailCheckPlanList")
			public R<List<Check>> getDeviceDetailCheckPlanList(@RequestParam Integer planId) {
			List<Check> list = checkService.list(new LambdaQueryWrapper<Check>().eq(Check::getPlanId,planId).orderByDesc(Check::getTime));
			if(!list.isEmpty()){
			List<Integer> planIds = list.stream().map(Check::getPlanId).toList();
			List<Plan> plans = planService.listByIds(planIds);

			List<Integer> projectIds = list.stream().map(Check::getProjectId).toList();
			List<Project> projects = projectService.listByIds(projectIds);
			list.forEach(check -> {
			check.setPlanName(Objects.requireNonNull(plans.stream().filter(plan -> plan.getId().equals(check.getPlanId())).findFirst().orElse(null)).getName());
			check.setProjectName(Objects.requireNonNull(projects.stream().filter(project -> project.getId().equals(check.getProjectId())).findFirst().orElse(null)).getName());
			});
			}
			return R.ok(list);
			}

			@ApiOperation(value = "获取设备详情检查资料详情")
			@ApiOperation(value = "获取检查资料详情")
			@GetMapping("/getDeviceDetailCheckPlanDetail")
			public R<Check> getDeviceDetailCheckPlanDetail(@RequestParam Integer id) {
			Check check = checkService.getDeviceDetailCheckPlanDetail(id);