From 359f1d48b1d859a23cd35a425d2cffb1e9d1c811 Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期五, 26 十二月 2025 19:58:59 +0800
Subject: [PATCH] 修改了对应代码
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java | 41 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 38 insertions(+), 3 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 9412e5e..df76b7d 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
@@ -25,17 +25,20 @@
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.file.FileUploadUtils;
import com.ruoyi.common.utils.file.FileUtils;
import com.ruoyi.common.utils.poi.ExcelExp;
import com.ruoyi.common.utils.poi.ExcelUtilManySheet;
import com.ruoyi.common.utils.poi.ExcelUtilManySheetSecond;
import com.ruoyi.domain.ArchiveCategory;
+import com.ruoyi.domain.ArchiveProjectName;
import com.ruoyi.domain.ArchiveRecords;
import com.ruoyi.domain.DocumentMaterials;
import com.ruoyi.domain.vo.*;
import com.ruoyi.framework.config.ServerConfig;
import com.ruoyi.framework.web.domain.server.Sys;
+import com.ruoyi.service.IArchiveProjectNameService;
import com.ruoyi.service.IArchiveRecordsService;
import com.ruoyi.service.IDocumentMaterialsService;
import com.ruoyi.service.impl.BarcodeService;
@@ -72,6 +75,8 @@
@RequestMapping("/system/materials")
public class DocumentMaterialsController extends BaseController
{
+ @Autowired
+ private IArchiveProjectNameService iArchiveProjectNameService;
@Autowired
private BarcodeService barcodeService;
@Autowired
@@ -452,6 +457,23 @@
{
//09-澶囪�冭〃.pdf
String pdf09Path = "09-澶囪�冭〃.pdf";
+
+ //鏍规嵁椤圭洰鍚嶇О鎷垮埌鍏徃鍚嶇О鍜岄」鐩礋璐ｄ汉
+
+ String compName = "骞垮窞鐩堝妗ｆ绠＄悊鏈夐檺鍏徃";
+ String li_person = "浠囩縺";
+ String sh_person = "鏇剧憺鑾�";
+ ArchiveRecords archiveRecords = iArchiveRecordsService.selectArchiveRecordsById(id);
+ 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()))
+ li_person = projectName.get(0).getCreatePerson();
+ }
// pdfGenerateService.generateFileStyleInfo(pdf09Path, aIV.getRecordId(), id);
//鎷垮埌鐩稿叧鏁版嵁
List<DocumentMaterialFileStyle> dmfs = documentMaterialsService.findFileStyleInfo(Math.toIntExact(id));
@@ -484,6 +506,7 @@
hs.put("picPages", picPages);
hs.put("texPages", texPages);
hs.put("volumeNumber", recordId);
+ hs.put("company", compName);
hs.put("time", cdt);
if (!getLicense()) {
@@ -494,9 +517,21 @@
try {
// 鑾峰彇 Word 妯℃澘鎵�鍦ㄨ矾寰�
- String filepath = "09-澶囪�冭〃.docx";
+// String filepath = "09-澶囪�冭〃.docx";
+// // 閫氳繃 XWPFTemplate 缂栬瘧鏂囦欢骞舵覆鏌撴暟鎹埌妯℃澘涓�
+// XWPFTemplate template = XWPFTemplate.compile(filepath).render(hs
+// );
+ // 鑾峰彇 Word 妯℃澘鎵�鍦ㄨ矾寰�
+ 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";
@@ -530,7 +565,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);
--
Gitblit v1.9.1