From 5d91a329768a2a86e01e4b9b6bc6a2b939b87adb Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期五, 16 一月 2026 22:48:51 +0800
Subject: [PATCH] 修改了对应代码
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java | 52 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 35 insertions(+), 17 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java
index 37b083b..9880289 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java
@@ -31,6 +31,7 @@
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.file.FileUploadUtils;
import com.ruoyi.common.utils.file.FileUtils;
import com.ruoyi.common.utils.poi.ExcelExp;
@@ -509,7 +510,29 @@
System.out.println(compName+"--+"+sh_person);
// pdfGenerateService.generateFileStyleInfo(pdf09Path, aIV.getRecordId(), id);
//鎷垮埌鐩稿叧鏁版嵁
- List<DocumentMaterialFileStyle> dmfs = documentMaterialsService.findFileStyleInfo(Math.toIntExact(id));
+ // List<DocumentMaterialFileStyle> dmfs = documentMaterialsService.findFileStyleInfo(Math.toIntExact(id));
+
+
+ List<DocumentMaterials> docAllInfo = documentMaterialsService.SelectAllRecordsByPageNumbersToList(id, archiveRecords.getPageCount());
+ if (docAllInfo==null||docAllInfo.isEmpty())
+ {
+ throw new RuntimeException("璇疯ˉ鍏呭畬鏁翠俊鎭紝鐒跺悗瀵煎嚭ISO鍖咃紒");
+ }
+ //鎶奃ocumentMaterils杞埌docs
+ // List<DocumentMaterialsVoLarge> docs = new ArrayList<>();
+ int texPages = 0;
+ int patPages = 0;
+ int picPages = 0;
+ for (DocumentMaterials mater : docAllInfo) {
+
+ if(mater.getFileStyle()!=null&&mater.getFileStyle().equals("鏂囧瓧鏉愭枡"))
+ texPages++;
+ if(mater.getFileStyle()!=null&&mater.getFileStyle().equals("鍥炬牱鏉愭枡"))
+ patPages++;
+ if(mater.getFileStyle()!=null&&mater.getFileStyle().equals("鐓х墖鏉愭枡"))
+ picPages++;
+ }
+
LocalDate currentDate = LocalDate.now();
@@ -518,21 +541,8 @@
HashMap<String, Object> hs = new HashMap<String, Object>();
int allPages = 0;
- int texPages = 0;
- int picPages = 0;
- int patPages = 0;
- if(!dmfs.isEmpty())
- {
- for(DocumentMaterialFileStyle documentMaterialFileStyle:dmfs)
- {
- if(documentMaterialFileStyle.getFileStyle()!=null&&documentMaterialFileStyle.getFileStyle().equals("鏂囧瓧鏉愭枡"))
- texPages = documentMaterialFileStyle.getCnt();
- if(documentMaterialFileStyle.getFileStyle()!=null&&documentMaterialFileStyle.getFileStyle().equals("鍥炬牱鏉愭枡"))
- patPages = documentMaterialFileStyle.getCnt();
- if(documentMaterialFileStyle.getFileStyle()!=null&&documentMaterialFileStyle.getFileStyle().equals("鐓х墖鏉愭枡"))
- picPages = documentMaterialFileStyle.getCnt();
- }
- }
+
+
allPages = texPages + picPages + patPages;
hs.put("pages", allPages);
hs.put("patPages", patPages);
@@ -597,16 +607,24 @@
@PostMapping("/exportJuan/{id}")
public void exportJuanInfo(HttpServletResponse response, @PathVariable Long id) throws IOException {
+ System.out.println("+++++++++++++aaaaaaaaaaaaaaaaaa");
ArchiveRecords archiveRecords = iArchiveRecordsService.selectArchiveRecordsById(id);
+ System.out.println("+++++++++++++aaaaaaaaaaaaaaaaaa");
+
if(archiveRecords.getPageCount()==null)
return;
List<DocumentMaterialsVo> dsvs = documentMaterialsService.findArchMInfo(id.toString(), archiveRecords.getPageCount());
+ System.out.println("+++++++++++++aaaaaaaaaaaaaaaaaa");
//鎷垮埌鍗峰唴鐩綍鐨別xcel
List<DocumentMaterialsVoSmall> list2 = dsvs.stream().map(res1 -> new DocumentMaterialsVoSmall(res1.getNum(), res1.getDocumentNumber(),res1.getCreator(),
res1.getTitle(), res1.getDate(), res1.getPageNumberFormatted(), res1.getRemarks())).collect(Collectors.toList());
+ System.out.println("+++++++++++++aaaaaaaaaaaaaaaaaa");
+
if(!dsvs.isEmpty()) {
+ System.out.println("+++++++++++++aaaaaaaaaaaaaaaaaa");
+
String recordId = dsvs.get(0).getRecordId();
byte[] imgr = barcodeService.generateBarcodeImage(recordId);
ExcelExp e1 = new ExcelExp("鍗峰唴鐩綍鏁版嵁", dsvs, DocumentMaterialsVo.class);
@@ -620,7 +638,7 @@
// System.out.println(dsvs);
// zos.putNextEntry(entr);
ByteOutputStream bos8 = new ByteOutputStream();
-
+ System.out.println("+++++++++++++aaaaaaaaaaaaaaaaaa");
util2.exportExcelManySheet(bos8, mysheet);
bos8.writeTo( response.getOutputStream());
--
Gitblit v1.9.1