From 77d58298d00c11ade8862ca8acb0fdef5a45322e Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 21 三月 2025 17:39:38 +0800
Subject: [PATCH] 修改
---
src/main/java/com/example/client/service/ImportTrackRecordService.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 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..2d8bb90 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;
@@ -18,10 +17,7 @@
import java.awt.*;
import java.awt.datatransfer.DataFlavor;
import java.awt.datatransfer.Transferable;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
+import java.awt.event.*;
import java.io.File;
import java.util.Date;
import java.util.List;
@@ -38,7 +34,7 @@
@Autowired
private Level3ManageService level3ManageService;
@Autowired
- private DjJdgzNetworkLevel3Service level3Service;
+ private TrackRecordManageService trackRecordManageService;
@Autowired
private DjJdgzNetworkLevel2ListService level2ListService;
@Autowired
@@ -63,6 +59,13 @@
frame.setVisible(true);
GridBagLayout layout = new GridBagLayout();
frame.setLayout(layout);
+ frame.addWindowListener(new WindowAdapter() {
+ //娣诲姞绗簩涓晫闈㈢殑鍏抽棴浜嬩欢:
+ public void windowClosing(WindowEvent e) {
+ //娣诲姞浜嬩欢:
+ jFrame.setEnabled(true);//灏嗕富鐣岄潰鍐嶈缃负鍙搷浣滅殑
+ }
+ });
table = new JTable();
table.setRowHeight(40);
@@ -83,7 +86,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 +300,7 @@
String filePath = result.toString();
- String flag = level3Service.importDiagramFromExcel(filePath, level1Id[0], level2Id[0], level2NodeId[0]);
+ String flag = djJdgzTrackRecordService.importDiagramFromExcel(filePath);
return flag;
}
@@ -311,15 +314,16 @@
if (uploadSucceeded.equals("true")) {
waitUtil.dispose();
frame.dispose();
+ jFrame.setEnabled(true);//灏嗕富鐣岄潰鍐嶈缃负鍙搷浣滅殑
JComboBoxItem[] deptList = sysTeamGroupClassService.getDeptList();
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