From efce7ce3e63712ecc8b4c3039a73b508fc3ea880 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 28 四月 2025 10:20:37 +0800
Subject: [PATCH] 修改
---
src/main/java/com/example/server/progressTrack/service/DjJdgzDismantTrackService.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/example/server/progressTrack/service/DjJdgzDismantTrackService.java b/src/main/java/com/example/server/progressTrack/service/DjJdgzDismantTrackService.java
index b222e69..cdef401 100644
--- a/src/main/java/com/example/server/progressTrack/service/DjJdgzDismantTrackService.java
+++ b/src/main/java/com/example/server/progressTrack/service/DjJdgzDismantTrackService.java
@@ -93,7 +93,7 @@
sheetName = sheet.getSheetName(); //鑾峰彇褰撳墠sheet鍚嶇О
sum = sum + num;
- List<DjJdgzNetworkLevel3> list = djJdgzNetworkLevel3Service.getList(null, null, null, null, null,null);
+ List<DjJdgzNetworkLevel3> list = djJdgzNetworkLevel3Service.getList(null, null, null, null, null,null,null,null);
JComboBoxItem[] list1 = cabinService.getList();
@@ -113,7 +113,7 @@
String curSbName = "";
Long curSbId = null;
- for (int j = 1; j <= num; j++) {
+ for (int j = 2; j <= num; j++) {
DjJdgzDismantTrack data = new DjJdgzDismantTrack();
boolean isErr = false;
@@ -325,15 +325,15 @@
columnDto.add(new ExcelColumnDto("鎷嗗嵏鏃堕棿", "dismantTime", 15, HorizontalAlignment.CENTER));
columnDto.add(new ExcelColumnDto("鎷嗗嵏鍗曚綅", "dismantUnit", 25, HorizontalAlignment.LEFT));
columnDto.add(new ExcelColumnDto("鎷嗗嵏浜哄憳", "dismantStaff", 15, HorizontalAlignment.LEFT));
- columnDto.add(new ExcelColumnDto("鎷嗗嵏鍔╀慨鑹囧憳", "dismantAssistant", 10, HorizontalAlignment.LEFT));
+ columnDto.add(new ExcelColumnDto("鎷嗗嵏鍔╀慨T鍛�", "dismantAssistant", 10, HorizontalAlignment.LEFT));
columnDto.add(new ExcelColumnDto("鍑鸿埍鏃堕棿", "exitTime", 10, HorizontalAlignment.CENTER));
columnDto.add(new ExcelColumnDto("鍑鸿埍鍗曚綅", "exitUnit", 10, HorizontalAlignment.LEFT));
columnDto.add(new ExcelColumnDto("鍑鸿埍浜哄憳", "exitStaff", 15, HorizontalAlignment.LEFT));
- columnDto.add(new ExcelColumnDto("鍑鸿埍鍔╀慨鑹囧憳", "exitAssistant", 20, HorizontalAlignment.LEFT));
+ columnDto.add(new ExcelColumnDto("鍑鸿埍鍔╀慨T鍛�", "exitAssistant", 20, HorizontalAlignment.LEFT));
columnDto.add(new ExcelColumnDto("閫�閲嶆椂闂�", "returnWeightTime", 20, HorizontalAlignment.CENTER));
columnDto.add(new ExcelColumnDto("绉伴噸鍛�", "weigher", 15, HorizontalAlignment.LEFT));
columnDto.add(new ExcelColumnDto("閫�閲嶉噸閲�", "returnWeight", 15, HorizontalAlignment.RIGHT));
- columnDto.add(new ExcelColumnDto("閫�閲嶅姪淇墖鍛�", "returnWeightAssistant", 20, HorizontalAlignment.LEFT));
+ columnDto.add(new ExcelColumnDto("閫�閲嶅姪淇甌鍛�", "returnWeightAssistant", 20, HorizontalAlignment.LEFT));
columnDto.add(new ExcelColumnDto("鍏ュ簱鏃堕棿", "warehouseTime", 15, HorizontalAlignment.CENTER));
columnDto.add(new ExcelColumnDto("鍏ュ簱浜哄憳", "warehouseStaff", 15, HorizontalAlignment.LEFT));
columnDto.add(new ExcelColumnDto("褰撳墠瀛樻斁浣嶇疆", "currentLocation", 15, HorizontalAlignment.LEFT));
@@ -390,4 +390,16 @@
public List<StatistDismantDto> getStatist(Long level1Id) {
return baseDao.getStatist(level1Id);
}
+
+ public Boolean getStatus(Long level3NetworkId) {
+ return baseDao.getStatus(level3NetworkId);
+ }
+
+ public void delete(Long id) {
+ baseDao.deleteById(id);
+ }
+
+ public List<StatistDismantDto> getStatist2(Long level1Id, Long id) {
+ return baseDao.getStatist2(level1Id,id);
+ }
}
--
Gitblit v1.9.1