From 64b432916af9c9218ab3f3eca614e26c542142ae Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 07 十一月 2023 15:47:13 +0800
Subject: [PATCH] bug

---
 server/src/main/java/doumeemes/api/ext/UnqualifiedRecordExtController.java |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/server/src/main/java/doumeemes/api/ext/UnqualifiedRecordExtController.java b/server/src/main/java/doumeemes/api/ext/UnqualifiedRecordExtController.java
index 6d573c2..e0338ab 100644
--- a/server/src/main/java/doumeemes/api/ext/UnqualifiedRecordExtController.java
+++ b/server/src/main/java/doumeemes/api/ext/UnqualifiedRecordExtController.java
@@ -2,11 +2,13 @@
 
 import doumeemes.api.BaseController;
 import doumeemes.core.annotation.excel.ExcelExporter;
+import doumeemes.core.annotation.trace.Trace;
 import doumeemes.core.model.ApiResponse;
 import doumeemes.core.model.PageData;
 import doumeemes.core.model.PageWrap;
 import doumeemes.core.utils.DateUtil;
 import doumeemes.dao.business.model.UnqualifiedRecord;
+import doumeemes.dao.business.vo.UnqualifiedRecordVO;
 import doumeemes.dao.business.vo.WorkPlansVO;
 import doumeemes.dao.ext.dto.QueryUnQualifiedRecordDTO;
 import doumeemes.dao.ext.dto.QueryWorkPlansDTO;
@@ -15,6 +17,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -22,6 +25,8 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Created by IntelliJ IDEA.
@@ -31,8 +36,9 @@
  */
 
 @RestController
-@RequestMapping("/ext/unqualifiedRecord")
+@RequestMapping("/business/unqualifiedRecord")
 @Api(tags = "宸ュ崟绫�-鎶ュ伐涓嶈壇璁板綍绫诲瀷琛�")
+@Trace(withRequestResult = false,withRequestParameters = false)
 public class UnqualifiedRecordExtController  extends BaseController {
 
     @Autowired
@@ -40,14 +46,23 @@
 
     @ApiOperation("鍒嗛〉鏌ヨ")
     @PostMapping("/page")
+    @RequiresPermissions("business:unqualifiedRecord:create")
     public ApiResponse<PageData<UnqualifiedRecord>> findJoinPage (@RequestBody PageWrap<QueryUnQualifiedRecordDTO> pageWrap) {
         return ApiResponse.success(unqualifiedRecordService.findJoinPage(pageWrap));
     }
 
     @ApiOperation("瀵煎嚭Excel")
     @PostMapping("/exportExcel")
+    @RequiresPermissions("business:unqualifiedRecord:exportExcel")
     public void exportExcel (@RequestBody PageWrap<QueryUnQualifiedRecordDTO> pageWrap, HttpServletResponse response) throws Exception{
-        ExcelExporter.build(UnqualifiedRecord.class).export(unqualifiedRecordService.findJoinPage(pageWrap).getRecords(), "涓嶈壇浜у嚭鏄庣粏璁板綍"+ DateUtil.getNowLongTime(), response);
+        List<UnqualifiedRecord> list  = unqualifiedRecordService.findJoinPage(pageWrap).getRecords();
+        List<UnqualifiedRecordVO> voList = new ArrayList<>();
+        list.forEach(i->{
+            UnqualifiedRecordVO unqualifiedRecordVO = new UnqualifiedRecordVO();
+            BeanUtils.copyProperties(i,unqualifiedRecordVO);
+            voList.add(unqualifiedRecordVO);
+        });
+        ExcelExporter.build(UnqualifiedRecordVO.class).export(voList, "涓嶈壇浜у嚭鏄庣粏璁板綍"+ DateUtil.getNowLongTime(), response);
     }
 
 }

--
Gitblit v1.9.3