From 5de5db24efe1b25896c37f395124a207584bcb38 Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期四, 01 一月 2026 21:25:54 +0800
Subject: [PATCH] 修改了对应代码

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/archiveAllExportController.java |  166 ++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 152 insertions(+), 14 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/archiveAllExportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/archiveAllExportController.java
index 59a8c6f..1c42d4a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/archiveAllExportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/archiveAllExportController.java
@@ -1,16 +1,21 @@
 package com.ruoyi.web.controller.archive;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import com.aspose.cells.PdfCompliance;
 import com.aspose.words.License;
 import com.deepoove.poi.XWPFTemplate;
 import com.itextpdf.text.*;
 import com.itextpdf.text.pdf.PdfPCell;
 import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.FileUtils;
 import com.ruoyi.common.utils.poi.*;
+import com.ruoyi.domain.ArchiveProjectName;
 import com.ruoyi.domain.ArchiveRecords;
 import com.ruoyi.domain.DocumentMaterials;
 import com.ruoyi.domain.vo.*;
+import com.ruoyi.service.IArchiveProjectNameService;
 import com.ruoyi.service.IArchiveRecordsService;
 import com.ruoyi.service.IDocumentMaterialsService;
 import com.ruoyi.service.impl.BarcodeService;
@@ -53,7 +58,8 @@
     private BarcodeService barcodeService;
     @Autowired
     private IDocumentMaterialsService documentMaterialsService;
-
+    @Autowired
+    private IArchiveProjectNameService iArchiveProjectNameService;
     @Autowired
     private IArchiveRecordsService iArchiveRecordsService;
 
@@ -328,9 +334,33 @@
         List<ArchiveInfoVo> arsi = new ArrayList<>();
         arsi.add(aIV);
 
+
+
+        String date = "";
+        if(arsi.get(0).getPreparationDate()!=null) {
+            System.out.println(arsi.get(0).getPreparationDate().toString() + "]]]]]]]]");
+
+            System.out.println(DateUtil.parseCST(arsi.get(0).getPreparationDate().toString()));
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            DateTime dat = DateUtil.parseCST(arsi.get(0).getPreparationDate().toString());
+            date = new SimpleDateFormat("yyyy-MM-dd").format(dat);
+        }
+
+
+        String tmpSec = "妗e彿:" +
+                arsi.get(0).getRecordId() +
+                ";妗f棣嗭紙瀹わ級鍙�:" + arsi.get(0).getArchiveRoomNumber()+
+                ";缂╁井鍙�:" + arsi.get(0).getMicrofilmNumber()+
+                ";鍙戞枃鍙�:" + arsi.get(0).getInquiryNumber()+
+                ";妗堝嵎棰樺悕:" + arsi.get(0).getCaseTitle() +
+                ";缂栧埗鏃ユ湡:" +  date +
+                ";缂栧埗鍗曚綅:" + arsi.get(0).getPreparationUnit() +
+                ";淇濈鏈熼檺:" + arsi.get(0).getRetentionPeriod() +
+                ";瀵嗙骇:" + arsi.get(0).getSecurityClassification();
+
         String recordId = aIV.getRecordId();
         byte[] imgr = barcodeService.generateBarcodeImage(recordId);
-        byte[] sedcode = pdfGenerateService.createQrCodeN(recordId, 100, 100);
+        byte[] sedcode = pdfGenerateService.createQrCodeN(tmpSec, 100, 100);
         ExcelExp e1 = new ExcelExp("妗堝嵎灏侀潰鏁版嵁",arsi, ArchiveInfoVo.class);
         ExcelExp e2 = new ExcelExp("妗堝嵎灏侀潰",  arsi, recordId, imgr,sedcode, ArchiveInfoVo.class);
         List<ExcelExp> mysheet = new ArrayList<ExcelExp>();
@@ -569,12 +599,33 @@
                             picPages = documentMaterialFileStyle.getCnt();
                     }
                 }
