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/DocumentMaterialsController.java | 51 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 45 insertions(+), 6 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 df76b7d..6adca94 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
@@ -8,6 +8,8 @@
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.*;
import java.util.List;
@@ -17,6 +19,8 @@
import javax.imageio.ImageIO;
import javax.servlet.http.HttpServletResponse;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
import com.aspose.words.License;
import com.deepoove.poi.XWPFTemplate;
import com.drew.imaging.ImageMetadataReader;
@@ -201,7 +205,7 @@
vo.setCreator(doc.getCreator());
vo.setTitle(doc.getTitle());
vo.setDate(doc.getDate());
- vo.setPageNumber(doc.getPageNumber());
+ vo.setPageNumberFormatted(doc.getPageNumber().toString());
vo.setRemarks(doc.getRemarks());
// vo.setRecordId(doc.getRecordId() != null ? doc.getRecordId().toString() : null);
// vo.setPublicity(doc.getPublicity());
@@ -464,16 +468,25 @@
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()))
+ System.out.println(projectName.get(0).getCompanyName());
+ if(!StringUtils.isEmpty(projectName.get(0).getCompanyName()))
compName = projectName.get(0).getCompanyName();
- if(StringUtils.isEmpty(projectName.get(0).getCreatePerson()))
- li_person = projectName.get(0).getCreatePerson();
+ if(!StringUtils.isEmpty(projectName.get(0).getCreatePerson()))
+ sh_person = projectName.get(0).getCreatePerson();
+
+ System.out.println(compName+"--+"+sh_person);
+
}
+
+
+ System.out.println(compName+"--+"+sh_person);
// pdfGenerateService.generateFileStyleInfo(pdf09Path, aIV.getRecordId(), id);
//鎷垮埌鐩稿叧鏁版嵁
List<DocumentMaterialFileStyle> dmfs = documentMaterialsService.findFileStyleInfo(Math.toIntExact(id));
@@ -507,6 +520,8 @@
hs.put("texPages", texPages);
hs.put("volumeNumber", recordId);
hs.put("company", compName);
+ hs.put("liPerson", li_person);
+ hs.put("shPerson", sh_person);
hs.put("time", cdt);
if (!getLicense()) {
@@ -591,7 +606,7 @@
//瀵煎嚭妗堝嵎灏侀潰
@PostMapping("/exportPageInfo/{id}/{recordId}")
- public void exportPageInfo(HttpServletResponse response, @PathVariable Long id, @PathVariable String recordId) throws IOException {
+ public void exportPageInfo(HttpServletResponse response, @PathVariable Long id, @PathVariable String recordId) throws IOException, ParseException {
ArchiveInfoVo aIV = iArchiveRecordsService.selectByRecordId(id);
@@ -599,8 +614,31 @@
arsi.add(aIV);
String recordId1 = recordId;
+ if(aIV!=null)
+ {
+ 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 tmp = "妗ｅ彿:" +
+ arsi.get(0).getRecordId() +
+ ";妗ｆ棣嗭紙瀹わ級鍙�:" + 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();
byte[] imgr1 = barcodeService.generateBarcodeImage(recordId1);
- byte[] sedcode = pdfGenerateService.createQrCodeN(recordId1, 200, 200);
+ byte[] sedcode = pdfGenerateService.createQrCodeN(tmp, 210, 210);
ExcelExp e3 = new ExcelExp("妗堝嵎灏侀潰鏁版嵁",arsi, ArchiveInfoVo.class);
ExcelExp e4 = new ExcelExp("妗堝嵎灏侀潰", arsi, recordId1, imgr1,sedcode, ArchiveInfoVo.class);
List<ExcelExp> mysheet1 = new ArrayList<ExcelExp>();
@@ -613,6 +651,7 @@
// System.out.println(bos2);
bos2.writeTo(response.getOutputStream());
+ }
}
--
Gitblit v1.9.1