From e7ab049344b954b044fc474992c378fcbbeeba33 Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期日, 08 二月 2026 19:08:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/ExportService.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/ExportService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/ExportService.java
index 05887ef..0a6754e 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/ExportService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/ExportService.java
@@ -214,6 +214,18 @@
}
}
+ //閫氱煡鍗曠紪鐮�
+ cell = row.getCell(cellNum++);
+ if(cell == null || cell.getCellType() == CellType.BLANK){
+ resultData.setNoticeId("");
+ }else {
+ cell.setCellType(CellType.STRING);
+ String noticeId = cell.getStringCellValue().trim();
+ if(StringUtils.isNotEmpty(noticeId)){
+ resultData.setNoticeId(noticeId);
+ }
+ }
+
//瑁呭嵏浠撳簱
cell = row.getCell(cellNum++);
if(cell == null || cell.getCellType() == CellType.BLANK){
@@ -348,6 +360,9 @@
}
}
+ if(null != resultData.getFullWeight() && null != resultData.getEmptyWeight()){
+ resultData.setNetWeight(resultData.getFullWeight() - resultData.getEmptyWeight());
+ }
return resultData;
}
--
Gitblit v1.9.3