+
+
+                String compName = "骞垮窞鐩堝妗f绠$悊鏈夐檺鍏徃";
+                String li_person = "浠囩縺";
+                String sh_person = "鏇剧憺鑾�";
+                ArchiveRecords archiveRecords1 = iArchiveRecordsService.selectArchiveRecordsById(ids[i]);
+                if(!StringUtils.isEmpty(archiveRecords1.getLiPerson()))
+                    li_person = archiveRecords1.getLiPerson();
+                ArchiveProjectName tmp = new ArchiveProjectName();
+                tmp.setName(archiveRecords1.getProjectName());
+                List<ArchiveProjectName> projectName = iArchiveProjectNameService.selectArchiveProjectNameList(tmp);
+                if(!projectName.isEmpty())
+                {
+                    if(!StringUtils.isEmpty(projectName.get(0).getCompanyName()))
+                        compName = projectName.get(0).getCompanyName();
+                    if(!StringUtils.isEmpty(projectName.get(0).getCreatePerson()))
+                        sh_person = projectName.get(0).getCreatePerson();
+                }
                 allPages = texPages + picPages + patPages;
                 hs.put("pages", allPages);
                 hs.put("patPages", patPages);
                 hs.put("picPages", picPages);
                 hs.put("texPages", texPages);
                 hs.put("volumeNumber", aIV.getRecordId());
+                hs.put("company", compName);
+                hs.put("liPerson", li_person);
+                hs.put("shPerson", sh_person);
                 hs.put("time", cdt);
 
                 if (!getLicense()) {
@@ -584,10 +635,16 @@
 
                 try {
 
-                    // 鑾峰彇 Word 妯℃澘鎵�鍦ㄨ矾寰�
-                    String filepath = "09-澶囪�冭〃.docx";
+                    ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
+                    org.springframework.core.io.Resource resource = resolver.getResource("classpath:09.docx");
+//                String filepath = resource.getFile().getAbsolutePath();
+//                // 閫氳繃 XWPFTemplate 缂栬瘧鏂囦欢骞舵覆鏌撴暟鎹埌妯℃澘涓�
+//                XWPFTemplate template = XWPFTemplate.compile(filepath).render(hs
+//                       );
+
+                    InputStream inputStream = resource.getInputStream();
                     // 閫氳繃 XWPFTemplate 缂栬瘧鏂囦欢骞舵覆鏌撴暟鎹埌妯℃澘涓�
-                    XWPFTemplate template = XWPFTemplate.compile(filepath).render(hs
+                    XWPFTemplate template = XWPFTemplate.compile(inputStream).render(hs
                     );
 
                     String renderedDocPath = "rendered_output.docx";
@@ -629,9 +686,33 @@
                 List<ArchiveInfoVo> arsi = new ArrayList<>();
                 arsi.add(aIV);
 
+                String dates = "";
+                if(arsi.get(0).getPreparationDate()!=null) {
+                    System.out.println(arsi.get(0).getPreparationDate().toString() + "]]]]]]]]");
+
+                    System.out.println(DateUtil.parseCST(arsi.get(0).getPreparationDate().toString()));
+                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                    DateTime dat = DateUtil.parseCST(arsi.get(0).getPreparationDate().toString());
+                    dates = new SimpleDateFormat("yyyy-MM-dd").format(dat);
+                }
+
+
+                String tmpSec = "妗e彿:" +
+                        arsi.get(0).getRecordId() +
+                        ";妗f棣嗭紙瀹わ級鍙�:" + arsi.get(0).getArchiveRoomNumber()+
+                        ";缂╁井鍙�:" + arsi.get(0).getMicrofilmNumber()+
+                        ";鍙戞枃鍙�:" + arsi.get(0).getInquiryNumber()+
+                        ";妗堝嵎棰樺悕:" + arsi.get(0).getCaseTitle() +
+                        ";缂栧埗鏃ユ湡:" +  dates +
+                        ";缂栧埗鍗曚綅:" + arsi.get(0).getPreparationUnit() +
+                        ";淇濈鏈熼檺:" + arsi.get(0).getRetentionPeriod() +
+                        ";瀵嗙骇:" + arsi.get(0).getSecurityClassification();
+
+
+
                 String recordId1 = aIV.getRecordId();
                 byte[] imgr1 = barcodeService.generateBarcodeImage(recordId1);
-                byte[] sedcode = pdfGenerateService.createQrCodeN(recordId1, 200, 200);
+                byte[] sedcode = pdfGenerateService.createQrCodeN(tmpSec, 200, 200);
                 ExcelExp e3 = new ExcelExp("妗堝嵎灏侀潰鏁版嵁",arsi, ArchiveInfoVo.class);
                 ExcelExp e4 = new ExcelExp("妗堝嵎灏侀潰",  arsi, recordId1, imgr1,sedcode, ArchiveInfoVo.class);
                 List<ExcelExp> mysheet1 = new ArrayList<ExcelExp>();
@@ -726,7 +807,7 @@
 
                 //鎷垮埌鍗峰唴鐩綍鐨別xcel
                 List<DocumentMaterialsVoSmall> list2 = dsvs.stream().map(res1 -> new DocumentMaterialsVoSmall(res1.getNum(), res1.getDocumentNumber(),res1.getCreator(),
-                        res1.getTitle(), res1.getDate(), res1.getPageNumber(), res1.getRemarks())).collect(Collectors.toList());
+                        res1.getTitle(), res1.getDate(), res1.getPageNumberFormatted(), res1.getRemarks())).collect(Collectors.toList());
                 if(!dsvs.isEmpty()) {
                     String recordId = dsvs.get(0).getRecordId();
                     byte[] imgr = barcodeService.generateBarcodeImage(recordId);
@@ -1097,12 +1178,33 @@
                         picPages = documentMaterialFileStyle.getCnt();
                 }
             }
