From 07a2f9c762efb3be3a29e2e8cc7004d4164cc9d8 Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期一, 22 十二月 2025 20:15:58 +0800
Subject: [PATCH] 修改了对应代码
---
archiveManager/src/main/java/com/ruoyi/domain/vo/ArchiveRecordSmall.java | 14 +-
archiveManager/src/main/java/com/ruoyi/mapper/DocumentMaterialsMapper.java | 12 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/archiveAllExportController.java | 258 +++++++++++++++++++++++++++---------
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelExp.java | 18 ++
archiveManager/src/main/java/com/ruoyi/service/IDocumentMaterialsService.java | 4
archiveManager/src/main/java/com/ruoyi/domain/ArchiveRecords.java | 53 ++++--
archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveRecordsServiceImpl.java | 7
ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java | 12 +
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtilManySheetThird.java | 7
archiveManager/src/main/java/com/ruoyi/mapper/ArchiverecordstouserMapper.java | 12 +
archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java | 6
11 files changed, 306 insertions(+), 97 deletions(-)
diff --git a/archiveManager/src/main/java/com/ruoyi/domain/ArchiveRecords.java b/archiveManager/src/main/java/com/ruoyi/domain/ArchiveRecords.java
index 929633c..a2346dd 100644
--- a/archiveManager/src/main/java/com/ruoyi/domain/ArchiveRecords.java
+++ b/archiveManager/src/main/java/com/ruoyi/domain/ArchiveRecords.java
@@ -26,13 +26,16 @@
@TableId(type = IdType.AUTO)
private Long id;
+ @TableField(exist = false)
+ @Excel(name = "搴忓彿", headerColor = IndexedColors.BLACK, width = 8)
+ private String num;
/** 妗ｆ鍙� */
- @Excel(name = "妗ｆ鍙�", headerColor = IndexedColors.BLACK)
+ @Excel(name = "妗ｆ鍙�", headerColor = IndexedColors.RED, width = 6)
private String recordId;
/** 鍙戦棶鍙� */
- @Excel(name = "鍙戞枃鍙�", headerColor = IndexedColors.BLACK)
+ @Excel(name = "鍙戞枃鍙�", headerColor = IndexedColors.RED, width = 10)
private String inquiryNumber;
public String getEveryProjectName() {
@@ -43,32 +46,32 @@
this.everyProjectName = everyProjectName;
}
- @Excel(name = "椤圭洰鍚嶇О", headerColor = IndexedColors.BLACK)
+ // @Excel(name = "椤圭洰鍚嶇О", headerColor = IndexedColors.BLACK)
private String everyProjectName;
/** 妗堝嵎棰樺悕 */
- @Excel(name = "妗堝嵎棰樺悕", headerColor = IndexedColors.BLACK)
+ @Excel(name = "妗堝嵎棰樺悕", headerColor = IndexedColors.RED, width = 10)
private String caseTitle;
/** 鍏紑灞炴�� */
- @Excel(name = "鍏紑灞炴��", headerColor = IndexedColors.BLACK)
+ @Excel(name = "鍏紑灞炴��", headerColor = IndexedColors.BLACK, width = 8)
private String publicAttribute;
/** 缂栧埗鍗曚綅 */
- @Excel(name = "缂栧埗鍗曚綅", headerColor = IndexedColors.BLACK)
+ @Excel(name = "缂栧埗鍗曚綅", headerColor = IndexedColors.BLACK, width = 8)
private String preparationUnit;
/** 缂栧埗鏃ユ湡 */
@JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "缂栧埗鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd", headerColor = IndexedColors.BLACK)
+ @Excel(name = "缂栧埗鏃ユ湡", width = 11, dateFormat = "yyyy-MM-dd", headerColor = IndexedColors.BLACK)
private Date preparationDate;
/** 淇濈鏈熼檺 */
- @Excel(name = "淇濈鏈熼檺", headerColor = IndexedColors.BLACK)
+ @Excel(name = "淇濈鏈熼檺", headerColor = IndexedColors.BLACK , width = 8)
private String retentionPeriod;
/** 瀵嗙骇 */
- @Excel(name = "瀵嗙骇", headerColor = IndexedColors.BLACK)
+ @Excel(name = "瀵嗙骇", headerColor = IndexedColors.BLACK, width = 6)
private String securityClassification;
@@ -76,43 +79,43 @@
private String recordStatus;
/** 妗堝嵎椤垫暟 */
- @Excel(name = "妗堝嵎椤垫暟", headerColor = IndexedColors.BLACK)
+ @Excel(name = "妗堝嵎椤垫暟", headerColor = IndexedColors.BLACK, width = 8)
private Long pageCount;
/** 绔嬫鍙� */
- @Excel(name = "绔嬫鍙�", headerColor = IndexedColors.BLACK)
+ @Excel(name = "绔嬫鍙�", headerColor = IndexedColors.BLACK, width = 8)
private String filingNumber;
/** 寤鸿鍗曚綅 */
- @Excel(name = "寤鸿鍗曚綅", headerColor = IndexedColors.BLACK)
+ @Excel(name = "寤鸿鍗曚綅", headerColor = IndexedColors.RED, width = 10)
private String constructionUnit;
/** 寤鸿鍦板潃 */
- @Excel(name = "寤鸿鍦板潃", headerColor = IndexedColors.BLACK)
+ @Excel(name = "寤鸿鍦板潃", headerColor = IndexedColors.RED, width = 9)
private String constructionAddress;
/** 寤鸿椤圭洰鍚嶇О */
- @Excel(name = "寤鸿椤圭洰鍚嶇О", headerColor = IndexedColors.BLACK)
+ @Excel(name = "寤鸿椤圭洰鍚嶇О", headerColor = IndexedColors.RED, width = 14)
private String projectName;
/** 椤圭洰缂栧彿 */
- @Excel(name = "椤圭洰缂栧彿", headerColor = IndexedColors.BLACK)
+ @Excel(name = "椤圭洰缂栧彿", headerColor = IndexedColors.BLACK, width = 8)
private String projectNumber;
/** 鎵弿鍔犲伐鍏徃 */
- @Excel(name = "鎵弿鍔犲伐鍏徃", headerColor = IndexedColors.BLACK)
+ @Excel(name = "鎵弿鍔犲伐鍏徃", headerColor = IndexedColors.BLACK, width = 12)
private String scanningCompany;
/** 妗ｆ绠�(瀹�)鍙� */
- @Excel(name = "妗ｆ绠�(瀹�)鍙�", headerColor = IndexedColors.BLACK)
+ @Excel(name = "妗ｆ绠�(瀹�)鍙�", headerColor = IndexedColors.BLACK, width = 14)
private String archiveRoomNumber;
/** 缂╁井鍙� */
- @Excel(name = "缂╁井鍙�", headerColor = IndexedColors.BLACK)
+ @Excel(name = "缂╁井鍙�", headerColor = IndexedColors.BLACK, width = 8)
private String microfilmNumber;
/** 澶囨敞 */
- @Excel(name = "澶囨敞", headerColor = IndexedColors.BLACK)
+ @Excel(name = "澶囨敞", headerColor = IndexedColors.BLACK, width = 8)
private String remarks;
@TableField(exist = false)
@@ -137,7 +140,7 @@
@TableField(exist = false)
private String categoryNumberEnd;
/** 鍘嗗彶鐩稿叧鍙戞枃鍙� */
- @Excel(name = "鍘嗗彶鐩稿叧鍙戞枃鍙�")
+ @Excel(name = "鍘嗗彶鐩稿叧鍙戞枃鍙�", headerColor = IndexedColors.RED, width = 14)
private String historicalReferenceNumber;
@TableField(exist = false)
@@ -410,6 +413,16 @@
return historicalReferenceNumber;
}
+ public void setNum(String num)
+ {
+ this.num = num;
+ }
+
+ public String getNum()
+ {
+ return num;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
diff --git a/archiveManager/src/main/java/com/ruoyi/domain/vo/ArchiveRecordSmall.java b/archiveManager/src/main/java/com/ruoyi/domain/vo/ArchiveRecordSmall.java
index abaf292..3c5b60b 100644
--- a/archiveManager/src/main/java/com/ruoyi/domain/vo/ArchiveRecordSmall.java
+++ b/archiveManager/src/main/java/com/ruoyi/domain/vo/ArchiveRecordSmall.java
@@ -8,32 +8,32 @@
public class ArchiveRecordSmall {
/** 妗ｆ鍙� */
- @Excel(name = "搴忓彿", headerColor = IndexedColors.BLACK)
+ @Excel(name = "搴忓彿", width=10,headerColor = IndexedColors.BLACK)
private Long num;
- @Excel(name = "绔嬫鍙�", headerColor = IndexedColors.BLACK)
+ @Excel(name = "绔嬫鍙�", width=20,headerColor = IndexedColors.BLACK)
private String filingNumber;
/** 妗ｆ绠�(瀹�)鍙� */
- @Excel(name = "妗ｆ鍙戞枃鍙穇妗ｅ彿", headerColor = IndexedColors.BLACK)
+ @Excel(name = "妗ｆ鍙戞枃鍙穇妗ｅ彿", width=21,headerColor = IndexedColors.BLACK)
private String inqrid;
/** 妗堝嵎棰樺悕 */
- @Excel(name = "妗堝嵎棰樺悕", headerColor = IndexedColors.BLACK)
+ @Excel(name = "妗堝嵎棰樺悕", width=23,headerColor = IndexedColors.BLACK)
private String caseTitle;
- @Excel(name = "鍏紑灞炴��", headerColor = IndexedColors.BLACK)
+ @Excel(name = "鍏紑灞炴��", width=8,headerColor = IndexedColors.BLACK)
private String publicAttribute;
/** 缂╁井鍙� */
- @Excel(name = "鐢靛瓙鏂囦欢涓暟", headerColor = IndexedColors.BLACK)
+ @Excel(name = "鐢靛瓙鏂囦欢涓暟",width=7, headerColor = IndexedColors.BLACK)
private Long cnt;
- @Excel(name = "澶囨敞", headerColor = IndexedColors.BLACK)
+ @Excel(name = "澶囨敞", width=5,headerColor = IndexedColors.BLACK)
private String remarks;
diff --git a/archiveManager/src/main/java/com/ruoyi/mapper/ArchiverecordstouserMapper.java b/archiveManager/src/main/java/com/ruoyi/mapper/ArchiverecordstouserMapper.java
index 7730a27..24b0ac8 100644
--- a/archiveManager/src/main/java/com/ruoyi/mapper/ArchiverecordstouserMapper.java
+++ b/archiveManager/src/main/java/com/ruoyi/mapper/ArchiverecordstouserMapper.java
@@ -32,10 +32,14 @@
Page<RecordToUserCount> selectRecordToUserPage(Page<RecordToUserCount> page, @Param("ew") LambdaQueryWrapper<RecordToUserCount> queryWrapper);
- @Select("select ad.user_id, user_name, count(*) as cnt, (select count(*) from archive_records as ar,archiverecordstouser as ats, sys_user as su where ar.record_id= ats.archive_records_id and ats.user_id=su.user_id and su.user_id=sy.user_id and\n" +
- " record_status='鏈綍鍏�') as swlr,(select count(*) from archive_records as ar,archiverecordstouser as ats, sys_user as su where ar.record_id= ats.archive_records_id and ats.user_id=su.user_id and su.user_id=sy.user_id and\n" +
- " record_status='褰曞叆瀹屾垚') as ylr from archiverecordstouser as ad, sys_user as sy,archive_records as ard where ad.user_id=sy.user_id and ard.record_id=ad.archive_records_id group by user_id, user_name\n" +
- " ")
+ @Select("select ad.user_id, user_name, count(*) as cnt, (select count(*) from archive_records as ar,archiverecordstouser as ats, sys_user as su where ar.id= ats.archive_records_id and ats.user_id=su.user_id and su.user_id=sy.user_id and\n" +
+ " record_status='鏈綍鍏�') as swlr,\n" +
+ " (select count(*) from archive_records as ar,archiverecordstouser as ats, sys_user as su where ar.id= ats.archive_records_id and ats.user_id=su.user_id and su.user_id=sy.user_id and\n" +
+ " record_status='鏈笂浼犻檮浠�') as wlrf,\n" +
+ " (select count(*) from archive_records as ar,archiverecordstouser as ats, sys_user as su where ar.id= ats.archive_records_id and ats.user_id=su.user_id and su.user_id=sy.user_id and\n" +
+ " record_status='寰呬慨鏀�') as dxg,\n" +
+ " (select count(*) from archive_records as ar,archiverecordstouser as ats, sys_user as su where ar.id= ats.archive_records_id and ats.user_id=su.user_id and su.user_id=sy.user_id and\n" +
+ " record_status='褰曞叆瀹屾垚') as ylr from archiverecordstouser as ad, sys_user as sy,archive_records as ard where ad.user_id=sy.user_id and ard.id=ad.archive_records_id group by user_id, user_name")
List<RecordToUserCount> selectRecordToUserAll();
}
\ No newline at end of file
diff --git a/archiveManager/src/main/java/com/ruoyi/mapper/DocumentMaterialsMapper.java b/archiveManager/src/main/java/com/ruoyi/mapper/DocumentMaterialsMapper.java
index dc00f16..1d501f1 100644
--- a/archiveManager/src/main/java/com/ruoyi/mapper/DocumentMaterialsMapper.java
+++ b/archiveManager/src/main/java/com/ruoyi/mapper/DocumentMaterialsMapper.java
@@ -71,4 +71,16 @@
//鎷垮埌闄ゅ叾瀹冩潗鏂欎箣澶栫殑鍏ㄩ儴鏁版嵁鐨勪釜鏁�
@Select("select count(*) FROM document_materials where file_style!='鍏朵粬鏉愭枡' and record_id=#{recordId}")
int getCount(@Param("recordId") int recordId);
+
+
+ //鍒ゆ柇鍗峰唴鐩綍鏄惁鍏ㄩ儴涓婁紶浜嗛檮浠�
+ @Select("select if(num=total_count, true, false) as res from (\n" +
+ "SELECT\n" +
+ " ROW_NUMBER() OVER (ORDER BY page_number) AS num, SUM(CASE WHEN dm.url IS NOT NULL THEN 1 ELSE 0 END) OVER() AS total_count\n" +
+ " from document_materials as dm, archive_records as ar \n" +
+ " WHERE ar.id = dm.record_id and page_number IN (SELECT MIN(page_number) \n" +
+ " FROM document_materials where record_id=#{recordId}\n" +
+ " GROUP BY stage, title) and ar.id =#{recordId} order by page_number desc limit 1) as res ")
+ Boolean judgeArchiveInfo( @Param("recordId") int recordId);
+
}
diff --git a/archiveManager/src/main/java/com/ruoyi/service/IDocumentMaterialsService.java b/archiveManager/src/main/java/com/ruoyi/service/IDocumentMaterialsService.java
index 0b09d2d..e9aba8f 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/IDocumentMaterialsService.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/IDocumentMaterialsService.java
@@ -97,4 +97,8 @@
//鏍规嵁椤靛彿娣诲姞涓棿璁板綍
public AjaxResult addMiddleRecordsByPageNumbers(Long recordId, Long maxPageNumber);
+
+ //鍒ゆ柇鏄惁宸茬粡涓婁紶浜嗙殑闄勪欢
+ public Boolean judgeInfo(int recordId);
+
}
diff --git a/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveRecordsServiceImpl.java b/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveRecordsServiceImpl.java
index f0fcaf7..8e31b4c 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveRecordsServiceImpl.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveRecordsServiceImpl.java
@@ -226,7 +226,12 @@
Long userid = SecurityUtils.getUserId();
LambdaQueryWrapper<ArchiveRecords> lambdaQueryWrapper = buildCondition(archiveRecords,userid);
List<ArchiveRecords> beanRecords = list(lambdaQueryWrapper);
-
+ // 涓鸿褰曡缃簭鍙凤紝浠�1寮�濮�
+ for (int i = 0; i < beanRecords.size(); i++) {
+ ArchiveRecords record = beanRecords.get(i);
+ record.setNum(String.valueOf(i + 1));
+ }
+
return beanRecords;
}
diff --git a/archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java b/archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java
index deb0f96..90cc40f 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java
@@ -422,6 +422,12 @@
return AjaxResult.error("娣诲姞涓棿璁板綍澶辫触锛�" + e.getMessage());
}
}
+
+ @Override
+ public Boolean judgeInfo(int recordId) {
+
+ return this.baseMapper.judgeArchiveInfo(recordId);
+ }
}
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 89fb691..eb4bc64 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
@@ -96,6 +96,18 @@
int cnt = documentMaterialsService.getFileCount(recordId);
return AjaxResult.success(cnt);
}
+
+ /**
+ * 鍒ゆ柇鍗峰唴鐩綍鏄惁涓婁紶浜嗛檮浠�
+ */
+ @PreAuthorize("@ss.hasPermi('system:materials:list')")
+ @GetMapping("/judge/{recordId}")
+ public AjaxResult judge(@PathVariable("recordId") Integer recordId)
+ {
+
+ Boolean cnt = documentMaterialsService.judgeInfo(recordId);
+ return AjaxResult.success(cnt);
+ }
/**
* 鏍规嵁椤靛彿娣诲姞涓棿璁板綍鐨勬帴鍙�
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 59a903c..ecf6382 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
@@ -445,7 +445,7 @@
- ExcelExp e6 = new ExcelExp("绉讳氦娓呭崟",lrs, ArchiveRecordSmall.class);
+ ExcelExp e6 = new ExcelExp("绉讳氦娓呭崟","GH" + formattedDate + sequence, lrs, ArchiveRecordSmall.class);
// ExcelExp e4 = new ExcelExp("妗堝嵎灏侀潰", arsi, recordId1, imgr1,sedcode, ArchiveInfoVo.class);
List<ExcelExp> mysheet6 = new ArrayList<ExcelExp>();
mysheet6.add(e6);
@@ -464,20 +464,26 @@
+ System.out.println(ids.length);
+ System.out.println("------------------");
+
for(int i = 0; i < ids.length; i++) {
+ System.out.println(ids[i]);
// 鑾峰彇鏂囦欢鐨勪繚瀛樹綅缃�,璇诲彇鏁版嵁搴�,
DocumentMaterials documentMaterials = new DocumentMaterials();
documentMaterials.setRecordId(ids[i]);
List<DocumentMaterialsVoLarge> docs = documentMaterialsService.selectDocumentMaterialsAllByRecordId(ids[i]);
- System.out.println(docs.size()+"----009");
+ System.out.println(docs.size()+"----7777");
//.selectDocumentMaterialsList(documentMaterials);
List<DocumentMaterialsVo> dsvs = documentMaterialsService.findArchMInfo(ids[i].toString());
ArchiveInfoVo aIV = iArchiveRecordsService.selectByRecordId(ids[i]);
-
+ System.out.println(aIV.getInquiryNumber());
+ System.out.println(aIV.getRecordId());
String adir = aIV.getInquiryNumber() + " " + aIV.getRecordId();
+ System.out.println(adir);
System.out.println(fna+adir);
zos.putNextEntry(new ZipEntry(fna + adir + "/"));
@@ -494,39 +500,26 @@
}
//娣诲姞07 鐨刾df
//pdf鐩綍灏侀潰
- String pdfPathF = "07-妗堝嵎灏侀潰.pdf";
- pdfGenerateService.generatePdf(pdfPathF, ids[i]);
- // 2. 鍘嬬缉PDF鍒癦IP鏂囦欢
- // 娣诲姞PDF鏂囦欢鍒癦IP
- ZipEntry zipEntry2 = new ZipEntry(fna + adir +"/"+pdfPathF);
- zos.putNextEntry(zipEntry2);
+// String pdfPathF = "07-妗堝嵎灏侀潰.pdf";
+// pdfGenerateService.generatePdf(pdfPathF, ids[i]);
+// // 2. 鍘嬬缉PDF鍒癦IP鏂囦欢
+// // 娣诲姞PDF鏂囦欢鍒癦IP
+// ZipEntry zipEntry2 = new ZipEntry(fna + adir +"/"+pdfPathF);
+// zos.putNextEntry(zipEntry2);
+//
+// // 璇诲彇PDF鏂囦欢鍐呭骞跺啓鍏IP
+// try (FileInputStream fis = new FileInputStream(pdfPathF)) {
+// byte[] buffer = new byte[1024];
+// int len;
+// while ((len = fis.read(buffer)) > 0) {
+// zos.write(buffer, 0, len);
+// }
+// }
- // 璇诲彇PDF鏂囦欢鍐呭骞跺啓鍏IP
- try (FileInputStream fis = new FileInputStream(pdfPathF)) {
- byte[] buffer = new byte[1024];
- int len;
- while ((len = fis.read(buffer)) > 0) {
- zos.write(buffer, 0, len);
- }
- }
- //08-鍗峰唴鍗峰唴鐩綍鐨刾df
- String pdf08Path= "08-鍗峰唴鐩綍.pdf";
- List<DocumentMaterialsVo> list3 = dsvs;
- if(list3.size()>0) {
- pdfGenerateService.generateFileDirectoryPdf(pdf08Path, list3);
- ZipEntry zipEntry3 = new ZipEntry(fna + adir +"/"+pdf08Path);
- zos.putNextEntry(zipEntry3);
- // 璇诲彇PDF鏂囦欢鍐呭骞跺啓鍏IP
- try (FileInputStream fis = new FileInputStream(pdf08Path)) {
- byte[] buffer = new byte[1024];
- int len;
- while ((len = fis.read(buffer)) > 0) {
- zos.write(buffer, 0, len);
- }
- }
- }
+
+
//09-澶囪�冭〃.pdf
@@ -652,6 +645,64 @@
// System.out.println(bos2);
zos.putNextEntry(entryiv);
+
+ bos2.writeTo(zos);
+
+
+ //pdf鐩綍灏侀潰
+ String pdfPathF = "07-妗堝嵎灏侀潰.pdf";
+ // pdfGenerateService.generatePdf(pdfPathF, id);
+
+ try {
+ if (!getLicenseExcel()) {
+ System.out.println("鎺堟潈澶辫触");
+ // return ;
+ }
+ // 璇诲彇Excel鏂囦欢
+ com.aspose.cells.Workbook wb = poiToAspose(util3.getWb());
+
+ // 鑾峰彇闇�瑕佸鍑虹殑sheet锛堢储寮曚粠0寮�濮嬶級
+ int targetSheetIndex = 1;
+ com.aspose.cells.Worksheet targetSheet = wb.getWorksheets().get(targetSheetIndex);
+ targetSheet.autoFitRows(true);
+ System.out.println("褰撳墠sheet鍚嶇О锛�" + targetSheet.getName());
+ System.out.println("褰撳墠sheet绱㈠紩锛�" + targetSheet.getIndex());
+
+ // 闅愯棌鎵�鏈夊叾浠栧伐浣滆〃
+ for (int j = 0; j < wb.getWorksheets().getCount(); j++) {
+ if (j != targetSheetIndex) {
+ wb.getWorksheets().get(j).setVisible(false);
+ }
+ }
+
+ // 璁剧疆娲诲姩宸ヤ綔琛ㄤ负鐩爣宸ヤ綔琛�
+ wb.getWorksheets().setActiveSheetIndex(targetSheetIndex);
+ // 鍒涘缓PDF淇濆瓨閫夐」
+ com.aspose.cells.PdfSaveOptions pdfSaveOptions = new com.aspose.cells.PdfSaveOptions();
+ pdfSaveOptions.setCompliance(com.aspose.cells.PdfCompliance.PDF_A_1_B);
+ // 鍒涘缓涓存椂瀛楄妭杈撳嚭娴�
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
+ // 灏嗘柊鐨刉orkbook淇濆瓨涓篜DF鍒颁复鏃舵祦
+ // newWorkbook.save(baos, com.aspose.cells.SaveFormat.PDF);
+ wb.save(baos, pdfSaveOptions);
+
+ // 灏哖DF娣诲姞鍒癦IP鏂囦欢
+ ZipEntry entry07 = new ZipEntry(fna + adir +"/"+pdfPathF);
+ zos.putNextEntry(entry07);
+ zos.write(baos.toByteArray());
+ // zos.closeEntry();
+ // 鐩存帴灏嗗師濮嬪伐浣滅翱淇濆瓨涓篜DF锛堝彧鍖呭惈鍙鐨勫伐浣滆〃锛�
+
+ long now = System.currentTimeMillis();
+ // System.out.println("pdf杞崲鎴愬姛锛屽叡鑰楁椂锛�" + ((now - old) / 1000.0) + "绉�");
+ } catch (Exception e) {
+ e.printStackTrace();
+ // 鎵撳嵃璇︾粏閿欒淇℃伅
+ System.err.println("杞崲澶辫触锛�" + e.getMessage());
+ e.printStackTrace(System.err);
+ }
+
// ExcelUtil<ArchiveInfoVo> utilsv = new ExcelUtil<ArchiveInfoVo>(ArchiveInfoVo.class);
//
//
@@ -659,7 +710,7 @@
// List<ArchiveInfoVo> aivs = new ArrayList<>();
// aivs.add(aIV);
// utilsv.byteOutputStreamExcel(boss, aivs,"Date List", "");
- bos2.writeTo(zos);
+
@@ -691,12 +742,90 @@
zos.putNextEntry(entr);
ByteOutputStream bos8 = new ByteOutputStream();
- util2.exportExcelManySheet(bos6, mysheet);
+ util2.exportExcelManySheet(bos8, mysheet);
// util1.byteOutputStreamExcel(bos1, dsvs,"Date List", "");
bos8.writeTo(zos);
+
+
+
+
+ //08-鍗峰唴鍗峰唴鐩綍鐨刾df
+ String pdf08Path= "08-鍗峰唴鐩綍.pdf";
+ try {
+ if (!getLicenseExcel()) {
+ System.out.println("鎺堟潈澶辫触");
+ // return ;
+ }
+ // 璇诲彇Excel鏂囦欢
+ com.aspose.cells.Workbook wb1 = poiToAspose(util2.getWb());
+
+ // 鑾峰彇闇�瑕佸鍑虹殑sheet锛堢储寮曚粠0寮�濮嬶級
+ int targetSheetIndex = 1;
+ com.aspose.cells.Worksheet targetSheet = wb1.getWorksheets().get(targetSheetIndex);
+ targetSheet.autoFitRows(true);
+ System.out.println("褰撳墠sheet鍚嶇О锛�" + targetSheet.getName());
+ System.out.println("褰撳墠sheet绱㈠紩锛�" + targetSheet.getIndex());
+
+ // 闅愯棌鎵�鏈夊叾浠栧伐浣滆〃
+ for (int j = 0; j < wb1.getWorksheets().getCount(); j++) {
+ if (j != targetSheetIndex) {
+ wb1.getWorksheets().get(j).setVisible(false);
+ }
+ }
+
+ // 璁剧疆娲诲姩宸ヤ綔琛ㄤ负鐩爣宸ヤ綔琛�
+ wb1.getWorksheets().setActiveSheetIndex(targetSheetIndex);
+ // 鍒涘缓PDF淇濆瓨閫夐」
+ com.aspose.cells.PdfSaveOptions pdfSaveOptions = new com.aspose.cells.PdfSaveOptions();
+ pdfSaveOptions.setCompliance(com.aspose.cells.PdfCompliance.PDF_A_1_B);
+ // 鍒涘缓涓存椂瀛楄妭杈撳嚭娴�
+ ByteArrayOutputStream baosm = new ByteArrayOutputStream();
+
+ // 灏嗘柊鐨刉orkbook淇濆瓨涓篜DF鍒颁复鏃舵祦
+ // newWorkbook.save(baos, com.aspose.cells.SaveFormat.PDF);
+ wb1.save(baosm, pdfSaveOptions);
+
+ // 灏哖DF娣诲姞鍒癦IP鏂囦欢
+ ZipEntry entry2 = new ZipEntry(fna + adir +"/"+pdf08Path);
+ zos.putNextEntry(entry2);
+ zos.write(baosm.toByteArray());
+ // zos.closeEntry();
+ // 鐩存帴灏嗗師濮嬪伐浣滅翱淇濆瓨涓篜DF锛堝彧鍖呭惈鍙鐨勫伐浣滆〃锛�
+
+ long now = System.currentTimeMillis();
+ // System.out.println("pdf杞崲鎴愬姛锛屽叡鑰楁椂锛�" + ((now - old) / 1000.0) + "绉�");
+ } catch (Exception e) {
+ e.printStackTrace();
+ // 鎵撳嵃璇︾粏閿欒淇℃伅
+ System.err.println("杞崲澶辫触锛�" + e.getMessage());
+ e.printStackTrace(System.err);
+ }
+
+
}
//鎶奺xcel杞负pdf
+
+//
+// //08-鍗峰唴鍗峰唴鐩綍鐨刾df
+// String pdf08Path= "08-鍗峰唴鐩綍.pdf";
+// List<DocumentMaterialsVo> list3 = dsvs;
+// if(list3.size()>0) {
+// pdfGenerateService.generateFileDirectoryPdf(pdf08Path, list3);
+// ZipEntry zipEntry3 = new ZipEntry(fna + adir +"/"+pdf08Path);
+// zos.putNextEntry(zipEntry3);
+//
+// // 璇诲彇PDF鏂囦欢鍐呭骞跺啓鍏IP
+// try (FileInputStream fis = new FileInputStream(pdf08Path)) {
+// byte[] buffer = new byte[1024];
+// int len;
+// while ((len = fis.read(buffer)) > 0) {
+// zos.write(buffer, 0, len);
+// }
+// }
+// }
+//
+//
@@ -713,38 +842,40 @@
//鍦ㄥ帇缂╁寘涓坊鍔犳枃浠跺す
//寰楀埌鏂囦欢鍚峟rontCompWithZore(4, dc.get)+
- String fname = frontCompWithZore(4, dc.getFileNumber().intValue())+"-"+dc.getTitle()+"-"+frontCompWithZore(4,dc.getPageNumber().intValue())+"."
- +dc.getUrl().split("\\.")[1];
- if(dc.getStage().equals("01-鐢宠鏉愭枡"))
- zos.putNextEntry(new ZipEntry(fna + adir + "/01-鐢宠鏉愭枡/"+fname));
- else if(dc.getStage().equals("02-鍔炴杩囩▼鏉愭枡"))
- zos.putNextEntry(new ZipEntry(fna + adir + "/02-鍔炴杩囩▼鏉愭枡/"+fname));
- else if(dc.getStage().equals("03-缁撹鎬ф枃浠�"))
- zos.putNextEntry(new ZipEntry(fna + adir + "/03-缁撹鎬ф枃浠�/"+fname));
- else if(dc.getStage().equals("04-鍏朵粬鏉愭枡")) {
- zos.putNextEntry(new ZipEntry(fna + adir + "/04-鍏朵粬鏉愭枡/" + fname));
- }
- else if(dc.getStage().equals("05-妗ｆ鍙樻洿鏉愭枡"))
- zos.putNextEntry(new ZipEntry(fna + adir + "/05-妗ｆ鍙樻洿鏉愭枡/"+fname));
- else if(dc.getStage().equals("06-涓氬姟鏁版嵁"))
- zos.putNextEntry(new ZipEntry(fna + adir + "/06-涓氬姟鏁版嵁/"+fname));
- else
- zos.putNextEntry(new ZipEntry(fna + adir + "/"+fname));
+ String fname = "";
+ if(dc.getFileNumber()!=null&&dc.getPageNumber()!=null) {
+ fname = frontCompWithZore(4, dc.getFileNumber().intValue()) + "-" + dc.getTitle() + "-" + frontCompWithZore(4, dc.getPageNumber().intValue()) + "."
+ + dc.getUrl().split("\\.")[1];
+ if (dc.getStage().equals("01-鐢宠鏉愭枡"))
+ zos.putNextEntry(new ZipEntry(fna + adir + "/01-鐢宠鏉愭枡/" + fname));
+ else if (dc.getStage().equals("02-鍔炴杩囩▼鏉愭枡"))
+ zos.putNextEntry(new ZipEntry(fna + adir + "/02-鍔炴杩囩▼鏉愭枡/" + fname));
+ else if (dc.getStage().equals("03-缁撹鎬ф枃浠�"))
+ zos.putNextEntry(new ZipEntry(fna + adir + "/03-缁撹鎬ф枃浠�/" + fname));
+ else if (dc.getStage().equals("04-鍏朵粬鏉愭枡")) {
+ zos.putNextEntry(new ZipEntry(fna + adir + "/04-鍏朵粬鏉愭枡/" + fname));
+ } else if (dc.getStage().equals("05-妗ｆ鍙樻洿鏉愭枡"))
+ zos.putNextEntry(new ZipEntry(fna + adir + "/05-妗ｆ鍙樻洿鏉愭枡/" + fname));
+ else if (dc.getStage().equals("06-涓氬姟鏁版嵁"))
+ zos.putNextEntry(new ZipEntry(fna + adir + "/06-涓氬姟鏁版嵁/" + fname));
+ else
+ zos.putNextEntry(new ZipEntry(fna + adir + "/" + fname));
-
- int len;
- FileInputStream in = new FileInputStream(tempFile);
- while ((len = in.read(buf)) != -1){
- zos.write(buf, 0, len);
- }
- // zos.putNextEntry(new ZipEntry("04-鍏朵粬鏉愭枡"));
- zos.closeEntry();
- in.close();
}
- }
- //鍒犻櫎鍘嬬缉鍖�
+ int len;
+ FileInputStream in = new FileInputStream(tempFile);
+ while ((len = in.read(buf)) != -1){
+ zos.write(buf, 0, len);
+ }
+ // zos.putNextEntry(new ZipEntry("04-鍏朵粬鏉愭枡"));
+ zos.closeEntry();
+ in.close();
+ }
+ }
+
+ //鍒犻櫎鍘嬬缉鍖�
// if(file.exists()){
// file.delete();
// }
@@ -1248,6 +1379,7 @@
System.out.println(filePath);
File tempFile = new File(filePath);
+
//鍦ㄥ帇缂╁寘涓坊鍔犳枃浠跺す
if(res) {
zos.putNextEntry(new ZipEntry("01-鐢宠鏉愭枡/"));
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelExp.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelExp.java
index cb467db..83b48a9 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelExp.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelExp.java
@@ -12,6 +12,16 @@
private Class clazz;
private String recordId; //妗ｆ鍙�
+
+ public String getIos5() {
+ return ios5;
+ }
+
+ public void setIos5(String ios5) {
+ this.ios5 = ios5;
+ }
+
+ private String ios5; //ios缂栧彿
private byte[] imgr; //鏉″舰鐮�
public byte[] getSedcode() {
@@ -28,6 +38,14 @@
this.dataset = dataset;
this.clazz = clazz;
}
+
+
+ public ExcelExp(String fileName, String iso5, List dataset, Class clazz) {
+ this.fileName = fileName;
+ this.ios5 = iso5;
+ this.dataset = dataset;
+ this.clazz = clazz;
+ }
public ExcelExp(String fileName, List dataset, String recordId, byte[] imgr, Class clazz) {
this.fileName = fileName;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtilManySheetThird.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtilManySheetThird.java
index ae5014f..842daf6 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtilManySheetThird.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtilManySheetThird.java
@@ -287,11 +287,11 @@
int column = 0;
if(index == 0) {
// 鍚堝苟绗竴琛岀殑鍓�5涓崟鍏冩牸
- sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 7));
+ sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 6));
// 鍒涘缓琛屽苟璁剧疆楂樺害
row = sheet.createRow(0);
- row.setHeight((short)(40 * 40));
+ row.setHeight((short)(20 * 20));
// sheet.addMergedRegion(new CellRangeAddress(1, 1, 0, 7));
@@ -301,6 +301,8 @@
CellStyle style = wb.createCellStyle();
Font font = wb.createFont();
font.setBold(true);
+ font.setFontHeightInPoints((short) 12);
+
font.setFontName("瀹嬩綋");
style.setFont(font);
style.setAlignment(HorizontalAlignment.CENTER);
@@ -308,6 +310,7 @@
row = sheet.createRow(1);
//
row.createCell(0).setCellValue("ISO缂栧彿:");
+ row.createCell(1).setCellValue(list.get(0).getIos5());
// row.createCell(4).setCellValue("妗ｅ彿:");
//鎷垮埌妗ｅ彿
row.createCell(5).setCellValue("");
--
Gitblit v1.9.1