From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:03:47 +0800
Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3
---
server/src/main/java/doumeemes/api/ext/UnqualifiedRecordExtController.java | 17 +++++++++++++++--
1 files changed, 15 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..dddd521 100644
--- a/server/src/main/java/doumeemes/api/ext/UnqualifiedRecordExtController.java
+++ b/server/src/main/java/doumeemes/api/ext/UnqualifiedRecordExtController.java
@@ -7,6 +7,7 @@
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 +16,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 +24,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,7 +35,7 @@
*/
@RestController
-@RequestMapping("/ext/unqualifiedRecord")
+@RequestMapping("/business/unqualifiedRecord")
@Api(tags = "宸ュ崟绫�-鎶ュ伐涓嶈壇璁板綍绫诲瀷琛�")
public class UnqualifiedRecordExtController extends BaseController {
@@ -40,14 +44,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