From 99a70ee7a13720d9076289066828757cf9b4cffd Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期一, 10 三月 2025 09:41:31 +0800
Subject: [PATCH] 修改报告编制查询
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 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 a76f10e..d3f6238 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
@@ -84,7 +84,7 @@
private String wordUrl;
@Value("${file.path}")
private String imgUrl;
-
+
@Resource
private InsOrderMapper insOrderMapper;
@Resource
@@ -118,7 +118,7 @@
reportPageDto.setQueryStatus(null);
map.put("body", insReportMapper.pageInsReport(page,
- QueryWrappers.queryWrappers(reportPageDto),
+ QueryWrappers.queryWrappers(reportPageDto).orderByDesc("code"),
laboratory,
SecurityUtils.getUserId().intValue(),
queryStatus,
@@ -537,6 +537,11 @@
}
// 鍘嬬缉涓存椂鏂囦欢澶�
zipFilePath = wordUrl + "/zip/output.zip";
+ // 鍒ゆ柇zip璺緞鏄惁瀛樺湪
+ File zipDir = new File(wordUrl + "/zip");
+ if(!zipDir.isDirectory()){
+ zipDir.mkdirs();
+ }
zipDirectory(tempFolderPath, zipFilePath);
// 娓呯悊涓存椂鏂囦欢澶�
--
Gitblit v1.9.3