From 1868fe69485d0d904bba24f2672a52a626ccf9f2 Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期六, 20 十二月 2025 13:34:49 +0800
Subject: [PATCH] 修改了对应代码
---
archiveManager/src/main/java/com/ruoyi/domain/vo/ArchiveRecordSmall.java | 15
archiveManager/src/main/java/com/ruoyi/domain/ArchiveProjectName.java | 7
archiveManager/src/main/java/com/ruoyi/domain/vo/AnalysisResult.java | 13
archiveManager/src/main/java/com/ruoyi/domain/ArchivePlaceName.java | 5
archiveManager/src/main/java/com/ruoyi/domain/vo/ArchiveRecordModelOther.java | 39 ++-
archiveManager/src/main/java/com/ruoyi/domain/vo/RecordToUserCount.java | 13
archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialFileSmallVo.java | 27 +-
archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialsFileList.java | 19 +
archiveManager/src/main/java/com/ruoyi/domain/vo/ArchiveRecordModelExp.java | 7
archiveManager/src/main/java/com/ruoyi/domain/Archiverecordstouser.java | 5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/archiveAllExportController.java | 239 ++++++++++++++++-------
archiveManager/src/main/java/com/ruoyi/domain/ArchiveRecords.java | 39 ++-
archiveManager/src/main/java/com/ruoyi/domain/ArchiveCategory.java | 5
archiveManager/src/main/java/com/ruoyi/domain/DocumentMaterials.java | 43 ++--
archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java | 88 +++-----
15 files changed, 326 insertions(+), 238 deletions(-)
diff --git a/archiveManager/src/main/java/com/ruoyi/domain/ArchiveCategory.java b/archiveManager/src/main/java/com/ruoyi/domain/ArchiveCategory.java
index 2f45523..11df880 100644
--- a/archiveManager/src/main/java/com/ruoyi/domain/ArchiveCategory.java
+++ b/archiveManager/src/main/java/com/ruoyi/domain/ArchiveCategory.java
@@ -8,6 +8,7 @@
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.poi.ss.usermodel.IndexedColors;
import java.util.Date;
@@ -27,11 +28,11 @@
private Long id;
/** $column.columnComment */
- @Excel(name = "缂栧彿")
+ @Excel(name = "缂栧彿", headerColor = IndexedColors.BLACK)
private String numb;
/** $column.columnComment */
- @Excel(name = "鍚嶇О")
+ @Excel(name = "鍚嶇О", headerColor = IndexedColors.BLACK)
private String nname;
diff --git a/archiveManager/src/main/java/com/ruoyi/domain/ArchivePlaceName.java b/archiveManager/src/main/java/com/ruoyi/domain/ArchivePlaceName.java
index 97fa03c..65c6bac 100644
--- a/archiveManager/src/main/java/com/ruoyi/domain/ArchivePlaceName.java
+++ b/archiveManager/src/main/java/com/ruoyi/domain/ArchivePlaceName.java
@@ -8,6 +8,7 @@
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.poi.ss.usermodel.IndexedColors;
import java.util.Date;
@@ -28,7 +29,7 @@
private Long id;
/** 瀵瑰簲鐨勫尯鍙� */
- @Excel(name = "瀵瑰簲鐨勫尯鍙�")
+ @Excel(name = "瀵瑰簲鐨勫尯鍙�", headerColor = IndexedColors.BLACK)
private String nnumber;
@Override
@@ -43,7 +44,7 @@
private Date createTime;
/** 瀵瑰簲鐨勫尯鍚嶇О */
- @Excel(name = "瀵瑰簲鐨勫尯鍚嶇О")
+ @Excel(name = "瀵瑰簲鐨勫尯鍚嶇О", headerColor = IndexedColors.BLACK)
private String name;
public void setId(Long id)
diff --git a/archiveManager/src/main/java/com/ruoyi/domain/ArchiveProjectName.java b/archiveManager/src/main/java/com/ruoyi/domain/ArchiveProjectName.java
index 34af99c..0bb465f 100644
--- a/archiveManager/src/main/java/com/ruoyi/domain/ArchiveProjectName.java
+++ b/archiveManager/src/main/java/com/ruoyi/domain/ArchiveProjectName.java
@@ -6,6 +6,7 @@
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.poi.ss.usermodel.IndexedColors;
import java.util.Date;
@@ -22,14 +23,14 @@
@TableId(type = IdType.AUTO)
private Long id;
- @Excel(name = "椤圭洰鍚嶇О")
+ @Excel(name = "椤圭洰鍚嶇О", headerColor = IndexedColors.BLACK)
private String name;
private Date createTime;
- @Excel(name = "鍏徃鍚嶇О")
+ @Excel(name = "鍏徃鍚嶇О", headerColor = IndexedColors.BLACK)
private String companyName;
- @Excel(name = "椤圭洰璐熻矗浜�")
+ @Excel(name = "椤圭洰璐熻矗浜�", headerColor = IndexedColors.BLACK)
private String createPerson;
diff --git a/archiveManager/src/main/java/com/ruoyi/domain/ArchiveRecords.java b/archiveManager/src/main/java/com/ruoyi/domain/ArchiveRecords.java
index ae7c55c..929633c 100644
--- a/archiveManager/src/main/java/com/ruoyi/domain/ArchiveRecords.java
+++ b/archiveManager/src/main/java/com/ruoyi/domain/ArchiveRecords.java
@@ -10,6 +10,7 @@
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.poi.ss.usermodel.IndexedColors;
/**
* 妗ｆ璁板綍瀵硅薄 archive_records
@@ -27,11 +28,11 @@
private Long id;
/** 妗ｆ鍙� */
- @Excel(name = "妗ｆ鍙�")
+ @Excel(name = "妗ｆ鍙�", headerColor = IndexedColors.BLACK)
private String recordId;
/** 鍙戦棶鍙� */
- @Excel(name = "鍙戞枃鍙�")
+ @Excel(name = "鍙戞枃鍙�", headerColor = IndexedColors.BLACK)
private String inquiryNumber;
public String getEveryProjectName() {
@@ -42,32 +43,32 @@
this.everyProjectName = everyProjectName;
}
- @Excel(name = "椤圭洰鍚嶇О")
+ @Excel(name = "椤圭洰鍚嶇О", headerColor = IndexedColors.BLACK)
private String everyProjectName;
/** 妗堝嵎棰樺悕 */
- @Excel(name = "妗堝嵎棰樺悕")
+ @Excel(name = "妗堝嵎棰樺悕", headerColor = IndexedColors.BLACK)
private String caseTitle;
/** 鍏紑灞炴�� */
- @Excel(name = "鍏紑灞炴��")
+ @Excel(name = "鍏紑灞炴��", headerColor = IndexedColors.BLACK)
private String publicAttribute;
/** 缂栧埗鍗曚綅 */
- @Excel(name = "缂栧埗鍗曚綅")
+ @Excel(name = "缂栧埗鍗曚綅", headerColor = IndexedColors.BLACK)
private String preparationUnit;
/** 缂栧埗鏃ユ湡 */
@JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "缂栧埗鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ @Excel(name = "缂栧埗鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd", headerColor = IndexedColors.BLACK)
private Date preparationDate;
/** 淇濈鏈熼檺 */
- @Excel(name = "淇濈鏈熼檺")
+ @Excel(name = "淇濈鏈熼檺", headerColor = IndexedColors.BLACK)
private String retentionPeriod;
/** 瀵嗙骇 */
- @Excel(name = "瀵嗙骇")
+ @Excel(name = "瀵嗙骇", headerColor = IndexedColors.BLACK)
private String securityClassification;
@@ -75,43 +76,43 @@
private String recordStatus;
/** 妗堝嵎椤垫暟 */
- @Excel(name = "妗堝嵎椤垫暟")
+ @Excel(name = "妗堝嵎椤垫暟", headerColor = IndexedColors.BLACK)
private Long pageCount;
/** 绔嬫鍙� */
- @Excel(name = "绔嬫鍙�")
+ @Excel(name = "绔嬫鍙�", headerColor = IndexedColors.BLACK)
private String filingNumber;
/** 寤鸿鍗曚綅 */
- @Excel(name = "寤鸿鍗曚綅")
+ @Excel(name = "寤鸿鍗曚綅", headerColor = IndexedColors.BLACK)
private String constructionUnit;
/** 寤鸿鍦板潃 */
- @Excel(name = "寤鸿鍦板潃")
+ @Excel(name = "寤鸿鍦板潃", headerColor = IndexedColors.BLACK)
private String constructionAddress;
/** 寤鸿椤圭洰鍚嶇О */
- @Excel(name = "寤鸿椤圭洰鍚嶇О")
+ @Excel(name = "寤鸿椤圭洰鍚嶇О", headerColor = IndexedColors.BLACK)
private String projectName;
/** 椤圭洰缂栧彿 */
- @Excel(name = "椤圭洰缂栧彿")
+ @Excel(name = "椤圭洰缂栧彿", headerColor = IndexedColors.BLACK)
private String projectNumber;
/** 鎵弿鍔犲伐鍏徃 */
- @Excel(name = "鎵弿鍔犲伐鍏徃")
+ @Excel(name = "鎵弿鍔犲伐鍏徃", headerColor = IndexedColors.BLACK)
private String scanningCompany;
/** 妗ｆ绠�(瀹�)鍙� */
- @Excel(name = "妗ｆ绠�(瀹�)鍙�")
+ @Excel(name = "妗ｆ绠�(瀹�)鍙�", headerColor = IndexedColors.BLACK)
private String archiveRoomNumber;
/** 缂╁井鍙� */
- @Excel(name = "缂╁井鍙�")
+ @Excel(name = "缂╁井鍙�", headerColor = IndexedColors.BLACK)
private String microfilmNumber;
/** 澶囨敞 */
- @Excel(name = "澶囨敞")
+ @Excel(name = "澶囨敞", headerColor = IndexedColors.BLACK)
private String remarks;
@TableField(exist = false)
diff --git a/archiveManager/src/main/java/com/ruoyi/domain/Archiverecordstouser.java b/archiveManager/src/main/java/com/ruoyi/domain/Archiverecordstouser.java
index 4101e6a..1a3df4f 100644
--- a/archiveManager/src/main/java/com/ruoyi/domain/Archiverecordstouser.java
+++ b/archiveManager/src/main/java/com/ruoyi/domain/Archiverecordstouser.java
@@ -8,6 +8,7 @@
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.poi.ss.usermodel.IndexedColors;
/**
* 銆愭。妗堝垎閰嶃�戝璞� archiverecordstouser
@@ -25,11 +26,11 @@
/** 妗ｆ鐩綍id
*/
- @Excel(name = "妗ｆ鐩綍id ")
+ @Excel(name = "妗ｆ鐩綍id ", headerColor = IndexedColors.BLACK)
private Long archiveRecordsId;
/** 鐢ㄦ埛id */
- @Excel(name = "鐢ㄦ埛id")
+ @Excel(name = "鐢ㄦ埛id", headerColor = IndexedColors.BLACK)
private Long userId;
public SysUser getSysUser() {
diff --git a/archiveManager/src/main/java/com/ruoyi/domain/DocumentMaterials.java b/archiveManager/src/main/java/com/ruoyi/domain/DocumentMaterials.java
index 5ee3df9..d54657d 100644
--- a/archiveManager/src/main/java/com/ruoyi/domain/DocumentMaterials.java
+++ b/archiveManager/src/main/java/com/ruoyi/domain/DocumentMaterials.java
@@ -12,6 +12,7 @@
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.poi.ss.usermodel.IndexedColors;
/**
* 銆愭枃浠舵潗鏂欑患鍚堜俊鎭�戝璞� document_materials
@@ -44,36 +45,36 @@
}
/** $column.columnComment */
- @Excel(name = "缂栦换鑰�")
+ @Excel(name = "缂栦换鑰�", headerColor = IndexedColors.BLACK)
private String creator;
/** $column.columnComment */
- @Excel(name = "鏂囦欢棰樺悕")
+ @Excel(name = "鏂囦欢棰樺悕", headerColor = IndexedColors.BLACK)
private String title;
/** $column.columnComment */
@JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ @Excel(name = "鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd", headerColor = IndexedColors.BLACK)
private Date date;
/** $column.columnComment */
- @Excel(name = "椤靛彿", handler = NumberFormatHandler.class)
+ @Excel(name = "椤靛彿", handler = NumberFormatHandler.class, headerColor = IndexedColors.BLACK)
private Long pageNumber;
/** $column.columnComment */
- @Excel(name = "椤垫")
+ @Excel(name = "椤垫", headerColor = IndexedColors.BLACK)
private Long pageOrder;
/** $column.columnComment */
- @Excel(name = "鎵�澶勯樁娈�")
+ @Excel(name = "鎵�澶勯樁娈�", headerColor = IndexedColors.BLACK)
private String stage;
/** $column.columnComment */
- @Excel(name = "鍏紑灞炴��")
+ @Excel(name = "鍏紑灞炴��", headerColor = IndexedColors.BLACK)
private String publicity;
/** $column.columnComment */
- @Excel(name = "鏄惁涓洪檮浠堕檮鍥�")
+ @Excel(name = "鏄惁涓洪檮浠堕檮鍥�", headerColor = IndexedColors.BLACK)
private String isAttachment;
/** $column.columnComment */
@@ -81,55 +82,55 @@
private String isDiagram;
/** $column.columnComment */
- @Excel(name = "淇濈鏈熼檺")
+ @Excel(name = "淇濈鏈熼檺", headerColor = IndexedColors.BLACK)
private String retentionPeriod;
/** $column.columnComment */
- @Excel(name = "瀵嗙骇")
+ @Excel(name = "瀵嗙骇", headerColor = IndexedColors.BLACK)
private String securityLevel;
/** $column.columnComment */
- @Excel(name = "鏄惁娑夊瘑鍙婃晱鎰熶俊鎭�")
+ @Excel(name = "鏄惁娑夊瘑鍙婃晱鎰熶俊鎭�", headerColor = IndexedColors.BLACK)
private String isSensitive;
/** $column.columnComment */
- @Excel(name = "鏄惁娉ㄩ攢")
+ @Excel(name = "鏄惁娉ㄩ攢", headerColor = IndexedColors.BLACK)
private String isCanceled;
/** $column.columnComment */
- @Excel(name = "鏍煎紡")
+ @Excel(name = "鏍煎紡", headerColor = IndexedColors.BLACK)
private String format;
/** $column.columnComment */
- @Excel(name = "骞呴潰")
+ @Excel(name = "骞呴潰", headerColor = IndexedColors.BLACK)
private String sizeType;
/** $column.columnComment */
- @Excel(name = "姘村钩鍒嗚鲸鐜�")
+ @Excel(name = "姘村钩鍒嗚鲸鐜�", headerColor = IndexedColors.BLACK)
private Long horizontalResolution;
/** $column.columnComment */
- @Excel(name = "鍨傜洿鍒嗚鲸鐜�")
+ @Excel(name = "鍨傜洿鍒嗚鲸鐜�", headerColor = IndexedColors.BLACK)
private Long verticalResolution;
/** $column.columnComment */
- @Excel(name = "瀹藉害")
+ @Excel(name = "瀹藉害", headerColor = IndexedColors.BLACK)
private Long width;
/** $column.columnComment */
- @Excel(name = "楂樺害")
+ @Excel(name = "楂樺害", headerColor = IndexedColors.BLACK)
private Long height;
/** $column.columnComment */
- @Excel(name = "澶у皬")
+ @Excel(name = "澶у皬", headerColor = IndexedColors.BLACK)
private Double fileSize;
/** $column.columnComment */
- @Excel(name = "闄勪欢鍙婂巻鍙插彂鏂囧彿")
+ @Excel(name = "闄勪欢鍙婂巻鍙插彂鏂囧彿", headerColor = IndexedColors.BLACK)
private String attachmentHistoryNumbers;
/** $column.columnComment */
- @Excel(name = "澶囨敞")
+ @Excel(name = "澶囨敞", headerColor = IndexedColors.BLACK)
private String remarks;
/** $column.columnComment */
diff --git a/archiveManager/src/main/java/com/ruoyi/domain/vo/AnalysisResult.java b/archiveManager/src/main/java/com/ruoyi/domain/vo/AnalysisResult.java
index 5150cfe..412fd2c 100644
--- a/archiveManager/src/main/java/com/ruoyi/domain/vo/AnalysisResult.java
+++ b/archiveManager/src/main/java/com/ruoyi/domain/vo/AnalysisResult.java
@@ -2,24 +2,25 @@
import com.ruoyi.common.annotation.Excel;
import lombok.Data;
+import org.apache.poi.ss.usermodel.IndexedColors;
@Data
public class AnalysisResult {
- @Excel(name = "椤圭洰鍚嶇О")
+ @Excel(name = "椤圭洰鍚嶇О", headerColor = IndexedColors.BLACK)
private String everyProjectName;
- @Excel(name = "椤圭洰鍐呮鍗锋�绘暟")
+ @Excel(name = "椤圭洰鍐呮鍗锋�绘暟", headerColor = IndexedColors.BLACK)
private Long cnt ;
- @Excel(name = "鏈畬鎴愭鍗锋暟")
+ @Excel(name = "鏈畬鎴愭鍗锋暟", headerColor = IndexedColors.BLACK)
private Long unfinished;
- @Excel(name = "鏈笂浼犻檮浠�")
+ @Excel(name = "鏈笂浼犻檮浠�", headerColor = IndexedColors.BLACK)
private Long unwf;
- @Excel(name = "寰呬慨鏀�")
+ @Excel(name = "寰呬慨鏀�", headerColor = IndexedColors.BLACK)
private Long dxg;
- @Excel(name = "瀹屾垚妗堝嵎鏁�")
+ @Excel(name = "瀹屾垚妗堝嵎鏁�", headerColor = IndexedColors.BLACK)
private Long finished;
}
diff --git a/archiveManager/src/main/java/com/ruoyi/domain/vo/ArchiveRecordModelExp.java b/archiveManager/src/main/java/com/ruoyi/domain/vo/ArchiveRecordModelExp.java
index 6cccebc..0c0cc7d 100644
--- a/archiveManager/src/main/java/com/ruoyi/domain/vo/ArchiveRecordModelExp.java
+++ b/archiveManager/src/main/java/com/ruoyi/domain/vo/ArchiveRecordModelExp.java
@@ -2,19 +2,20 @@
import com.ruoyi.common.annotation.Excel;
import lombok.Data;
+import org.apache.poi.ss.usermodel.IndexedColors;
@Data
public class ArchiveRecordModelExp {
/** 妗ｆ鍙� */
- @Excel(name = "妗ｆ鍙�")
+ @Excel(name = "妗ｆ鍙�", headerColor = IndexedColors.BLACK)
private String recordId;
/** 鍙戦棶鍙� */
- @Excel(name = "鍙戞枃鍙�")
+ @Excel(name = "鍙戞枃鍙�", headerColor = IndexedColors.BLACK)
private String inquiryNumber;
- @Excel(name = "椤圭洰鍚嶇О")
+ @Excel(name = "椤圭洰鍚嶇О", headerColor = IndexedColors.BLACK)
private String everyProjectName;
}
diff --git a/archiveManager/src/main/java/com/ruoyi/domain/vo/ArchiveRecordModelOther.java b/archiveManager/src/main/java/com/ruoyi/domain/vo/ArchiveRecordModelOther.java
index e524965..43ab5a5 100644
--- a/archiveManager/src/main/java/com/ruoyi/domain/vo/ArchiveRecordModelOther.java
+++ b/archiveManager/src/main/java/com/ruoyi/domain/vo/ArchiveRecordModelOther.java
@@ -5,6 +5,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import lombok.Data;
+import org.apache.poi.ss.usermodel.IndexedColors;
import java.util.Date;
@Data
@@ -13,84 +14,84 @@
/** 妗ｆ鍙� */
- @Excel(name = "妗ｆ鍙�")
+ @Excel(name = "妗ｆ鍙�", headerColor = IndexedColors.BLACK)
private String recordId;
/** 妗堝嵎棰樺悕 */
- @Excel(name = "妗堝嵎棰樺悕")
+ @Excel(name = "妗堝嵎棰樺悕", headerColor = IndexedColors.BLACK)
private String caseTitle;
/** 鍏紑灞炴�� */
- @Excel(name = "鍏紑灞炴��")
+ @Excel(name = "鍏紑灞炴��", headerColor = IndexedColors.BLACK)
private String publicAttribute;
/** 缂栧埗鍗曚綅 */
- @Excel(name = "缂栧埗鍗曚綅")
+ @Excel(name = "缂栧埗鍗曚綅", headerColor = IndexedColors.BLACK)
private String preparationUnit;
/** 缂栧埗鏃ユ湡 */
@JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "缂栧埗鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ @Excel(name = "缂栧埗鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd", headerColor = IndexedColors.BLACK)
private Date preparationDate;
/** 淇濈鏈熼檺 */
- @Excel(name = "淇濈鏈熼檺")
+ @Excel(name = "淇濈鏈熼檺", headerColor = IndexedColors.BLACK)
private String retentionPeriod;
/** 瀵嗙骇 */
- @Excel(name = "瀵嗙骇", readConverterExp = "璇ラ〉鍙﹀瓨=鏅��")
+ @Excel(name = "瀵嗙骇", readConverterExp = "璇ラ〉鍙﹀瓨=鏅��", headerColor = IndexedColors.BLACK)
private String securityClassification;
- @Excel(name = "妗堝嵎鐘舵��")
+ @Excel(name = "妗堝嵎鐘舵��", headerColor = IndexedColors.BLACK)
private String recordStatus;
/** 妗堝嵎椤垫暟 */
- @Excel(name = "妗堝嵎椤垫暟")
+ @Excel(name = "妗堝嵎椤垫暟", headerColor = IndexedColors.BLACK)
private Long pageCount;
/** 绔嬫鍙� */
- @Excel(name = "绔嬫鍙�")
+ @Excel(name = "绔嬫鍙�", headerColor = IndexedColors.BLACK)
private String filingNumber;
/** 寤鸿鍗曚綅 */
- @Excel(name = "寤鸿鍗曚綅")
+ @Excel(name = "寤鸿鍗曚綅", headerColor = IndexedColors.BLACK)
private String constructionUnit;
/** 寤鸿鍦板潃 */
- @Excel(name = "寤鸿鍦板潃")
+ @Excel(name = "寤鸿鍦板潃", headerColor = IndexedColors.BLACK)
private String constructionAddress;
/** 寤鸿椤圭洰鍚嶇О */
- @Excel(name = "寤鸿椤圭洰鍚嶇О")
+ @Excel(name = "寤鸿椤圭洰鍚嶇О", headerColor = IndexedColors.BLACK)
private String projectName;
/** 椤圭洰缂栧彿 */
- @Excel(name = "椤圭洰缂栧彿")
+ @Excel(name = "椤圭洰缂栧彿", headerColor = IndexedColors.BLACK)
private String projectNumber;
/** 鎵弿鍔犲伐鍏徃 */
- @Excel(name = "鎵弿鍔犲伐鍏徃")
+ @Excel(name = "鎵弿鍔犲伐鍏徃", headerColor = IndexedColors.BLACK)
private String scanningCompany;
/** 妗ｆ绠�(瀹�)鍙� */
- @Excel(name = "妗ｆ绠�(瀹�)鍙�")
+ @Excel(name = "妗ｆ绠�(瀹�)鍙�", headerColor = IndexedColors.BLACK)
private String archiveRoomNumber;
/** 缂╁井鍙� */
- @Excel(name = "缂╁井鍙�")
+ @Excel(name = "缂╁井鍙�", headerColor = IndexedColors.BLACK)
private String microfilmNumber;
/** 澶囨敞 */
- @Excel(name = "澶囨敞")
+ @Excel(name = "澶囨敞", headerColor = IndexedColors.BLACK)
private String remarks;
/** 鍘嗗彶鐩稿叧鍙戞枃鍙� */
- @Excel(name = "鍘嗗彶鐩稿叧鍙戞枃鍙�")
+ @Excel(name = "鍘嗗彶鐩稿叧鍙戞枃鍙�", headerColor = IndexedColors.BLACK)
private String historicalReferenceNumber;
}
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 71be790..abaf292 100644
--- a/archiveManager/src/main/java/com/ruoyi/domain/vo/ArchiveRecordSmall.java
+++ b/archiveManager/src/main/java/com/ruoyi/domain/vo/ArchiveRecordSmall.java
@@ -2,37 +2,38 @@
import com.ruoyi.common.annotation.Excel;
import lombok.Data;
+import org.apache.poi.ss.usermodel.IndexedColors;
@Data
public class ArchiveRecordSmall {
/** 妗ｆ鍙� */
- @Excel(name = "搴忓彿")
+ @Excel(name = "搴忓彿", headerColor = IndexedColors.BLACK)
private Long num;
- @Excel(name = "绔嬫鍙�")
+ @Excel(name = "绔嬫鍙�", headerColor = IndexedColors.BLACK)
private String filingNumber;
/** 妗ｆ绠�(瀹�)鍙� */
- @Excel(name = "妗ｆ鍙戞枃鍙穇妗ｅ彿")
+ @Excel(name = "妗ｆ鍙戞枃鍙穇妗ｅ彿", headerColor = IndexedColors.BLACK)
private String inqrid;
/** 妗堝嵎棰樺悕 */
- @Excel(name = "妗堝嵎棰樺悕")
+ @Excel(name = "妗堝嵎棰樺悕", headerColor = IndexedColors.BLACK)
private String caseTitle;
- @Excel(name = "鍏紑灞炴��")
+ @Excel(name = "鍏紑灞炴��", headerColor = IndexedColors.BLACK)
private String publicAttribute;
/** 缂╁井鍙� */
- @Excel(name = "鐢靛瓙鏂囦欢涓暟")
+ @Excel(name = "鐢靛瓙鏂囦欢涓暟", headerColor = IndexedColors.BLACK)
private Long cnt;
- @Excel(name = "澶囨敞")
+ @Excel(name = "澶囨敞", headerColor = IndexedColors.BLACK)
private String remarks;
diff --git a/archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialFileSmallVo.java b/archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialFileSmallVo.java
index 58bae63..8ac93cc 100644
--- a/archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialFileSmallVo.java
+++ b/archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialFileSmallVo.java
@@ -4,6 +4,7 @@
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.annotation.NumberFormatHandler;
import lombok.Data;
+import org.apache.poi.ss.usermodel.IndexedColors;
import java.util.Date;
@Data
@@ -13,35 +14,35 @@
/** $column.columnComment */
- @Excel(name = "缂栦换鑰�")
+ @Excel(name = "缂栦换鑰�", headerColor = IndexedColors.BLACK)
private String creator;
- @Excel(name = "鏂囦欢缂栧彿")
+ @Excel(name = "鏂囦欢缂栧彿", headerColor = IndexedColors.BLACK)
private String documentNumber;
/** $column.columnComment */
- @Excel(name = "鏂囦欢棰樺悕")
+ @Excel(name = "鏂囦欢棰樺悕", headerColor = IndexedColors.BLACK)
private String title;
/** $column.columnComment */
@JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ @Excel(name = "鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd", headerColor = IndexedColors.BLACK)
private Date date;
/** $column.columnComment */
- @Excel(name = "椤靛彿", handler = NumberFormatHandler.class)
+ @Excel(name = "椤靛彿", handler = NumberFormatHandler.class, headerColor = IndexedColors.BLACK)
private Long pageNumber;
- @Excel(name = "鏉愭枡绫诲瀷")
+ @Excel(name = "鏉愭枡绫诲瀷", headerColor = IndexedColors.BLACK)
private String fileStyle;
/** $column.columnComment */
- @Excel(name = "鎵�澶勯樁娈�")
+ @Excel(name = "鎵�澶勯樁娈�", headerColor = IndexedColors.BLACK)
private String stage;
/** $column.columnComment */
- @Excel(name = "鍏紑灞炴��")
+ @Excel(name = "鍏紑灞炴��", headerColor = IndexedColors.BLACK)
private String publicity;
/** $column.columnComment */
- @Excel(name = "鏄惁涓洪檮浠堕檮鍥�")
+ @Excel(name = "鏄惁涓洪檮浠堕檮鍥�", headerColor = IndexedColors.BLACK)
private String isAttachment;
/** $column.columnComment */
@@ -49,19 +50,19 @@
private String isDiagram;
/** $column.columnComment */
- @Excel(name = "淇濈鏈熼檺")
+ @Excel(name = "淇濈鏈熼檺", headerColor = IndexedColors.BLACK)
private String retentionPeriod;
/** $column.columnComment */
- @Excel(name = "瀵嗙骇", readConverterExp = "璇ラ〉鍙﹀瓨=鏅��,鏅��=鏅��,鍐呴儴鐢ㄥ浘=鍐呴儴鐢ㄥ浘,鍐呴儴鐢ㄩ��=鍐呴儴鐢ㄩ��,绉樺瘑=绉樺瘑")
+ @Excel(name = "瀵嗙骇", readConverterExp = "璇ラ〉鍙﹀瓨=鏅��,鏅��=鏅��,鍐呴儴鐢ㄥ浘=鍐呴儴鐢ㄥ浘,鍐呴儴鐢ㄩ��=鍐呴儴鐢ㄩ��,绉樺瘑=绉樺瘑", headerColor = IndexedColors.BLACK)
private String securityLevel;
/** $column.columnComment */
- @Excel(name = "鏄惁娑夊瘑鍙婃晱鎰熶俊鎭�")
+ @Excel(name = "鏄惁娑夊瘑鍙婃晱鎰熶俊鎭�", headerColor = IndexedColors.BLACK)
private String isSensitive;
/** $column.columnComment */
- @Excel(name = "鏄惁娉ㄩ攢")
+ @Excel(name = "鏄惁娉ㄩ攢", headerColor = IndexedColors.BLACK)
private String isCanceled;
diff --git a/archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialsFileList.java b/archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialsFileList.java
index 248aa8f..c8ace84 100644
--- a/archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialsFileList.java
+++ b/archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialsFileList.java
@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import lombok.Data;
+import org.apache.poi.ss.usermodel.IndexedColors;
import java.util.Date;
@@ -17,27 +18,27 @@
private String inquiryNumber;
private String caseTitle;
- @Excel(name="搴忓彿")
+ @Excel(name="搴忓彿", headerColor = IndexedColors.BLACK)
private Long num;
- @Excel(name = "鏂囦欢缂栧彿")
+ @Excel(name = "鏂囦欢缂栧彿", headerColor = IndexedColors.BLACK)
private String documentNumber;
- @Excel(name = "鏂囦欢棰樺悕")
+ @Excel(name = "鏂囦欢棰樺悕", headerColor = IndexedColors.BLACK)
private String title;
- @Excel(name = "椤靛彿")
+ @Excel(name = "椤靛彿", headerColor = IndexedColors.BLACK)
private Long pageNumber;
- @Excel(name = "鏄惁鏈夊叾浠栦粙璐�")
+ @Excel(name = "鏄惁鏈夊叾浠栦粙璐�", headerColor = IndexedColors.BLACK)
private String fileStyle1;
- @Excel(name = "鏂囦欢绫诲瀷")
+ @Excel(name = "鏂囦欢绫诲瀷", headerColor = IndexedColors.BLACK)
private String fileStyle;
- @Excel(name = "淇濈鏈熼檺")
+ @Excel(name = "淇濈鏈熼檺", headerColor = IndexedColors.BLACK)
private String retentionPeriod;
- @Excel(name = "鍏紑灞炴��")
+ @Excel(name = "鍏紑灞炴��", headerColor = IndexedColors.BLACK)
private String publicity;
- @Excel(name = "澶囨敞")
+ @Excel(name = "澶囨敞", headerColor = IndexedColors.BLACK)
private String remarks;
}
diff --git a/archiveManager/src/main/java/com/ruoyi/domain/vo/RecordToUserCount.java b/archiveManager/src/main/java/com/ruoyi/domain/vo/RecordToUserCount.java
index 733ee18..36c7b2c 100644
--- a/archiveManager/src/main/java/com/ruoyi/domain/vo/RecordToUserCount.java
+++ b/archiveManager/src/main/java/com/ruoyi/domain/vo/RecordToUserCount.java
@@ -2,20 +2,21 @@
import com.ruoyi.common.annotation.Excel;
import lombok.Data;
+import org.apache.poi.ss.usermodel.IndexedColors;
@Data
public class RecordToUserCount {
private Long userId;
- @Excel(name = "鐢ㄦ埛鍚嶇О")
+ @Excel(name = "鐢ㄦ埛鍚嶇О", headerColor = IndexedColors.BLACK)
private String userName;
- @Excel(name = "琚垎閰嶆鍗锋�绘暟")
+ @Excel(name = "琚垎閰嶆鍗锋�绘暟", headerColor = IndexedColors.BLACK)
private Long cnt;
- @Excel(name = "瀹屾垚妗堝嵎鏁�")
+ @Excel(name = "瀹屾垚妗堝嵎鏁�", headerColor = IndexedColors.BLACK)
private Long swlr;
- @Excel(name = "鏈笂浼犻檮浠�")
+ @Excel(name = "鏈笂浼犻檮浠�", headerColor = IndexedColors.BLACK)
private Long wlrf;
- @Excel(name = "寰呬慨鏀�")
+ @Excel(name = "寰呬慨鏀�", headerColor = IndexedColors.BLACK)
private Long dxg;
- @Excel(name = "鏈畬鎴愭鍗锋暟")
+ @Excel(name = "鏈畬鎴愭鍗锋暟", headerColor = IndexedColors.BLACK)
private Long ylr;
}
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 8ca7e7d..deb0f96 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -176,58 +177,39 @@
public int updateDocumentMaterials(DocumentMaterials documentMaterials) {
boolean result = false;
try {
-
-// //淇敼椤靛彿鎴愬姛涔嬪悗锛岃閲嶆柊鐢熸垚鏂囦欢鏉愭枡搴忓彿锛岄〉娆�
-// //鏍规嵁pageNumber鎷垮埌title锛岀劧鍚庤绠梡ageOrder
-// LambdaQueryWrapper<DocumentMaterials> lqw = new LambdaQueryWrapper<>();
-// lqw.eq(documentMaterials.getRecordId()!=null, DocumentMaterials::getRecordId, documentMaterials.getRecordId());
-// lqw.eq(documentMaterials.getPageNumber()!=null, DocumentMaterials::getPageNumber, documentMaterials.getPageNumber());
-// List<DocumentMaterials> records = list(lqw);
-
-
-//
-// //璁＄畻pageOrder
-// Long pageOrder = 1L;
-// if(documentMaterials.getPageNumber().equals(1))
-// pageOrder = 1L;
-// else {
-// Long maxPOrder = this.baseMapper.getMaxPageOrder(records.get(0).getTitle(), documentMaterials.getPageNumber(), records.get(0).getStage(), documentMaterials.getRecordId());
-// if (maxPOrder != null)
-// pageOrder = maxPOrder + 1;
-// }
-// //璁剧疆pageOrder
-// documentMaterials.setPageOrder(pageOrder);
-// //璁＄畻fileNumber
-// Long fileNumber = this.getFiNum(documentMaterials.getPageNumber(), documentMaterials.getRecordId());
-// documentMaterials.setFileNumber(fileNumber);
- //淇敼椤靛彿
- result = updateById(documentMaterials);
-// //鎶婂墿涓嬫墍鏈夌殑鐨刦ileNumber鍜宲ageOrder閮芥洿鏂颁竴閬�
-// LambdaQueryWrapper<DocumentMaterials> lqw1 = new LambdaQueryWrapper<>();
-// lqw.eq(documentMaterials.getRecordId()!=null, DocumentMaterials::getRecordId, documentMaterials.getRecordId());
-// // lqw.eq(documentMaterials.getPageNumber()!=null, DocumentMaterials::getPageNumber, documentMaterials.getPageNumber());
-// List<DocumentMaterials> recordss = list(lqw1);
-// for(DocumentMaterials dt: recordss)
-// {
-// //璁＄畻pageOrder
-// Long pageOrder1 = 1L;
-// if(dt.getPageNumber().equals(1))
-// pageOrder1 = 1L;
-// else {
-// Long maxPOrder1 = this.baseMapper.getMaxPageOrder(dt.getTitle(), dt.getPageNumber(), dt.getStage(), dt.getRecordId());
-// if (maxPOrder1 != null)
-// pageOrder1 = maxPOrder1 + 1;
-// }
-// //璁剧疆pageOrder
-// dt.setPageOrder(pageOrder1);
-// //璁＄畻fileNumber
-// Long fileNumber1 = this.getFiNum(dt.getPageNumber(), dt.getRecordId());
-// dt.setFileNumber(fileNumber1);
-// //淇敼椤靛彿
-// updateById(dt);
-// }
-
-
+ // 浣跨敤LambdaUpdateWrapper鏋勯�犳洿鏂版潯浠讹紝纭繚null鍊间篃鑳芥洿鏂板埌鏁版嵁搴�
+ LambdaUpdateWrapper<DocumentMaterials> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.eq(DocumentMaterials::getMaterialId, documentMaterials.getMaterialId());
+
+ // 鏄庣‘璁剧疆闇�瑕佹洿鏂扮殑瀛楁
+ updateWrapper.set(DocumentMaterials::getFileNumber, documentMaterials.getFileNumber());
+ updateWrapper.set(DocumentMaterials::getDocumentNumber, documentMaterials.getDocumentNumber());
+ updateWrapper.set(DocumentMaterials::getCreator, documentMaterials.getCreator());
+ updateWrapper.set(DocumentMaterials::getTitle, documentMaterials.getTitle());
+ updateWrapper.set(DocumentMaterials::getDate, documentMaterials.getDate());
+ updateWrapper.set(DocumentMaterials::getPageNumber, documentMaterials.getPageNumber()); // 鍏佽鏇存柊涓簄ull
+ updateWrapper.set(DocumentMaterials::getPageOrder, documentMaterials.getPageOrder());
+ updateWrapper.set(DocumentMaterials::getStage, documentMaterials.getStage());
+ updateWrapper.set(DocumentMaterials::getPublicity, documentMaterials.getPublicity());
+ updateWrapper.set(DocumentMaterials::getIsAttachment, documentMaterials.getIsAttachment());
+ updateWrapper.set(DocumentMaterials::getIsDiagram, documentMaterials.getIsDiagram());
+ updateWrapper.set(DocumentMaterials::getRetentionPeriod, documentMaterials.getRetentionPeriod());
+ updateWrapper.set(DocumentMaterials::getSecurityLevel, documentMaterials.getSecurityLevel());
+ updateWrapper.set(DocumentMaterials::getIsSensitive, documentMaterials.getIsSensitive());
+ updateWrapper.set(DocumentMaterials::getIsCanceled, documentMaterials.getIsCanceled());
+ updateWrapper.set(DocumentMaterials::getFormat, documentMaterials.getFormat());
+ updateWrapper.set(DocumentMaterials::getSizeType, documentMaterials.getSizeType());
+ updateWrapper.set(DocumentMaterials::getHorizontalResolution, documentMaterials.getHorizontalResolution());
+ updateWrapper.set(DocumentMaterials::getVerticalResolution, documentMaterials.getVerticalResolution());
+ updateWrapper.set(DocumentMaterials::getWidth, documentMaterials.getWidth());
+ updateWrapper.set(DocumentMaterials::getHeight, documentMaterials.getHeight());
+ updateWrapper.set(DocumentMaterials::getFileSize, documentMaterials.getFileSize());
+ updateWrapper.set(DocumentMaterials::getAttachmentHistoryNumbers, documentMaterials.getAttachmentHistoryNumbers());
+ updateWrapper.set(DocumentMaterials::getRemarks, documentMaterials.getRemarks());
+ updateWrapper.set(DocumentMaterials::getVisible, documentMaterials.getVisible());
+ updateWrapper.set(DocumentMaterials::getFileStyle, documentMaterials.getFileStyle());
+ // 鎵ц鏇存柊鎿嶄綔
+ result = update(updateWrapper);
} catch (Exception e) {
System.out.println(e);
throw new ErrorcodeExceptionextends(500, "鍚屼竴涓鍗峰唴锛屼笉鍏佽椤电爜閲嶅锛�");
@@ -441,3 +423,5 @@
}
}
}
+
+
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 33e0958..59a903c 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
@@ -56,7 +56,7 @@
@Autowired
private IArchiveRecordsService iArchiveRecordsService;
-
+
// 鐢ㄤ簬鐢熸垚褰撳ぉ瀵煎嚭搴忓彿鐨勬柟娉�
private String generateDailySequence(String date) {
// 浣跨敤synchronized纭繚绾跨▼瀹夊叏
@@ -116,7 +116,7 @@
-
+
/**
* 灏咵xcel鎸囧畾瀛恠heet杞崲涓篜DF骞朵笅杞�
* @param response 鍝嶅簲瀵硅薄
@@ -129,22 +129,22 @@
// 璁剧疆鍝嶅簲澶�
response.setContentType(MediaType.APPLICATION_PDF_VALUE);
response.setHeader("Content-Disposition", "attachment; filename=sheet.pdf");
-
+
try {
// 浣跨敤Aspose.Cells璇诲彇Excel鏂囦欢
com.aspose.cells.Workbook wb = new com.aspose.cells.Workbook(excelPath);
-
+
// 鑾峰彇鎸囧畾鍚嶇О鐨勫瓙sheet
com.aspose.cells.Worksheet sheet = wb.getWorksheets().get(sheetName);
-
+
// 濡傛灉闇�瑕佽幏鍙栫储寮曟柟寮忕殑瀛恠heet锛屽彲浠ヤ娇鐢ㄤ互涓嬩唬鐮�
// com.aspose.cells.Worksheet sheet = wb.getWorksheets().get(0); // 鑾峰彇绗竴涓猻heet
-
+
// 鍒涘缓涓�涓柊鐨刉orkbook锛屽彧鍖呭惈鎸囧畾鐨剆heet
com.aspose.cells.Workbook newWorkbook = new com.aspose.cells.Workbook();
newWorkbook.getWorksheets().clear();
newWorkbook.getWorksheets().addCopy(sheet.getName());
-
+
// 灏咵xcel杞崲涓篜DF瀛楄妭鏁扮粍
java.io.ByteArrayOutputStream baos = new java.io.ByteArrayOutputStream();
newWorkbook.save(baos, com.aspose.cells.SaveFormat.PDF);
@@ -160,7 +160,7 @@
throw e;
}
}
-
+
/**
* 灏咵xcel鎵�鏈夊瓙sheet杞崲涓篜DF骞舵墦鍖呬笅杞�
* @param response 鍝嶅簲瀵硅薄
@@ -172,33 +172,33 @@
// 璁剧疆鍝嶅簲澶�
response.setContentType("application/zip");
response.setHeader("Content-Disposition", "attachment; filename=all_sheets.zip");
-
+
try (ServletOutputStream os = response.getOutputStream();
ZipOutputStream zos = new ZipOutputStream(os)) {
-
+
// 浣跨敤Aspose.Cells璇诲彇Excel鏂囦欢
com.aspose.cells.Workbook wb = new com.aspose.cells.Workbook(excelPath);
-
+
// 鑾峰彇鎵�鏈塻heet
com.aspose.cells.WorksheetCollection sheets = wb.getWorksheets();
-
+
// 閬嶅巻鎵�鏈塻heet
for (int i = 0; i < sheets.getCount(); i++) {
com.aspose.cells.Worksheet sheet = sheets.get(i);
String sheetName = sheet.getName();
-
+
// 鍒涘缓涓�涓柊鐨刉orkbook锛屽彧鍖呭惈褰撳墠sheet
com.aspose.cells.Workbook newWorkbook = new com.aspose.cells.Workbook();
newWorkbook.getWorksheets().clear();
newWorkbook.getWorksheets().addCopy(sheet.getName());
-
+
// 鍒涘缓涓存椂瀛楄妭杈撳嚭娴�
ByteArrayOutputStream baos = new ByteArrayOutputStream();
-
+
// 灏嗘柊鐨刉orkbook淇濆瓨涓篜DF鍒颁复鏃舵祦
newWorkbook.save(baos, com.aspose.cells.SaveFormat.PDF);
byte[] pdfBytes = baos.toByteArray();
-
+
// 鑾峰彇PDF鎬婚〉鏁�
// 灏哖DF娣诲姞鍒癦IP鏂囦欢
@@ -206,10 +206,10 @@
zos.putNextEntry(entry);
zos.write(pdfBytes);
zos.closeEntry();
-
+
System.out.println("Excel瀛恠heet \"" + sheetName + "\" 杞崲涓篜DF鎴愬姛");
}
-
+
System.out.println("Excel鎵�鏈夊瓙sheet杞崲涓篜DF骞舵墦鍖呮垚鍔�");
} catch (Exception e) {
e.printStackTrace();
@@ -266,47 +266,47 @@
}
String inpath= "妗堝嵎灏侀潰.xls";
long old = System.currentTimeMillis();
-
+
// 璁剧疆鍝嶅簲澶�
response.setContentType("application/pdf");
response.setHeader("Content-Disposition", "attachment; filename=import_template.pdf");
-
+
try {
// 璇诲彇Excel鏂囦欢
com.aspose.cells.Workbook wb = new com.aspose.cells.Workbook(inpath);
-
+
// 鑾峰彇闇�瑕佸鍑虹殑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 i = 0; i < wb.getWorksheets().getCount(); i++) {
if (i != targetSheetIndex) {
wb.getWorksheets().get(i).setVisible(false);
}
}
-
+
// 璁剧疆娲诲姩宸ヤ綔琛ㄤ负鐩爣宸ヤ綔琛�
wb.getWorksheets().setActiveSheetIndex(targetSheetIndex);
-
+
// 鍒涘缓PDF淇濆瓨閫夐」
com.aspose.cells.PdfSaveOptions pdfSaveOptions = new com.aspose.cells.PdfSaveOptions();
-
+
// 璁剧疆椤甸潰绫诲瀷涓篈4
-
+
// 纭繚鎵�鏈夊垪鍦ㄤ竴椤典笂
pdfSaveOptions.setAllColumnsInOnePagePerSheet(true);
-
+
// 璁剧疆鎵撳嵃椤甸潰绫诲瀷涓洪粯璁�
pdfSaveOptions.setCompliance(PdfCompliance.PDF_A_1_B); // 璁剧疆 PDF 鍏煎鎬ф爣鍑�
// 鐩存帴灏嗗師濮嬪伐浣滅翱淇濆瓨涓篜DF锛堝彧鍖呭惈鍙鐨勫伐浣滆〃锛�
wb.save(response.getOutputStream(), pdfSaveOptions);
-
+
long now = System.currentTimeMillis();
System.out.println("pdf杞崲鎴愬姛锛屽叡鑰楁椂锛�" + ((now - old) / 1000.0) + "绉�");
} catch (Exception e) {
@@ -314,7 +314,7 @@
// 鎵撳嵃璇︾粏閿欒淇℃伅
System.err.println("杞崲澶辫触锛�" + e.getMessage());
e.printStackTrace(System.err);
-
+
// 杩斿洖閿欒淇℃伅
response.reset();
response.setContentType("text/plain;charset=utf-8");
@@ -416,7 +416,7 @@
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
String formattedDate = date.format(formatter);
System.out.println(formattedDate);
-
+
// 鐢熸垚褰撳ぉ瀵煎嚭搴忓彿
String sequence = generateDailySequence(formattedDate);
String fna = "GH" + formattedDate + sequence + "/";
@@ -528,24 +528,107 @@
}
}
//09-澶囪�冭〃.pdf
+
+
+
+
+// pdfGenerateService.generateFileStyleInfo(pdf09Path, aIV.getRecordId(), ids[i]);
+// // 2. 鍘嬬缉PDF鍒癦IP鏂囦欢
+// // 娣诲姞PDF鏂囦欢鍒癦IP
+// ZipEntry zipEntry4 = new ZipEntry(fna + adir +"/"+pdf09Path);
+// zos.putNextEntry(zipEntry4);
+//
+// // 璇诲彇PDF鏂囦欢鍐呭骞跺啓鍏IP
+// try (FileInputStream fis = new FileInputStream(pdf09Path)) {
+// byte[] buffer = new byte[1024];
+// int len;
+// while ((len = fis.read(buffer)) > 0) {
+// zos.write(buffer, 0, len);
+// }
+// }
+
+
+ //09-澶囪�冭〃.pdf
String pdf09Path = "09-澶囪�冭〃.pdf";
+ // pdfGenerateService.generateFileStyleInfo(pdf09Path, aIV.getRecordId(), id);
+ //鎷垮埌鐩稿叧鏁版嵁
+ List<DocumentMaterialFileStyle> dmfs = documentMaterialsService.findFileStyleInfo(Math.toIntExact(ids[i]));
+
+ LocalDate currentDate = LocalDate.now();
+ String cdt = currentDate.getYear()+"骞�"+currentDate.getMonthValue()+"鏈�"+currentDate.getDayOfMonth()+"鏃�";
- pdfGenerateService.generateFileStyleInfo(pdf09Path, aIV.getRecordId(), ids[i]);
- // 2. 鍘嬬缉PDF鍒癦IP鏂囦欢
- // 娣诲姞PDF鏂囦欢鍒癦IP
- ZipEntry zipEntry4 = new ZipEntry(fna + adir +"/"+pdf09Path);
- zos.putNextEntry(zipEntry4);
-
- // 璇诲彇PDF鏂囦欢鍐呭骞跺啓鍏IP
- try (FileInputStream fis = new FileInputStream(pdf09Path)) {
- byte[] buffer = new byte[1024];
- int len;
- while ((len = fis.read(buffer)) > 0) {
- zos.write(buffer, 0, len);
+ HashMap<String, Object> hs = new HashMap<String, Object>();
+ int allPages = 0;
+ int texPages = 0;
+ int picPages = 0;
+ int patPages = 0;
+ if(!dmfs.isEmpty())
+ {
+ for(DocumentMaterialFileStyle documentMaterialFileStyle:dmfs)
+ {
+ if(documentMaterialFileStyle.getFileStyle().equals("鏂囧瓧鏉愭枡"))
+ texPages = documentMaterialFileStyle.getCnt();
+ if(documentMaterialFileStyle.getFileStyle().equals("鍥炬牱鏉愭枡"))
+ patPages = documentMaterialFileStyle.getCnt();
+ if(documentMaterialFileStyle.getFileStyle().equals("鐓х墖鏉愭枡"))
+ picPages = documentMaterialFileStyle.getCnt();
}
}
+ 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("time", cdt);
+
+ if (!getLicense()) {
+ System.out.println("娌℃湁鐩稿叧璇佷功锛�");
+ }
+
+
+ try {
+
+ // 鑾峰彇 Word 妯℃澘鎵�鍦ㄨ矾寰�
+ String filepath = "09-澶囪�冭〃.docx";
+ // 閫氳繃 XWPFTemplate 缂栬瘧鏂囦欢骞舵覆鏌撴暟鎹埌妯℃澘涓�
+ XWPFTemplate template = XWPFTemplate.compile(filepath).render(hs
+ );
+
+ String renderedDocPath = "rendered_output.docx";
+ File renderedFile = new File(renderedDocPath);
+ try {
+ // 灏嗗畬鎴愭暟鎹覆鏌撶殑鏂囨。鍐欏嚭
+ template.writeAndClose(new FileOutputStream(renderedFile));
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ com.aspose.words.Document doc = new com.aspose.words.Document("rendered_output.docx");
+ // 鍒涘缓涓存椂瀛楄妭杈撳嚭娴�
+ ByteArrayOutputStream baobk = new ByteArrayOutputStream();
+ // 灏哤ord鏂囨。杞崲涓篜DF瀛楄妭鏁扮粍
+ doc.save(baobk, com.aspose.words.SaveFormat.PDF);//全锟斤拷支锟斤拷DOC, DOCX, OOXML, RTF HTML, OpenDocument, PDF, EPUB, XPS, SWF 锟洁互转锟斤拷
+ ZipEntry zipEntry4 = new ZipEntry(fna + adir +"/"+pdf09Path);
+ zos.putNextEntry(zipEntry4);
+ baobk.writeTo(zos);
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+
+
+ // com.aspose.words.Document doc = new com.aspose.words.Document("09-澶囪�冭〃.docx");
+
+
+
+
+
+
+
//excel 鍗峰唴灏侀潰瀵煎嚭zip
ZipEntry entryiv = new ZipEntry(fna + adir +"/"+"妗堝嵎灏侀潰" + ".xls");
@@ -867,23 +950,30 @@
String cdt = currentDate.getYear()+"骞�"+currentDate.getMonthValue()+"鏈�"+currentDate.getDayOfMonth()+"鏃�";
HashMap<String, Object> hs = new HashMap<String, Object>();
- if(dmfs.isEmpty())
+ int allPages = 0;
+ int texPages = 0;
+ int picPages = 0;
+ int patPages = 0;
+ if(!dmfs.isEmpty())
{
- //鍏ㄩ儴鏁版嵁鍊间负0
- hs.put("pages", 0);
- hs.put("volumeNumber", aIV.getRecordId());
- hs.put("time", cdt);
-
+ for(DocumentMaterialFileStyle documentMaterialFileStyle:dmfs)
+ {
+ if(documentMaterialFileStyle.getFileStyle().equals("鏂囧瓧鏉愭枡"))
+ texPages = documentMaterialFileStyle.getCnt();
+ if(documentMaterialFileStyle.getFileStyle().equals("鍥炬牱鏉愭枡"))
+ patPages = documentMaterialFileStyle.getCnt();
+ if(documentMaterialFileStyle.getFileStyle().equals("鐓х墖鏉愭枡"))
+ picPages = documentMaterialFileStyle.getCnt();
+ }
}
- else {
- int pcc = dmfs.size()<=1?0: dmfs.get(1).getCnt();
- int oth = dmfs.size()<=2?0: dmfs.get(2).getCnt();
- int allCnt = dmfs.get(0).getCnt() + pcc + oth;
- hs.put("pages", allCnt);
- hs.put("volumeNumber", aIV.getRecordId());
- hs.put("time", cdt);
+ 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("time", cdt);
- }
if (!getLicense()) {
System.out.println("娌℃湁鐩稿叧璇佷功锛�");
}
@@ -1169,25 +1259,26 @@
res = false;
}
//寰楀埌鏂囦欢鍚峟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("01-鐢宠鏉愭枡/"+fname));
- else if(dc.getStage().equals("02-鍔炴杩囩▼鏉愭枡"))
- zos.putNextEntry(new ZipEntry("02-鍔炴杩囩▼鏉愭枡/"+fname));
- else if(dc.getStage().equals("03-缁撹鎬ф枃浠�"))
- zos.putNextEntry(new ZipEntry("03-缁撹鎬ф枃浠�/"+fname));
- else if(dc.getStage().equals("04-鍏朵粬鏉愭枡")) {
- zos.putNextEntry(new ZipEntry("04-鍏朵粬鏉愭枡/" + 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("01-鐢宠鏉愭枡/" + fname));
+ else if (dc.getStage().equals("02-鍔炴杩囩▼鏉愭枡"))
+ zos.putNextEntry(new ZipEntry("02-鍔炴杩囩▼鏉愭枡/" + fname));
+ else if (dc.getStage().equals("03-缁撹鎬ф枃浠�"))
+ zos.putNextEntry(new ZipEntry("03-缁撹鎬ф枃浠�/" + fname));
+ else if (dc.getStage().equals("04-鍏朵粬鏉愭枡")) {
+ zos.putNextEntry(new ZipEntry("04-鍏朵粬鏉愭枡/" + fname));
+ } else if (dc.getStage().equals("05-妗ｆ鍙樻洿鏉愭枡"))
+ zos.putNextEntry(new ZipEntry("05-妗ｆ鍙樻洿鏉愭枡/" + fname));
+ else if (dc.getStage().equals("06-涓氬姟鏁版嵁"))
+ zos.putNextEntry(new ZipEntry("06-涓氬姟鏁版嵁/" + fname));
+ else
+ zos.putNextEntry(new ZipEntry(fname));
+
}
- else if(dc.getStage().equals("05-妗ｆ鍙樻洿鏉愭枡"))
- zos.putNextEntry(new ZipEntry("05-妗ｆ鍙樻洿鏉愭枡/"+fname));
- else if(dc.getStage().equals("06-涓氬姟鏁版嵁"))
- zos.putNextEntry(new ZipEntry("06-涓氬姟鏁版嵁/"+fname));
- else
- zos.putNextEntry(new ZipEntry(fname));
-
-
int len;
FileInputStream in = new FileInputStream(tempFile);
--
Gitblit v1.9.1