From b721f0484f74bb5797a6d4c25fa2d49e78e199f4 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 24 四月 2025 15:39:07 +0800
Subject: [PATCH] 报告结果导出调整
---
cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessReportServiceImpl.java | 30 +++---------------------------
1 files changed, 3 insertions(+), 27 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessReportServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessReportServiceImpl.java
index a92b478..35ccbc6 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessReportServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessReportServiceImpl.java
@@ -15,6 +15,7 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
+import com.ruoyi.process.dto.ProcessReportDto;
import com.ruoyi.process.mapper.ProcessReportMapper;
import com.ruoyi.process.pojo.ProcessReport;
import com.ruoyi.process.service.ProcessReportService;
@@ -53,44 +54,19 @@
@Resource
private ProcessReportMapper processReportMapper;
-
- @Value("${wordUrl}")
- private String wordUrl;
-
@Resource
private UserMapper userMapper;
@Override
public IPage<ProcessReport> pageProcessReport(Page page, ProcessReport processReport) {
- //todo 浠呯湅鎴�
IPage<ProcessReport> processReportIPage = processReportMapper.pageProcessReport(page, QueryWrappers.queryWrappers(processReport));
-// for (ProcessReport record : processReportIPage.getRecords()) {
-// List<String> name = new ArrayList<>();
-// for (String s : record.getSignatory().split(",")) {
-// User user = userMapper.selectById(Integer.parseInt(s));
-// name.add(user.getName());
-// }
-// String signatoryName = name.stream().collect(Collectors.joining(","));
-// record.setSignatoryName(signatoryName);
-// }
return processReportIPage;
}
@Override
- public void exportProcessReport(List<Integer> ids, HttpServletResponse response) {
- List<ProcessReport> processReports = processReportMapper.getIds(ids);
-// for (ProcessReport record : processReports) {
-// List<String> name = new ArrayList<>();
-// if(StringUtils.isNotBlank(record.getSignatory())){
-// for (String s : record.getSignatory().split(",")) {
-// User user = userMapper.selectById(Integer.parseInt(s));
-// name.add(user.getName());
-// }
-// String signatoryName = name.stream().collect(Collectors.joining(","));
-// record.setSignatoryName(signatoryName);
-// }
-// }
+ public void exportProcessReport(ProcessReportDto dto, HttpServletResponse response) {
+ List<ProcessReport> processReports = processReportMapper.exportProcessReport();
// 鑾峰彇璺緞
InputStream inputStream = this.getClass().getResourceAsStream("/static/report-deal.docx");
Configure configure = Configure.builder()
--
Gitblit v1.9.3