From bc906065cf3ab03d92b3cf815fb8c03bef9941ea Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期四, 03 七月 2025 09:13:27 +0800
Subject: [PATCH] 质量管理-抽样规则、缺陷维护功能
---
src/main/java/org/jeecg/modules/qms/controller/InspectionItemController.java | 61 ++++++++++++++++++++++++++++++
1 files changed, 61 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 22d7c03..1c38dc3 100644
--- a/src/main/java/org/jeecg/modules/qms/controller/InspectionItemController.java
+++ b/src/main/java/org/jeecg/modules/qms/controller/InspectionItemController.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.qms.controller;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -9,11 +10,14 @@
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;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
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;
@@ -21,6 +25,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
+import org.jeecg.modules.qms.service.IInspectionToolsService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -50,6 +55,9 @@
public class InspectionItemController extends JeecgController<InspectionItem, IInspectionItemService> {
@Autowired
private IInspectionItemService inspectionItemService;
+
+ @Autowired
+ private IInspectionToolsService inspectionToolsService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -176,4 +184,57 @@
return super.importExcel(request, response, InspectionItem.class);
}
+ @AutoLog(value = "妫�楠岄」鐩�-鍚敤&绂佺敤")
+ @ApiOperation(value = "妫�楠岄」鐩�-鍚敤&绂佺敤", notes = "妫�楠岄」鐩�-鍚敤&绂佺敤")
+ @PutMapping(value = "/active")
+ public Result<?> active(@RequestParam(name = "id", required = true) String id) {
+ InspectionItem inspectionItem = inspectionItemService.getById(id);
+ if (CommonConstant.STATUS_1.equals(inspectionItem.getItemStatus())) {
+ inspectionItem.setItemStatus(CommonConstant.STATUS_0);
+ } else {
+ inspectionItem.setItemStatus(CommonConstant.STATUS_1);
+ }
+ inspectionItemService.updateById(inspectionItem);
+ return Result.ok("鎿嶄綔鎴愬姛锛�");
+ }
+
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param inspectionItem
+ * @param pageNo
+ * @param pageSize
+ * @param query
+ * @return
+ */
+ @ApiOperation(value="妫�楠岄」鐩�-鍒嗛〉鍒楄〃鏌ヨ", notes="妫�楠岄」鐩�-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/queryList")
+ public Result<?> queryList(InspectionItem inspectionItem,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ @RequestParam Map<String, String> query) {
+ IPage<Map<String, Object>> pageList = inspectionItemService.queryList(pageNo,pageSize, query);
+ 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