From 6f0797731657022e9812b92fb4d78bcf56a65c1d Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期一, 05 一月 2026 00:00:16 +0800
Subject: [PATCH] 修改了对应代码
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveRecordsController.java | 54 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 33 insertions(+), 21 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveRecordsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveRecordsController.java
index 41aa1c2..ead5dca 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveRecordsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveRecordsController.java
@@ -2,6 +2,7 @@
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
@@ -14,14 +15,15 @@
import com.ruoyi.common.utils.file.FileUtils;
import com.ruoyi.common.utils.poi.ExcelExp;
import com.ruoyi.common.utils.poi.ExcelUtilManySheetFour;
-import com.ruoyi.common.utils.poi.ExcelUtilManySheetSecond;
import com.ruoyi.domain.ArchiveRecords;
import com.ruoyi.domain.DocumentMaterials;
+import com.ruoyi.domain.dto.searSigAnn;
import com.ruoyi.domain.vo.*;
import com.ruoyi.framework.config.ServerConfig;
import com.ruoyi.service.IArchiveRecordsService;
import com.ruoyi.service.IDocumentMaterialsService;
import com.ruoyi.service.impl.BarcodeService;
+import com.ruoyi.service.impl.pdfGenerateService;
import com.sun.xml.internal.messaging.saaj.util.ByteOutputStream;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
@@ -54,6 +56,9 @@
private BarcodeService barcodeService;
@Autowired
+ private pdfGenerateService pdfGenerateService;
+
+ @Autowired
private IDocumentMaterialsService iDocumentMaterialsService;
/**
* 鏌ヨ妗ｆ瀹屾垚鎯呭喌
@@ -73,7 +78,7 @@
{
List<AnalysisResult> list = archiveRecordsService.statisticAya();
ExcelUtil<AnalysisResult> util = new ExcelUtil<AnalysisResult>(AnalysisResult.class);
- util.exportExcel(response, list, "妗ｆ鍒嗘瀽缁撴灉");
+ util.exportExcel(response, list, "妗堝嵎鐩綍");
}
/**
@@ -104,14 +109,19 @@
@PreAuthorize("@ss.hasPermi('system:records:export')")
@Log(title = "妗ｆ璁板綍", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, ArchiveRecords archiveRecords)
+ public void export(HttpServletResponse response, ArchiveRecords archiveRecords, @RequestParam(value = "ids", required = false) Long[] ids)
{
- List<ArchiveRecords> list = archiveRecordsService.selectArchiveRecordsList(archiveRecords);
+ List<ArchiveRecords> list;
+ System.out.println(ids);
+ // 濡傛灉鎻愪緵浜唅ds鍙傛暟锛屽垯鏍规嵁ids瀵煎嚭鎸囧畾璁板綍
+ if (ids != null && ids.length > 0) {
+ list = archiveRecordsService.selectArchiveRecordsByIds(ids);
+ } else {
+ // 鍚﹀垯鏍规嵁鏌ヨ鏉′欢瀵煎嚭
+ list = archiveRecordsService.selectArchiveRecordsList(archiveRecords);
+ }
ExcelUtil<ArchiveRecords> util = new ExcelUtil<ArchiveRecords>(ArchiveRecords.class);
- //util.showColumn();
util.exportExcel(response, list, "妗ｆ璁板綍鏁版嵁");
- // response.getB
- // response.
}
/**
@@ -221,23 +231,22 @@
return AjaxResult.success( archiveRecordsService.whether(recordId));
}
- @PostMapping(value={"/recordFileList/{includeQrCode}/{selectedSignatures}/{selectedAnnotations}", "/recordFileList/{includeQrCode}", "/recordFileList/{includeQrCode}/{selectedSignatures}","/recordFileList/{includeQrCode}/{selectedAnnotations}"})
+ @PostMapping("/recordFileList")
//瀵煎嚭excle
- public void getSpecialArchiveInfo(HttpServletResponse response, @RequestParam("recordId")Long recordId, @PathVariable(name = "includeQrCode",required = false) boolean includeQrCode, @PathVariable(name = "selectedSignatures",required = false) int[] selectedSignatures, @PathVariable(name = "selectedAnnotations",required = false) int[] selectedAnnotations) throws IOException {
+ public void getSpecialArchiveInfo(HttpServletResponse response, @RequestBody searSigAnn searSigAnn) throws IOException {
System.out.println("uuuuuuuuuuuuuuuuuuusssss88888888888888");
-// System.out.println(selectedSignatures[0]);
-// System.out.println(selectedAnnotations[0]);
- System.out.println(includeQrCode);
- //浜岀淮鐮佹槸鍚︾敓鎴�
+ //System.out.println(includeQrCode);
+ //鐢熸垚浜岀淮鐮�
String code = "2024050000029250";
byte [] bt = barcodeService.generateBarcodeImage(code);
+ // System.out.println(Arrays.toString(selectedSignatures));
//绛惧悕閫夋嫨
String [] sig = {"涓氬姟绉戝绉讳氦浜�:","瀹℃壒绉戠Щ浜や汉:","妗ｆ鏁寸悊鍏徃:"};
List<String> arrLis = new ArrayList<>();
- if(selectedSignatures!=null){
- for(int si: selectedSignatures)
+ if(searSigAnn.getSelectedSignatures()!=null){
+ for(String si: searSigAnn.getSelectedSignatures())
{
- arrLis.add(sig[si-1]);
+ arrLis.add(sig[Integer.parseInt(si)]);
}
}
//娉ㄩ�夋嫨
@@ -247,15 +256,15 @@
"淇濈鏈熼檺:30骞存垨姘镐箙",
"椤靛彿鎸夌収姝ｅ紡褰曞叆椤电爜涓哄噯"};
List<String> arrAn = new ArrayList<>();
- if(selectedAnnotations!=null) {
- for (int ar : selectedAnnotations) {
- arrAn.add(ann[ar - 1]);
+ if(searSigAnn.getSelectedAnnotations()!=null) {
+ for (String ar : searSigAnn.getSelectedAnnotations()) {
+ arrAn.add(ann[Integer.parseInt(ar)]);
}
}
List<DocumentMaterialsFileList> arsi = new ArrayList<>();
// DocumentMaterials documentMaterials = new DocumentMaterials();
// documentMaterials.setRecordId(recordId);
- List<DocumentMaterialsFileList> lst = iDocumentMaterialsService.selectDocumentMaterialsFileList(recordId);
+ List<DocumentMaterialsFileList> lst = iDocumentMaterialsService.selectDocumentMaterialsFileList(searSigAnn.getRecordId());
@@ -284,6 +293,9 @@
inquiryNumber = arsi.get(0).getInquiryNumber();
caseTitle = arsi.get(0).getCaseTitle();
}
- util3.exportExcelManySheet(response, mysheet1, includeQrCode,bt, arrLis, arrAn, inquiryNumber, caseTitle);
+ util3.exportExcelManySheet(response, mysheet1, searSigAnn.getIncludeQrCode(), bt, arrLis, arrAn, inquiryNumber, caseTitle);
}
}
+
+
+
--
Gitblit v1.9.1