From 3bd07e5f90d5d832b8502252e1daebdd014320f8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 19 三月 2025 10:28:49 +0800
Subject: [PATCH] Merge branch 'front' into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java
index 6dd9f72..3a6d4e2 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java
@@ -1,9 +1,5 @@
package com.vincent.rsf.server.manager.controller;
-import cn.afterturn.easypoi.excel.ExcelImportUtil;
-import cn.afterturn.easypoi.excel.entity.ImportParams;
-import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
-import cn.afterturn.easypoi.excel.imports.ExcelImportService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
@@ -16,6 +12,7 @@
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.entity.Matnr;
+import com.vincent.rsf.server.manager.entity.excel.MatnrsTemplate;
import com.vincent.rsf.server.manager.service.MatnrService;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
@@ -28,6 +25,8 @@
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
import java.util.*;
@RestController
@@ -113,7 +112,6 @@
return R.ok().add(vos);
}
- @SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
@PreAuthorize("hasAuthority('manager:matnr:list')")
@ApiOperation(value = "鑾峰彇鍒嗙被鐗╂枡鏄庣粏鍒楄〃")
@PostMapping("/matnr/group")
@@ -133,21 +131,34 @@
}
@PreAuthorize("hasAuthority('manager:matnr:list')")
+ @ApiOperation("瀵煎嚭鐗╂枡淇℃伅")
@PostMapping("/matnr/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(matnrService.list(), Matnr.class), response);
+ List<Matnr> matnrs = new ArrayList<>();
+ if (!Objects.isNull(map.get("ids"))) {
+ matnrs = matnrService.list(new LambdaQueryWrapper<Matnr>().in(Matnr::getId, map.get("ids")).eq(Matnr::getStatus, 1));
+ } else {
+ matnrs = matnrService.list(new LambdaQueryWrapper<Matnr>().last("limit 1"));
+ }
+ ExcelUtil.build(ExcelUtil.create(matnrs, Matnr.class, true), response);
}
- @PreAuthorize("hasAuthority('manager:matnr:save')")
+ @PreAuthorize("hasAuthority('manager:matnr:list')")
+ @ApiOperation("涓嬭浇鐗╂枡妯℃澘")
+ @PostMapping("/matnr/template/download")
+ public void download(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ ExcelUtil.build(ExcelUtil.create(null, MatnrsTemplate.class, true), response);
+ }
+
+
+ @PreAuthorize("hasAuthority('manager:matnr:update')")
@ApiOperation(value = "excel琛ㄦ牸瀵煎叆鐗╂枡淇℃伅")
@PostMapping("/matnr/import")
- public R listImport(@RequestParam MultipartFile file) throws Exception {
+ public R listImport(MultipartFile file) throws Exception {
if (Objects.isNull(file)) {
throw new CoolException("鏂囦欢涓嶈兘涓虹┖锛侊紒");
}
- matnrService.importExcels(file);
-
- return R.ok();
+ return matnrService.importExcels(file);
}
}
--
Gitblit v1.9.1