+
+            String compName = "骞垮窞鐩堝妗f绠$悊鏈夐檺鍏徃";
+            String li_person = "浠囩縺";
+            String sh_person = "鏇剧憺鑾�";
+            ArchiveRecords archiveRecords = iArchiveRecordsService.selectArchiveRecordsById(id);
+            if(!StringUtils.isEmpty(archiveRecords.getLiPerson()))
+                li_person = archiveRecords.getLiPerson();
+            ArchiveProjectName tmp = new ArchiveProjectName();
+            tmp.setName(archiveRecords.getProjectName());
+            List<ArchiveProjectName> projectName = iArchiveProjectNameService.selectArchiveProjectNameList(tmp);
+            if(!projectName.isEmpty())
+            {
+                if(!StringUtils.isEmpty(projectName.get(0).getCompanyName()))
+                    compName = projectName.get(0).getCompanyName();
+                if(!StringUtils.isEmpty(projectName.get(0).getCreatePerson()))
+                    sh_person = projectName.get(0).getCreatePerson();
+            }
+
             allPages = texPages + picPages + patPages;
             hs.put("pages", allPages);
             hs.put("patPages", patPages);
             hs.put("picPages", picPages);
             hs.put("texPages", texPages);
             hs.put("volumeNumber", aIV.getRecordId());
