道床病害分析--shizhilong

jeecg-module-system/src/main/java/org/jeecg/modules/diseaseAnalysis/controller/AnalysisLineBatchController.java

@@ -226,9 +226,10 @@ public class AnalysisLineBatchController extends JeecgController<AnalysisLineBat
     @AutoLog(value = "线路质量分析-其他病害分析-道床单元详情检查记录查询")
     @ApiOperation(value = "线路质量分析-其他病害分析-道床单元详情检查记录查询", notes = "线路质量分析-其他病害分析-道床单元详情检查记录查询")
     @GetMapping(value = "/getAnalysisLineBatchUnitDeviceTrackBedInfoList")
-    public Result<List<AnalysisLineBatchUnitDeviceTrackBedInfoVO>> getAnalysisLineBatchUnitDeviceTrackBedInfoList(@RequestParam String analysisBatchId, @RequestParam String ekId, @RequestParam String deviceId) {
+    public Result<Map<String, List<AnalysisLineBatchUnitDeviceTrackBedInfoVO>>> getAnalysisLineBatchUnitDeviceTrackBedInfoList(@RequestParam String analysisBatchId, @RequestParam String ekId, @RequestParam String deviceId) {
         List<AnalysisLineBatchUnitDeviceTrackBedInfoVO> list = this.service.getAnalysisLineBatchUnitDeviceTrackBedInfoList(analysisBatchId, ekId, deviceId);
-        return Result.OK(list);
+        Map<String, List<AnalysisLineBatchUnitDeviceTrackBedInfoVO>> map = list.stream().collect(Collectors.groupingBy(AnalysisLineBatchUnitDeviceTrackBedInfoVO::getTrackBedCode));
+        return Result.OK(map);
     }
     /**
      * 线路质量分析-其他病害分析-线路巡查巡道员检查详情

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/controller/WorkBatchController.java

@@ -31,6 +31,7 @@ import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -132,8 +133,9 @@ public class WorkBatchController extends JeecgController<WorkBatch, IWorkBatchSe
             map.put("zg", corrugationInfoList);
         }else if(analysisType == 5){
             List<WorkBatchDetailTrackBedInfoVO> trackBedInfoList = this.service.getWorkBatchDetailTrackBedInfoList(workId,workInfoId);
+            Map<String, List<WorkBatchDetailTrackBedInfoVO>> trackBedMap = trackBedInfoList.stream().collect(Collectors.groupingBy(WorkBatchDetailTrackBedInfoVO::getTrackBedCode));
             //整改道床检查超限数据
-            map.put("zg", trackBedInfoList);
+            map.put("zg", trackBedMap);
         }else {
             List<WorkBatchDetailPatrolInfoVO> patrolInfoList = this.service.getWorkBatchDetailPatrolInfoList(workId,workInfoId);
             List<WorkBatchDetailPatrolAssistInfoVO> patrolAssistInfoList = this.service.getWorkBatchDetailPatrolAssistInfoList(workId,workInfoId);