From d30e385951ce03335a5023f0775fd144da3c0b88 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 18 三月 2025 11:18:31 +0800
Subject: [PATCH] 修改

---
 src/main/java/com/example/client/service/ImportTrackRecordService.java |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/example/client/service/ImportTrackRecordService.java b/src/main/java/com/example/client/service/ImportTrackRecordService.java
index b411498..952b9c8 100644
--- a/src/main/java/com/example/client/service/ImportTrackRecordService.java
+++ b/src/main/java/com/example/client/service/ImportTrackRecordService.java
@@ -4,7 +4,6 @@
 import com.example.client.dto.JComboBoxItem;
 import com.example.client.utils.*;
 import com.example.server.cabin.service.CabinService;
-import com.example.server.progressTrack.model.DjJdgzNetworkLevel3;
 import com.example.server.progressTrack.model.DjJdgzTrackRecord;
 import com.example.server.progressTrack.service.*;
 import com.example.server.teamGroup.service.SysTeamGroupClassService;
@@ -38,7 +37,7 @@
     @Autowired
     private Level3ManageService level3ManageService;
     @Autowired
-    private DjJdgzNetworkLevel3Service level3Service;
+    private TrackRecordManageService trackRecordManageService;
     @Autowired
     private DjJdgzNetworkLevel2ListService level2ListService;
     @Autowired
@@ -83,7 +82,7 @@
         JLabel label0 = new JLabel("宸ョ▼");
         JComboBox<JComboBoxItem> comboBox0 = new JComboBox<>(projectList);
 
-        JLabel label1 = new JLabel("浜岀骇缃戠粶鍥�");
+        JLabel label1 = new JLabel("涓�绾х綉缁滃浘鑺傜偣");
         JComboBox<JComboBoxItem> comboBox1 = new JComboBox<>();
         comboBox1.setModel(new DefaultComboBoxModel<>(level2List));
 
@@ -297,7 +296,7 @@
 
 
                         String filePath = result.toString();
-                        String flag = level3Service.importDiagramFromExcel(filePath, level1Id[0], level2Id[0], level2NodeId[0]);
+                        String flag = djJdgzTrackRecordService.importDiagramFromExcel(filePath);
                         return flag;
                     }
 
@@ -315,11 +314,11 @@
                                 JComboBoxItem[] teamList = sysTeamGroupClassService.getTeamList(null);
                                 JComboBoxItem[] cabinList = cabinService.getList();
                                 String[] typeList = new String[]{
-                "鏀硅", "鍔犺", "鎹㈣", "鏀硅繘鎬т慨鐞�",""
-        };
-                                List<DjJdgzNetworkLevel3> list = level3Service.getList(null, deptList[0].getId(), teamList[0].getId(), cabinList[0].getId(), typeList[0],null);
+                                        "鏀硅", "鍔犺", "鎹㈣", "鏀硅繘鎬т慨鐞�", ""
+                                };
+                                List<DjJdgzTrackRecord> list = djJdgzTrackRecordService.getList(level1Id[0], deptList[0].getId(), teamList[0].getId(), cabinList[0].getId(), typeList[0], 0, null);
                                 CommonTable.refreshTable(list, columnDto, subTable);
-                                level3ManageService.tableModelListener(list, subTable, jFrame);
+                                trackRecordManageService.tableModelListener(subTable, jFrame, list);
                                 System.out.println("瀵煎叆鎴愬姛鏃堕棿" + new Date());
                             } else {
                                 waitUtil.dispose();

--
Gitblit v1.9.1