+            hs.put("company", compName);
+            hs.put("liPerson", li_person);
+            hs.put("shPerson", sh_person);
             hs.put("time", cdt);
 
             if (!getLicense()) {
@@ -1113,10 +1215,22 @@
             try {
 
                 // 鑾峰彇 Word 妯℃澘鎵�鍦ㄨ矾寰�
-                String filepath = "09-澶囪�冭〃.docx";
-                // 閫氳繃 XWPFTemplate 缂栬瘧鏂囦欢骞舵覆鏌撴暟鎹埌妯℃澘涓�
-                XWPFTemplate template = XWPFTemplate.compile(filepath).render(hs
-                       );
+                ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
+                org.springframework.core.io.Resource resource = resolver.getResource("classpath:09.docx");
+//                String filepath = resource.getFile().getAbsolutePath();
+//                // 閫氳繃 XWPFTemplate 缂栬瘧鏂囦欢骞舵覆鏌撴暟鎹埌妯℃澘涓�
+//                XWPFTemplate template = XWPFTemplate.compile(filepath).render(hs
+//                       );
+
+                InputStream inputStream = resource.getInputStream();
+                    // 閫氳繃 XWPFTemplate 缂栬瘧鏂囦欢骞舵覆鏌撴暟鎹埌妯℃澘涓�
+                    XWPFTemplate template = XWPFTemplate.compile(inputStream).render(hs
+                    );
+
+
+
+
+
 
                 String renderedDocPath = "rendered_output.docx";
                 File renderedFile = new File(renderedDocPath);
@@ -1148,7 +1262,7 @@
 
 
 
-            com.aspose.words.Document doc = new com.aspose.words.Document("09-澶囪�冭〃.docx");
+           // com.aspose.words.Document doc = new com.aspose.words.Document("09.docx");
 
 
 
@@ -1177,9 +1291,33 @@
             List<ArchiveInfoVo> arsi = new ArrayList<>();
             arsi.add(aIV);
 
+
+            String date = "";
+            if(arsi.get(0).getPreparationDate()!=null) {
+                System.out.println(arsi.get(0).getPreparationDate().toString() + "]]]]]]]]");
+
+                System.out.println(DateUtil.parseCST(arsi.get(0).getPreparationDate().toString()));
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                DateTime dat = DateUtil.parseCST(arsi.get(0).getPreparationDate().toString());
+                date = new SimpleDateFormat("yyyy-MM-dd").format(dat);
+            }
+
+
+            String tmpSec = "妗e彿:" +
+                    arsi.get(0).getRecordId() +
+                    ";妗f棣嗭紙瀹わ級鍙�:" + arsi.get(0).getArchiveRoomNumber()+
+                    ";缂╁井鍙�:" + arsi.get(0).getMicrofilmNumber()+
+                    ";鍙戞枃鍙�:" + arsi.get(0).getInquiryNumber()+
+                    ";妗堝嵎棰樺悕:" + arsi.get(0).getCaseTitle() +
+                    ";缂栧埗鏃ユ湡:" +  date +
+                    ";缂栧埗鍗曚綅:" + arsi.get(0).getPreparationUnit() +
+                    ";淇濈鏈熼檺:" + arsi.get(0).getRetentionPeriod() +
+                    ";瀵嗙骇:" + arsi.get(0).getSecurityClassification();
+
+
             String recordId1 = aIV.getRecordId();
             byte[] imgr1 = barcodeService.generateBarcodeImage(recordId1);
-            byte[] sedcode = pdfGenerateService.createQrCodeN(recordId1, 200, 200);
+            byte[] sedcode = pdfGenerateService.createQrCodeN(tmpSec, 200, 200);
             ExcelExp e3 = new ExcelExp("妗堝嵎灏侀潰鏁版嵁",arsi, ArchiveInfoVo.class);
             ExcelExp e4 = new ExcelExp("妗堝嵎灏侀潰",  arsi, recordId1, imgr1,sedcode, ArchiveInfoVo.class);
             List<ExcelExp> mysheet1 = new ArrayList<ExcelExp>();
@@ -1271,7 +1409,7 @@
 
             //鎷垮埌鍗峰唴鐩綍鐨別xcel
             List<DocumentMaterialsVoSmall> list2 = dsvs.stream().map(res -> new DocumentMaterialsVoSmall(res.getNum(), res.getDocumentNumber(),res.getCreator(),
-                    res.getTitle(), res.getDate(), res.getPageNumber(), res.getRemarks())).collect(Collectors.toList());
+                    res.getTitle(), res.getDate(), res.getPageNumberFormatted(), res.getRemarks())).collect(Collectors.toList());
 
             String recordId = dsvs.get(0).getRecordId();
             byte[] imgr = barcodeService.generateBarcodeImage(recordId);

--
Gitblit v1.9.1