From f68f5bf6ae56c18561eb8ccba9fb9693f128551c Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 11 二月 2026 09:36:07 +0800
Subject: [PATCH] 客户问题优化调整9
---
fzzy-igdss-web/src/main/java/com/fzzy/common/ExportController.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/common/ExportController.java b/fzzy-igdss-web/src/main/java/com/fzzy/common/ExportController.java
index ac171c2..3baa207 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/common/ExportController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/common/ExportController.java
@@ -69,6 +69,17 @@
}
/**
+ * 瀵煎嚭word骞朵笅杞�
+ *
+ * @param response
+ */
+ @RequestMapping("/download-inout-excel")
+ public void downloadInoutExcel(HttpServletResponse response) {
+
+ exportManager.downloadInoutExcel(response);
+ }
+
+ /**
* PDF鍦ㄧ嚎棰勮
*
* @param response
@@ -125,8 +136,9 @@
sheetName = "鍏ュ簱鎶ヨ〃鏁版嵁";
list = reportInoutPR.listRecord(param);
List<InoutRecordInExport> exportList = new ArrayList<>();
+ InoutRecordInExport export;
for (InoutRecord record : list) {
- InoutRecordInExport export = new InoutRecordInExport();
+ export = new InoutRecordInExport();
export.setId(record.getId());
export.setPlateNum(record.getPlateNum());
// 灏嗕粨搴揑D鏄犲皠涓轰粨搴撳悕绉�
@@ -142,6 +154,7 @@
export.setRecordWeight(record.getRecordWeight());
export.setCompleteTime(record.getCompleteTime());
export.setDeOther(record.getDeOther());
+ export.setUpdateLog(record.getUpdateLog());
exportList.add(export);
}
ExcelUtil<InoutRecordInExport> util = new ExcelUtil<InoutRecordInExport>(InoutRecordInExport.class);
@@ -152,8 +165,9 @@
sheetName = "鍑哄簱鎶ヨ〃鏁版嵁";
list = reportInoutPR.listRecord(param);
List<InoutRecordOutExport> exportList = new ArrayList<>();
+ InoutRecordOutExport export;
for (InoutRecord record : list) {
- InoutRecordOutExport export = new InoutRecordOutExport();
+ export = new InoutRecordOutExport();
export.setId(record.getId());
export.setPlateNum(record.getPlateNum());
// 灏嗕粨搴揑D鏄犲皠涓轰粨搴撳悕绉�
@@ -169,6 +183,7 @@
export.setRecordWeight(record.getRecordWeight());
export.setCompleteTime(record.getCompleteTime());
export.setDeOther(record.getDeOther());
+ export.setUpdateLog(record.getUpdateLog());
exportList.add(export);
}
ExcelUtil<InoutRecordOutExport> util = new ExcelUtil<InoutRecordOutExport>(InoutRecordOutExport.class);
@@ -179,8 +194,9 @@
sheetName = "鍏ュ簱鏄庣粏鎶ヨ〃鏁版嵁";
list = reportInoutPR.listRecord(param);
List<InoutRecordDetailInExport> exportList = new ArrayList<>();
+ InoutRecordDetailInExport export;
for (InoutRecord record : list) {
- InoutRecordDetailInExport export = new InoutRecordDetailInExport();
+ export = new InoutRecordDetailInExport();
//鏀跺偍鍏徃鏄犲皠
String companyNameValue = companyMap.get(record.getCompanyId());
export.setCompanyId(companyNameValue != null ? companyNameValue : "");
@@ -198,6 +214,7 @@
export.setSettleWeight(record.getSettleWeight());
export.setRecordWeight(record.getRecordWeight());
export.setCompleteTime(record.getCompleteTime());
+ export.setUpdateLog(record.getUpdateLog());
exportList.add(export);
}
ExcelUtil<InoutRecordDetailInExport> util = new ExcelUtil<InoutRecordDetailInExport>(InoutRecordDetailInExport.class);
@@ -208,8 +225,9 @@
sheetName = "鍑哄簱鏄庣粏鎶ヨ〃鏁版嵁";
list = reportInoutPR.listRecord(param);
List<InoutRecordDetailOutExport> exportList = new ArrayList<>();
+ InoutRecordDetailOutExport export;
for (InoutRecord record : list) {
- InoutRecordDetailOutExport export = new InoutRecordDetailOutExport();
+ export = new InoutRecordDetailOutExport();
//鏀跺偍鍏徃鏄犲皠
String companyNameValue = companyMap.get(record.getCompanyId());
export.setCompanyId(companyNameValue != null ? companyNameValue : "");
@@ -227,6 +245,7 @@
export.setSettleWeight(record.getSettleWeight());
export.setRecordWeight(record.getRecordWeight());
export.setCompleteTime(record.getCompleteTime());
+ export.setUpdateLog(record.getUpdateLog());
exportList.add(export);
}
ExcelUtil<InoutRecordDetailOutExport> util = new ExcelUtil<InoutRecordDetailOutExport>(InoutRecordDetailOutExport.class);
--
Gitblit v1.9.3