From 2837bdd57f72e386bbf9a725e7b3a13e5eb9e930 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 21 八月 2023 09:19:57 +0800
Subject: [PATCH] 修复bug

---
 server/src/main/java/doumeemes/api/ext/SalaryParamExtController.java |   53 +++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/server/src/main/java/doumeemes/api/ext/SalaryParamExtController.java b/server/src/main/java/doumeemes/api/ext/SalaryParamExtController.java
index dbd285c..fc22dd3 100644
--- a/server/src/main/java/doumeemes/api/ext/SalaryParamExtController.java
+++ b/server/src/main/java/doumeemes/api/ext/SalaryParamExtController.java
@@ -7,15 +7,24 @@
 import doumeemes.core.model.PageData;
 import doumeemes.core.model.PageWrap;
 import doumeemes.dao.business.model.SalaryParam;
+import doumeemes.dao.business.vo.SalaryParamVO;
+import doumeemes.dao.ext.dto.SalaryParamDTO;
 import doumeemes.service.business.SalaryParamService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.multipart.commons.CommonsMultipartResolver;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 /**
@@ -33,7 +42,7 @@
     @PreventRepeat
     @ApiOperation("鏂板缓")
     @PostMapping("/create")
-    @RequiresPermissions("business:salaryparam:create")
+//    @RequiresPermissions("business:salaryparam:create")
     public ApiResponse create(@RequestBody SalaryParam salaryParam) {
         return ApiResponse.success(salaryParamService.create(salaryParam));
     }
@@ -67,18 +76,34 @@
         return ApiResponse.success(null);
     }
 
+    @ApiOperation("鏍规嵁瀵硅薄淇℃伅鏌ヨ")
+    @PostMapping("/queryOne")
+    @RequiresPermissions("business:salaryparam:query")
+    public ApiResponse<SalaryParam> queryOne(@RequestBody SalaryParam salaryParam) {
+        SalaryParam data = salaryParamService.findOne(salaryParam);
+        return ApiResponse.success(data);
+    }
+
     @ApiOperation("鍒嗛〉鏌ヨ")
     @PostMapping("/page")
     @RequiresPermissions("business:salaryparam:query")
-    public ApiResponse<PageData<SalaryParam>> findPage (@RequestBody PageWrap<SalaryParam> pageWrap) {
+    public ApiResponse<PageData<SalaryParamVO>> findPage (@RequestBody PageWrap<SalaryParamDTO> pageWrap) {
         return ApiResponse.success(salaryParamService.findPage(pageWrap));
+    }
+
+    @ApiOperation("鍒楄〃鏌ヨ")
+    @PostMapping("/queryList")
+    @RequiresPermissions("business:salaryparam:query")
+    public ApiResponse<List<SalaryParam>> queryList(@RequestBody SalaryParam salaryParam) {
+        List<SalaryParam> data = salaryParamService.findList(salaryParam);
+        return ApiResponse.success(data);
     }
 
     @ApiOperation("瀵煎嚭Excel")
     @PostMapping("/exportExcel")
     @RequiresPermissions("business:salaryparam:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<SalaryParam> pageWrap, HttpServletResponse response) {
-        ExcelExporter.build(SalaryParam.class).export(salaryParamService.findPage(pageWrap).getRecords(), "璁剧疆绫�-缁╂晥宸ヨ祫閰嶇疆琛�", response);
+    public void exportExcel (@RequestBody PageWrap<SalaryParamDTO> pageWrap, HttpServletResponse response) {
+        ExcelExporter.build(SalaryParamVO.class).export(salaryParamService.findPage(pageWrap).getRecords(), "璁剧疆绫�-缁╂晥宸ヨ祫閰嶇疆琛�", response);
     }
 
     @ApiOperation("鏍规嵁ID鏌ヨ")
@@ -87,4 +112,24 @@
     public ApiResponse findById(@PathVariable Integer id) {
         return ApiResponse.success(salaryParamService.findById(id));
     }
+
+    @ApiOperation(value = "鎵归噺瀵煎叆璁″垝", notes = "鎵归噺瀵煎叆璁″垝", httpMethod = "POST", position = 6)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "folder", value = "鏂囦欢澶�", required = true, paramType = "query", dataType = "String", dataTypeClass = String.class),
+    })
+    @PostMapping(value = "/importBatch", headers = "content-type=multipart/form-data")
+    @RequiresPermissions("business:salaryparam:create")
+    public ApiResponse importBatch(String folder, HttpServletRequest request, HttpServletResponse response) throws Exception {
+        CommonsMultipartResolver multipartResovler = new CommonsMultipartResolver();
+        if (multipartResovler.isMultipart(request)) {
+            MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+            Iterator<String> it = multipartRequest.getFileNames();
+            while (it.hasNext()) {
+                MultipartFile file = multipartRequest.getFile((String) it.next());
+                salaryParamService.importPlans(file);
+                break;
+            }
+        }
+        return ApiResponse.success( null);
+    }
 }

--
Gitblit v1.9.3