From 4f4e7d8f32289be22bccadbe338abef784070393 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期一, 09 三月 2026 15:05:49 +0800
Subject: [PATCH] 导出添加制表人，制表时间，查询时间
---
fzzy-igdss-web/src/main/java/com/fzzy/common/ExportController.java | 98 +++++++++++++++++++++++++++++++-----------------
1 files changed, 63 insertions(+), 35 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 4011932..dcf006b 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
@@ -1,7 +1,10 @@
package com.fzzy.common;
import com.fzzy.common.manager.ExportManager;
-import com.fzzy.igds.*;
+import com.fzzy.igds.CompanyPR;
+import com.fzzy.igds.DepotPR;
+import com.fzzy.igds.DeptPR;
+import com.fzzy.igds.ReportInoutPR;
import com.fzzy.igds.constant.FoodVariety;
import com.fzzy.igds.data.*;
import com.fzzy.igds.domain.Company;
@@ -19,17 +22,15 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
+
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
import java.util.stream.Collectors;
/**
- * @Description 鏁版嵁瀵煎嚭鍏ュ彛
+ * @Description 鏁版嵁瀵煎嚭鍏ュ彛
* @Author CZT
* @Date 2025/12/29 10:32
*/
@@ -101,6 +102,7 @@
/**
* 鍑哄叆搴撴姤琛ㄥ鍑�
+ *
* @return
*/
@RequestMapping("/inout-excel")
@@ -116,6 +118,19 @@
if (null != subDept) {
deptName = subDept.getDeptName();
}
+ String exportTimeDesc = "";
+ String exportCreateUser = "";
+ Date exportCreateTime = new Date();
+ if (StringUtils.isNotEmpty(param.getTimeDesc())) {
+ exportTimeDesc = param.getTimeDesc();
+ }
+ if (StringUtils.isNotEmpty(param.getCreateUser())) {
+ exportCreateUser = param.getCreateUser();
+ }
+ if (param.getCreateTime() != null) {
+ exportCreateTime = param.getCreateTime();
+ }
+
//鍒涘缓鏀跺偍鍏徃ID鍒板悕绉扮殑鏄犲皠
Map<String, String> companyMap = Optional.ofNullable(companyPR.getData())
.orElse(new ArrayList<>())
@@ -148,18 +163,18 @@
//绮鍝佺鏄犲皠
String foodVarietyNameValue = FoodVariety.getMsg(record.getFoodVariety());
export.setFoodVariety(foodVarietyNameValue != null ? foodVarietyNameValue : "");
- export.setFullWeight(df.format(record.getFullWeight())+"KG");
- export.setEmptyWeight(df.format(record.getEmptyWeight())+"KG");
- export.setNetWeight(df.format(record.getNetWeight())+"KG");
- export.setSettleWeight(df.format(record.getSettleWeight())+"KG");
- export.setRecordWeight(df.format(record.getRecordWeight())+"KG");
+ export.setFullWeight(df.format(record.getFullWeight()) + "KG");
+ export.setEmptyWeight(df.format(record.getEmptyWeight()) + "KG");
+ export.setNetWeight(df.format(record.getNetWeight()) + "KG");
+ export.setSettleWeight(df.format(record.getSettleWeight()) + "KG");
+ export.setRecordWeight(df.format(record.getRecordWeight()) + "KG");
export.setCompleteTime(record.getCompleteTime());
- export.setDeOther(df.format(record.getDeOther())+"KG");
+ export.setDeOther(df.format(record.getDeOther()) + "KG");
export.setUpdateLog(record.getUpdateLog());
exportList.add(export);
}
ExcelUtil<InoutRecordInExport> util = new ExcelUtil<InoutRecordInExport>(InoutRecordInExport.class);
- return util.exportExcel(exportList, sheetName, deptName);
+ return util.exportExcel(exportList, sheetName, deptName, exportTimeDesc, exportCreateUser, exportCreateTime);
}
if (StringUtils.isNotEmpty(param.getType()) && "OUT".equals(param.getType())) {
@@ -177,18 +192,18 @@
//绮鍝佺鏄犲皠
String foodVarietyNameValue = FoodVariety.getMsg(record.getFoodVariety());
export.setFoodVariety(foodVarietyNameValue != null ? foodVarietyNameValue : "");
- export.setFullWeight(df.format(record.getFullWeight())+"KG");
- export.setEmptyWeight(df.format(record.getEmptyWeight())+"KG");
- export.setNetWeight(df.format(record.getNetWeight())+"KG");
- export.setSettleWeight(df.format(record.getSettleWeight())+"KG");
- export.setRecordWeight(df.format(record.getRecordWeight())+"KG");
+ export.setFullWeight(df.format(record.getFullWeight()) + "KG");
+ export.setEmptyWeight(df.format(record.getEmptyWeight()) + "KG");
+ export.setNetWeight(df.format(record.getNetWeight()) + "KG");
+ export.setSettleWeight(df.format(record.getSettleWeight()) + "KG");
+ export.setRecordWeight(df.format(record.getRecordWeight()) + "KG");
export.setCompleteTime(record.getCompleteTime());
- export.setDeOther(df.format(record.getDeOther())+"KG");
+ export.setDeOther(df.format(record.getDeOther()) + "KG");
export.setUpdateLog(record.getUpdateLog());
exportList.add(export);
}
ExcelUtil<InoutRecordOutExport> util = new ExcelUtil<InoutRecordOutExport>(InoutRecordOutExport.class);
- return util.exportExcel(exportList, sheetName, deptName);
+ return util.exportExcel(exportList, sheetName, deptName, exportTimeDesc, exportCreateUser, exportCreateTime);
}
if (StringUtils.isNotEmpty(param.getType()) && "IN_DETAIL".equals(param.getType())) {
@@ -213,14 +228,14 @@
//绮鍝佺鏄犲皠
String foodVarietyNameValue = FoodVariety.getMsg(record.getFoodVariety());
export.setFoodVariety(foodVarietyNameValue != null ? foodVarietyNameValue : "");
- export.setSettleWeight(df.format(record.getSettleWeight())+"KG");
- export.setRecordWeight(df.format(record.getRecordWeight())+"KG");
+ export.setSettleWeight(df.format(record.getSettleWeight()) + "KG");
+ export.setRecordWeight(df.format(record.getRecordWeight()) + "KG");
export.setCompleteTime(record.getCompleteTime());
export.setUpdateLog(record.getUpdateLog());
exportList.add(export);
}
ExcelUtil<InoutRecordDetailInExport> util = new ExcelUtil<InoutRecordDetailInExport>(InoutRecordDetailInExport.class);
- return util.exportExcel(exportList, sheetName, deptName);
+ return util.exportExcel(exportList, sheetName, deptName, exportTimeDesc, exportCreateUser, exportCreateTime);
}
if (StringUtils.isNotEmpty(param.getType()) && "OUT_DETAIL".equals(param.getType())) {
@@ -245,20 +260,21 @@
//绮鍝佺鏄犲皠
String foodVarietyNameValue = FoodVariety.getMsg(record.getFoodVariety());
export.setFoodVariety(foodVarietyNameValue != null ? foodVarietyNameValue : "");
- export.setSettleWeight(df.format(record.getSettleWeight())+"KG");
- export.setRecordWeight(df.format(record.getRecordWeight())+"KG");
+ export.setSettleWeight(df.format(record.getSettleWeight()) + "KG");
+ export.setRecordWeight(df.format(record.getRecordWeight()) + "KG");
export.setCompleteTime(record.getCompleteTime());
export.setUpdateLog(record.getUpdateLog());
exportList.add(export);
}
ExcelUtil<InoutRecordDetailOutExport> util = new ExcelUtil<InoutRecordDetailOutExport>(InoutRecordDetailOutExport.class);
- return util.exportExcel(exportList, sheetName, deptName);
+ return util.exportExcel(exportList, sheetName, deptName, exportTimeDesc, exportCreateUser, exportCreateTime);
}
return AjaxResult.error("鍙傛暟閿欒");
}
/**
* 搴撳瓨鎶ヨ〃瀵煎嚭
+ *
* @return
*/
@RequestMapping("/storage-excel")
@@ -274,27 +290,39 @@
if (null != subDept) {
deptName = subDept.getDeptName();
}
+ String exportTimeDesc = "";
+ String exportCreateUser = "";
+ Date exportCreateTime = new Date();
+ if (StringUtils.isNotEmpty(param.getTimeDesc())) {
+ exportTimeDesc = param.getTimeDesc();
+ }
+ if (StringUtils.isNotEmpty(param.getCreateUser())) {
+ exportCreateUser = param.getCreateUser();
+ }
+ if (param.getCreateTime() != null) {
+ exportCreateTime = param.getCreateTime();
+ }
List<SuperInventoryReportExport> exportList = new ArrayList<>();
DecimalFormat df = new DecimalFormat("0.00");
- for (SuperInventoryReportData data :list) {
+ for (SuperInventoryReportData data : list) {
SuperInventoryReportExport export = new SuperInventoryReportExport();
export.setCustomerName(data.getCustomerName());
export.setDeptName(data.getDeptName());
export.setDepotName(data.getDepotName());
- export.setInitialWeight(df.format(data.getInitialWeight())+"KG");
- export.setRecordInWeight(df.format(data.getRecordInWeight())+"KG");
- export.setChangeInWeight(df.format(data.getChangeInWeight())+"KG");
- export.setRecordOutWeight(df.format(data.getRecordOutWeight())+"KG");
- export.setChangeOutWeight(df.format(data.getChangeOutWeight())+"KG");
- export.setLossWeight(df.format(data.getLossWeight())+"KG");
- export.setFinalWeight(df.format(data.getFinalWeight())+"KG");
+ export.setInitialWeight(df.format(data.getInitialWeight()) + "KG");
+ export.setRecordInWeight(df.format(data.getRecordInWeight()) + "KG");
+ export.setChangeInWeight(df.format(data.getChangeInWeight()) + "KG");
+ export.setRecordOutWeight(df.format(data.getRecordOutWeight()) + "KG");
+ export.setChangeOutWeight(df.format(data.getChangeOutWeight()) + "KG");
+ export.setLossWeight(df.format(data.getLossWeight()) + "KG");
+ export.setFinalWeight(df.format(data.getFinalWeight()) + "KG");
exportList.add(export);
}
//瀵煎嚭
ExcelUtil<SuperInventoryReportExport> util = new ExcelUtil<SuperInventoryReportExport>(SuperInventoryReportExport.class);
- return util.exportExcel(exportList, sheetName, deptName);
+ return util.exportExcel(exportList, sheetName, deptName, exportTimeDesc, exportCreateUser, exportCreateTime);
}
}
--
Gitblit v1.9.3