From 5b999730e081bb5ba934ebf361280ca477a0e714 Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期四, 14 八月 2025 17:03:04 +0800
Subject: [PATCH] 工厂建模功能调整
---
src/main/java/org/jeecg/modules/qms/controller/InspectionItemController.java | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/qms/controller/InspectionItemController.java b/src/main/java/org/jeecg/modules/qms/controller/InspectionItemController.java
index 1c38dc3..193ae13 100644
--- a/src/main/java/org/jeecg/modules/qms/controller/InspectionItemController.java
+++ b/src/main/java/org/jeecg/modules/qms/controller/InspectionItemController.java
@@ -237,4 +237,42 @@
return Result.OK(pageList);
}
+
+ /**
+ * 鏍规嵁妫�楠屾柟妗坕d鏌ヨ
+ *
+ * @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);
+ }
+
}
--
Gitblit v1.9.3