From e5f765d4694258dfb36a57014afaca3ebe609e30 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期一, 15 九月 2025 17:44:51 +0800
Subject: [PATCH] 检验项目接口调整
---
src/main/java/org/jeecg/modules/qms/controller/InspectionItemController.java | 69 ++++++++++++++++++++++++++++++----
1 files changed, 60 insertions(+), 9 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..1a17bb9 100644
--- a/src/main/java/org/jeecg/modules/qms/controller/InspectionItemController.java
+++ b/src/main/java/org/jeecg/modules/qms/controller/InspectionItemController.java
@@ -1,16 +1,9 @@
package org.jeecg.modules.qms.controller;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-
import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant;
@@ -19,7 +12,6 @@
import org.jeecg.modules.qms.entity.InspectionItem;
import org.jeecg.modules.qms.entity.InspectionTools;
import org.jeecg.modules.qms.service.IInspectionItemService;
-
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -78,6 +70,27 @@
QueryWrapper<InspectionItem> queryWrapper = QueryGenerator.initQueryWrapper(inspectionItem, req.getParameterMap());
Page<InspectionItem> page = new Page<InspectionItem>(pageNo, pageSize);
IPage<InspectionItem> pageList = inspectionItemService.page(page, queryWrapper);
+ List<InspectionItem> records = pageList.getRecords();
+ Set<String> uniqueToolIds = records.stream()
+ .map(InspectionItem::getInspectionTools)
+ .filter(StringUtils::isNotBlank)
+ .flatMap(tools -> Arrays.stream(tools.split(",")))
+ .map(String::trim)
+ .collect(Collectors.toSet());
+ Map<String, String> toolIdNameMap = inspectionToolsService.listByIds(uniqueToolIds).stream()
+ .collect(Collectors.toMap(InspectionTools::getId, InspectionTools::getToolName));
+
+ records.forEach(record -> {
+ String inspectionTools = record.getInspectionTools();
+ if (StringUtils.isNotBlank(inspectionTools)) {
+ String toolNames = Arrays.stream(inspectionTools.split(","))
+ .map(String::trim)
+ .map(toolIdNameMap::get)
+ .filter(Objects::nonNull)
+ .collect(Collectors.joining(","));
+ record.setInspectionToolNames(toolNames);
+ }
+ });
return Result.OK(pageList);
}
@@ -237,4 +250,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