cuijian
2025-07-04 16807e7a9b856a78abbfd80d7ec69e784d5127c7
src/main/java/org/jeecg/modules/qms/controller/InspectionItemController.java
@@ -237,4 +237,42 @@
       return Result.OK(pageList);
    }
    /**
     * 根据检验方案id查询
     *
     * @param inspectionPlanId
     * @param pageNo
     * @param pageSize
     * @return
     */
    @ApiOperation(value="检验项目-分页列表查询", notes="检验项目-分页列表查询")
    @GetMapping(value = "/queryListByPlanId")
    public Result<?> queryListByPlanId(String inspectionPlanId,
                        @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                        @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
       IPage<Map<String, Object>> pageList = inspectionItemService.queryListByPlanId(pageNo,pageSize, inspectionPlanId);
       for(Map<String, Object> r : pageList.getRecords()){
          String inspectionTools = (String) r.get("inspectionTools");
          if(StringUtils.isNotBlank(inspectionTools)){
             List<String> inspectionToolsList = Arrays.asList(inspectionTools.split(","));
             List<String> inspectionToolsNameList = new ArrayList<>();
             String inspectionToolsNames = "";
             for(String inspectionTool : inspectionToolsList){
                InspectionTools inspectionTools1 = inspectionToolsService.getById(inspectionTool);
                if(inspectionTools1 != null){
                   inspectionToolsNameList.add(inspectionTools1.getToolName());
                }
             }
             inspectionToolsNames = inspectionToolsNameList.stream()
                   .collect(Collectors.joining(","));
             r.put("inspectionToolsNames",inspectionToolsNames);
          }
       }
       return Result.OK(pageList);
    }
}