From fd58eac9c45b19300135d84b1d22013466807a96 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期日, 20 九月 2026 13:52:51 +0800
Subject: [PATCH] feat(inspect): 完善检验报告功能与数据处理 - 添加重新生成报告的功能接口 - 优化管理员权限判断逻辑，允许管理员查看全部待复核任务 - 改进Excel数据解析逻辑，支持合并单元格的坐标计算 - 完善直绑模板订单的检验结果处理机制 - 优化报告下载接口，支持按报告类型选择 - 提升附件上传大小限制至200MB
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java | 87 +++++++++++++++++++++++++++++--------------
1 files changed, 58 insertions(+), 29 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java
index 614153a..48d4063 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java
@@ -86,6 +86,9 @@
@Slf4j
public class InsReportServiceImpl extends ServiceImpl<InsReportMapper, InsReport>
implements InsReportService {
+ private static final int DETECTION_REPORT = 0;
+ private static final int INSPECTION_REPORT = 1;
+
@Resource
private UserMapper userMapper;
@Resource
@@ -209,30 +212,30 @@
info.setViewStatus(false);
info.setJumpPath(MenuJumpPathConstants.REPORT_PREPARATION);
informationNotificationService.addInformationNotification(info);
- //绯荤粺鐢熸垚鎶ュ憡鍦板潃
- String url = insReport.getUrl();
- //鎵嬪姩涓婁紶鎶ュ憡鍦板潃
- String urlS = insReport.getUrlS();
+ String primaryReportUrl = getPrimaryReportUrl(insReport);
// 鍒ゆ柇鏄惁鏄師鏉愭枡 闇�瑕佹浛鎹�****鎴愪緵搴斿晢
IfsInventoryQuantity one = ifsInventoryQuantityMapper.selectOne(new LambdaQueryWrapper<IfsInventoryQuantity>()
.eq(IfsInventoryQuantity::getId, order.getIfsInventoryId()));
if (one != null) {
if (isRawMater && order.getOrderType().equals(InsOrderTypeConstants.ENTER_THE_FACTORY)) {
- changeText(new HashMap<String, String>() {{
- put("**********", one.getSupplierName());
- }}, (StrUtil.isBlank(urlS) ? url : urlS).replace("/word", wordUrl));
+ for (String reportUrl : getApprovalReportUrls(insReport)) {
+ changeText(new HashMap<String, String>() {{
+ put("**********", one.getSupplierName());
+ }}, reportUrl.replace("/word", wordUrl));
+ }
}
}
- wordInsertUrl(new HashMap<String, Object>() {{
+ Map<String, Object> writeMarks = new HashMap<String, Object>() {{
put("writeUrl", Pictures.ofLocal(imgUrl + "/" + signatureUrl).create());
put("writeDateUrl", Pictures.ofStream(DateImageUtil.createDateImage(null)).create());
put("insUrl", Pictures.ofLocal(imgUrl + "/" + signatureUrl).create());
- }}, (StrUtil.isBlank(urlS) ? url : urlS).replace("/word", wordUrl));
+ }};
+ writeMarksToReportFiles(insReport, writeMarks);
// 淇敼涓存椂pdf
- String tempUrlPdf = wordToPdfTemp((StrUtil.isBlank(urlS) ? url : urlS).replace("/word", wordUrl));
+ String tempUrlPdf = wordToPdfTemp(primaryReportUrl.replace("/word", wordUrl));
insReport.setTempUrlPdf("/word/" + tempUrlPdf);
insReportMapper.updateById(insReport);
@@ -330,17 +333,15 @@
info.setViewStatus(false);
info.setJumpPath(MenuJumpPathConstants.REPORT_PREPARATION);
informationNotificationService.addInformationNotification(info);
- //绯荤粺鐢熸垚鎶ュ憡鍦板潃
- String url = insReport.getUrl();
- //鎵嬪姩涓婁紶鎶ュ憡鍦板潃
- String urlS = insReport.getUrlS();
- wordInsertUrl(new HashMap<String, Object>() {{
+ String primaryReportUrl = getPrimaryReportUrl(insReport);
+ Map<String, Object> examineMarks = new HashMap<String, Object>() {{
put("examineUrl", Pictures.ofLocal(imgUrl + "/" + signatureUrl).create());
put("examineDateUrl", Pictures.ofStream(DateImageUtil.createDateImage(null)).create());
- }}, (StrUtil.isBlank(urlS) ? url : urlS).replace("/word", wordUrl));
+ }};
+ writeMarksToReportFiles(insReport, examineMarks);
// 淇敼涓存椂pdf
- String tempUrlPdf = wordToPdfTemp((StrUtil.isBlank(urlS) ? url : urlS).replace("/word", wordUrl));
+ String tempUrlPdf = wordToPdfTemp(primaryReportUrl.replace("/word", wordUrl));
insReport.setTempUrlPdf("/word/" + tempUrlPdf);
// 鍙戦�佷紒涓氬井淇￠�氱煡(閫氱煡鎵瑰噯浜哄鎵�)
@@ -473,28 +474,29 @@
if (StringUtils.isBlank(sealUrl)) {
throw new ErrorException(laboratory + "鎵句笉鍒版姤鍛婁笓鐢ㄧ珷");
}
- //绯荤粺鐢熸垚鎶ュ憡鍦板潃
- String url = insReport.getUrl();
- //鎵嬪姩涓婁紶鎶ュ憡鍦板潃
- String urlS = insReport.getUrlS();
- String finalUrl = (StrUtil.isBlank(urlS) ? url : urlS).replace("/word", wordUrl);
+ String primaryReportUrl = getPrimaryReportUrl(insReport);
+ String finalUrl = primaryReportUrl.replace("/word", wordUrl);
- wordInsertUrl(new HashMap<String, Object>() {{
+ Map<String, Object> ratifyMarks = new HashMap<String, Object>() {{
put("ratifyUrl", Pictures.ofLocal(imgUrl + "/" + signatureUrl).create());
put("ratifyDateUrl", Pictures.ofStream(DateImageUtil.createDateImage(null)).create());
put("seal1", Pictures.ofLocal(imgUrl + "/" + sealUrl).create());
put("seal2", Pictures.ofLocal(imgUrl + "/" + sealUrl).create());
- }}, finalUrl);
+ }};
+ writeMarksToReportFiles(insReport, ratifyMarks);
// 淇敼涓存椂pdf
- insReport.setTempUrlPdf((StrUtil.isBlank(urlS) ? url : urlS).replace(".docx", ".pdf"));
+ insReport.setTempUrlPdf(primaryReportUrl.replace(".docx", ".pdf"));
InsOrder insOrder = new InsOrder();
insOrder.setId(insOrderId);
insOrder.setState(4);
insOrderMapper.updateById(insOrder);
- wordToPdf(finalUrl, sealUrl, isRawMater && order.getOrderType().equals(InsOrderTypeConstants.ENTER_THE_FACTORY));
+ for (String reportUrl : getApprovalReportUrls(insReport)) {
+ wordToPdf(reportUrl.replace("/word", wordUrl), sealUrl,
+ isRawMater && order.getOrderType().equals(InsOrderTypeConstants.ENTER_THE_FACTORY));
+ }
// 鍒ゆ柇鏄惁涓哄師鏉愭枡
if (isRawMater) {
@@ -537,6 +539,27 @@
return 1;
}
+ private String getPrimaryReportUrl(InsReport report) {
+ String reportUrl = StringUtils.isNotBlank(report.getUrlS()) ? report.getUrlS() : report.getUrl();
+ if (StringUtils.isBlank(reportUrl)) {
+ throw new ErrorException("妫�娴嬫姤鍛婃枃浠朵笉瀛樺湪");
+ }
+ return reportUrl;
+ }
+
+ private List<String> getApprovalReportUrls(InsReport report) {
+ return Arrays.asList(getPrimaryReportUrl(report), report.getInspectionUrl()).stream()
+ .filter(StringUtils::isNotBlank)
+ .distinct()
+ .collect(Collectors.toList());
+ }
+
+ private void writeMarksToReportFiles(InsReport report, Map<String, Object> marks) {
+ for (String reportUrl : getApprovalReportUrls(report)) {
+ wordInsertUrl(marks, reportUrl.replace("/word", wordUrl));
+ }
+ }
+
//鎶ュ憡鎵归噺涓嬭浇
@Override
@@ -577,17 +600,23 @@
}
@Override
- public void download(Integer id, Integer createOrderUser, HttpServletResponse response) {
+ public void download(Integer id, Integer reportType, Integer createOrderUser, HttpServletResponse response) {
if (id == null) {
throw new ErrorException("鎶ュ憡涓嶈兘涓虹┖");
+ }
+ reportType = reportType == null ? DETECTION_REPORT : reportType;
+ if (!Objects.equals(reportType, DETECTION_REPORT) && !Objects.equals(reportType, INSPECTION_REPORT)) {
+ throw new ErrorException("鎶ュ憡绫诲瀷涓嶆纭�");
}
InsReport report = insReportMapper.selectDownloadableReport(id, createOrderUser);
if (report == null) {
throw new ErrorException("鎶ュ憡涓嶅瓨鍦ㄣ�佸皻鏈敓鎴愭垨鏃犳潈涓嬭浇");
}
- String reportUrl = StringUtils.isNotBlank(report.getUrlS()) ? report.getUrlS() : report.getUrl();
+ String reportUrl = Objects.equals(reportType, INSPECTION_REPORT)
+ ? report.getInspectionUrl() : getPrimaryReportUrl(report);
if (StringUtils.isBlank(reportUrl) || !reportUrl.replace('\\', '/').startsWith("/word/")) {
- throw new ErrorException("鎶ュ憡鏂囦欢涓嶅瓨鍦紝璇疯仈绯荤鐞嗗憳");
+ throw new ErrorException((Objects.equals(reportType, INSPECTION_REPORT) ? "妫�楠屾姤鍛�" : "妫�娴嬫姤鍛�")
+ + "鏂囦欢涓嶅瓨鍦紝璇疯仈绯荤鐞嗗憳");
}
Path root = Paths.get(wordUrl).toAbsolutePath().normalize();
Path file = root.resolve(reportUrl.replace('\\', '/').substring("/word/".length())).normalize();
--
Gitblit v1.9.3