From cbd9d387ee7f43ff692ac1b719b8db996240f095 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 20 二月 2025 13:25:38 +0800
Subject: [PATCH] 零件号绑定样品查询修改
---
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageControlPlanListController.java | 48 ++++++++++++++++++++++++++----------------------
1 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageControlPlanListController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageControlPlanListController.java
index 016a70b..55a714e 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageControlPlanListController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageControlPlanListController.java
@@ -1,25 +1,22 @@
package com.ruoyi.manage.controller;
import com.alibaba.excel.EasyExcel;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.alibaba.excel.read.listener.PageReadListener;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.manage.annotation.ValueAuth;
-import com.ruoyi.manage.annotation.ValueClassify;
-
-
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.manage.pojo.ManageControlPlanList;
import com.ruoyi.manage.service.ManageControlPlanListService;
-import com.ruoyi.manage.utils.MyUtil;
import com.ruoyi.manage.vo.ManageControlPlanListVo;
-import com.ruoyi.manage.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
@@ -42,18 +39,14 @@
@Resource
private ManageControlPlanListService manageControlPlanListService;
- @Autowired
-
- @ValueClassify(value = "閲嶅ぇ椋庨櫓鍥犵礌鍒嗘瀽鍙婃帶鍒惰鍒掓竻鍗�")
+
@ApiOperation(value = "鍒嗛〉鏌ヨ")
@GetMapping("/getPageList")
- public Result<IPage<ManageControlPlanListVo>> getPageList(Page page){
- IPage<ManageControlPlanListVo> ipage = manageControlPlanListService.getPageList(page);
- return Result.success(ipage);
+ public Result<IPage<ManageControlPlanListVo>> getPageList(Page page) {
+ return Result.success(manageControlPlanListService.getPageList(page));
}
- @ValueClassify(value = "閲嶅ぇ椋庨櫓鍥犵礌鍒嗘瀽鍙婃帶鍒惰鍒掓竻鍗�")
@ApiOperation(value = "鎵瑰噯")
@GetMapping("/approvalOfControlPlanChecklist")
public Result<?> approvalOfControlPlanChecklist(Integer approve, Integer status){
@@ -64,7 +57,6 @@
return Result.success();
}
- @ValueClassify(value = "閲嶅ぇ椋庨櫓鍥犵礌鍒嗘瀽鍙婃帶鍒惰鍒掓竻鍗�")
@ApiOperation(value = "瀹℃壒")
@GetMapping("/riskAnalysisApprovalOfControlPlanChecklist")
public Result<?> riskAnalysisApprovalOfControlPlanChecklist(Integer approval, Integer status){
@@ -75,11 +67,9 @@
return Result.success();
}
- @ValueClassify(value = "閲嶅ぇ椋庨櫓鍥犵礌鍒嗘瀽鍙婃帶鍒惰鍒掓竻鍗�")
- @ApiOperation(value = "瀵煎叆")
@PostMapping("/importControlPlanList")
public void importControlPlanList(MultipartFile file) throws IOException {
- boolean excelFile = MyUtil.isExcelFile(file);
+ boolean excelFile = isExcelFile(file);
if (!excelFile) {
throw new ErrorException("璇峰鍏xcel鏂囦欢锛�");
}
@@ -95,7 +85,6 @@
})).sheet().doRead();
}
- @ValueClassify(value = "閲嶅ぇ椋庨櫓鍥犵礌鍒嗘瀽鍙婃帶鍒惰鍒掓竻鍗�")
@ApiOperation(value = "鏂板")
@PostMapping("/analysisOfMajorRiskFactorsAdded")
public void analysisOfMajorRiskFactorsAdded(@RequestBody ManageControlPlanList manageControlPlanList) throws IOException {
@@ -105,7 +94,6 @@
manageControlPlanListService.saveOrUpdate(manageControlPlanList);
}
- @ValueClassify(value = "閲嶅ぇ椋庨櫓鍥犵礌鍒嗘瀽鍙婃帶鍒惰鍒掓竻鍗�")
@ApiOperation(value = "鍒犻櫎")
@GetMapping("/deleteSignificantRiskFactorAnalysis")
public void deleteSignificantRiskFactorAnalysis(Integer id) throws IOException {
@@ -116,10 +104,26 @@
*
* @return
*/
- @ValueAuth
+
@ApiOperation(value = "閲嶅ぇ椋庨櫓鍥犵礌鍒嗘瀽鍙婃帶鍒惰鍒掓竻鍗�")
@GetMapping("/exportSignificantRiskFactors")
public void exportSignificantRiskFactors(HttpServletResponse response){
manageControlPlanListService.exportPersonTraining(response);
}
+
+ public static boolean isExcelFile(MultipartFile file) {
+ if (file.isEmpty()) {
+ return false;
+ }
+ String originalFilename = file.getOriginalFilename();
+ if (originalFilename == null) {
+ return false;
+ }
+ String[] parts = originalFilename.split("\\.");
+ if (parts.length == 0) {
+ return false;
+ }
+ String fileExtension = parts[parts.length - 1].toLowerCase();
+ return fileExtension.equals("xls") || fileExtension.equals("xlsx");
+ }
}
--
Gitblit v1.9.3