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/resources/mapper/ProcessReportMapper.xml | 7 +------
cnas-process/src/main/resources/static/report-deal.docx | 0
cnas-process/src/main/java/com/ruoyi/process/service/ProcessReportService.java | 3 ++-
cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessReportServiceImpl.java | 30 +++---------------------------
cnas-process/src/main/java/com/ruoyi/process/controller/ProcessReportController.java | 7 ++-----
cnas-process/src/main/java/com/ruoyi/process/dto/ProcessReportDto.java | 3 ++-
cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessOrderDeviceMapper.java | 2 +-
cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessReportMapper.java | 2 +-
8 files changed, 12 insertions(+), 42 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessReportController.java b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessReportController.java
index 76a2db2..6476ac1 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessReportController.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/controller/ProcessReportController.java
@@ -64,11 +64,8 @@
@ApiOperation(value = "瀵煎嚭妫�楠屾姤鍛婂彂鏀剧櫥璁拌〃")
@GetMapping("/exportProcessReport")
- public void exportProcessReport(String ids, HttpServletResponse response) {
- List<Integer> list = Arrays.stream(ids.split(","))
- .map(Integer::parseInt)
- .collect(Collectors.toList());
- processReportService.exportProcessReport(list, response);
+ public void exportProcessReport(ProcessReportDto dto, HttpServletResponse response) {
+ processReportService.exportProcessReport(dto, response);
}
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/dto/ProcessReportDto.java b/cnas-process/src/main/java/com/ruoyi/process/dto/ProcessReportDto.java
index d54e1fd..ac66c6f 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/dto/ProcessReportDto.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/dto/ProcessReportDto.java
@@ -1,12 +1,13 @@
package com.ruoyi.process.dto;
+import com.ruoyi.process.pojo.ProcessReport;
import lombok.Data;
import java.util.List;
@Data
//瀵煎嚭
-public class ProcessReportDto {
+public class ProcessReportDto extends ProcessReport {
private List<Integer> ids;
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessOrderDeviceMapper.java b/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessOrderDeviceMapper.java
index 80e4b76..03a5302 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessOrderDeviceMapper.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessOrderDeviceMapper.java
@@ -21,7 +21,7 @@
Set<String> selectDeviceNumber(@Param("inspectionOrderId") Integer inspectionOrderId);
- List<Integer> selectDeviceIdsByNumbers(@Param("orderDeviceNumbers") Set<String> orderDeviceNumbers);
+ List<Integer> selectDeviceIdsByNumbers(@Param("deviceNumbers") Set<String> deviceNumbers);
IPage<ProcessOrderDevice> deviceRecordPage(@Param("deviceId") Integer deviceId, @Param("page") Page page, @Param("sampleCode") String sampleCode, @Param("managementNumber") String managementNumber);
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessReportMapper.java b/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessReportMapper.java
index 56d946b..7135d44 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessReportMapper.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessReportMapper.java
@@ -21,5 +21,5 @@
IPage<ProcessReport> pageProcessReport(Page page, @Param("ew") QueryWrapper<ProcessReport> queryWrappers);
- List<ProcessReport> getIds(@Param("ids") List<Integer> ids);
+ List<ProcessReport> exportProcessReport();
}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/ProcessReportService.java b/cnas-process/src/main/java/com/ruoyi/process/service/ProcessReportService.java
index 5ae2987..28b1f65 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/ProcessReportService.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/ProcessReportService.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.process.dto.ProcessReportDto;
import com.ruoyi.process.pojo.ProcessReport;
import javax.servlet.http.HttpServletResponse;
@@ -21,5 +22,5 @@
IPage<ProcessReport> pageProcessReport(Page page, ProcessReport processReport);
- void exportProcessReport(List<Integer> ids, HttpServletResponse response);
+ void exportProcessReport(ProcessReportDto dto, HttpServletResponse response);
}
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()
diff --git a/cnas-process/src/main/resources/mapper/ProcessReportMapper.xml b/cnas-process/src/main/resources/mapper/ProcessReportMapper.xml
index 8770f50..340e06c 100644
--- a/cnas-process/src/main/resources/mapper/ProcessReportMapper.xml
+++ b/cnas-process/src/main/resources/mapper/ProcessReportMapper.xml
@@ -27,16 +27,11 @@
${ew.customSqlSegment}
</if>
</select>
- <select id="getIds" resultType="com.ruoyi.process.pojo.ProcessReport">
+ <select id="exportProcessReport" resultType="com.ruoyi.process.pojo.ProcessReport">
select ROW_NUMBER() OVER (ORDER BY cpr.id) AS indexs,
cpr.* ,
u1.name sendUserName
from cnas_process_report cpr
left join user u1 on send_user=u1.id
- where 1=1
- and cpr.id in
- <foreach collection="ids" separator="," item="id" open="(" close=")">
- #{id}
- </foreach>
</select>
</mapper>
diff --git a/cnas-process/src/main/resources/static/report-deal.docx b/cnas-process/src/main/resources/static/report-deal.docx
index b3c8eb7..626da57 100644
--- a/cnas-process/src/main/resources/static/report-deal.docx
+++ b/cnas-process/src/main/resources/static/report-deal.docx
Binary files differ
--
Gitblit v1.9.3