From f0aae4b39afbcbb18fb5a0b32e3ca689662c5ca7 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 10 三月 2025 08:21:31 +0800
Subject: [PATCH] jar

---
 src/main/java/com/example/client/service/DismantTrackAddOrUpdate.java |   40 ++++++++++++++++++++++++++++------------
 1 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/example/client/service/DismantTrackAddOrUpdate.java b/src/main/java/com/example/client/service/DismantTrackAddOrUpdate.java
index cf8ac81..86726ce 100644
--- a/src/main/java/com/example/client/service/DismantTrackAddOrUpdate.java
+++ b/src/main/java/com/example/client/service/DismantTrackAddOrUpdate.java
@@ -33,13 +33,20 @@
     @Autowired
     private DjJdgzDismantTrackService djJdgzDismantTrackService;
     @Autowired
+    private DjJdgzNetworkLevel3Service djJdgzNetworkLevel3Service;
+    @Autowired
     private StatisDismantService statisDismantService;
+    @Autowired
+    private StatisDismant2Service statisDismant2Service;
     @Autowired
     private CabinService cabinService;
     private  JTable trackTable;
     private   List<ColumnDto> columnDto;
+    private   DjJdgzNetworkLevel3 nowLevel3;
+    private    List<DjJdgzDismantTrack> list;
 
     public JPanel createTrack(Integer width, Integer height, DjJdgzNetworkLevel3 djJdgzNetworkLevel3,JFrame frame) {
+        nowLevel3 = djJdgzNetworkLevel3;
         JPanel panel = new JPanel(new BorderLayout());
         panel.setPreferredSize(new Dimension(width, height));
 
@@ -52,23 +59,25 @@
         panel.add(centerJpanel, BorderLayout.CENTER);
         panel.add(topJpanel, BorderLayout.NORTH);
 
-        JButton btnTj = new JButton("缁熻鎶ヨ〃");
+        JButton btnTjz = new JButton("鎷嗗嵏杩涘害缁熻鎬昏〃");
+        JButton btnTj = new JButton("鎷嗗嵏杩涘害璇︽儏琛�");
         JButton btnExport = new JButton("瀵煎嚭鎷嗗嵏鎶ヨ〃");
         JButton btnSave = new JButton("淇濆瓨");
         JButton btnImport = new JButton("鎵归噺瀵煎叆");
 
+        topJpanel.add(btnTjz);
         topJpanel.add(btnTj);
         topJpanel.add(btnExport);
         topJpanel.add(btnSave);
         topJpanel.add(btnImport);
 
-        List<DjJdgzDismantTrack> list = djJdgzDismantTrackService.getList(djJdgzNetworkLevel3.getId(), null);
+        list = djJdgzDismantTrackService.getList(nowLevel3.getId(), null);
         List<TableButton> buttonList = new ArrayList<>();
         buttonList.add(new TableButton("edit", "缂栬緫"));
         JComboBoxItem[] cabinList = cabinService.getList();
         JComboBoxItem[] statusList = {
-                new JComboBoxItem(0, "杩涜涓�"),
-                new JComboBoxItem(1, "宸插畬鎴�"),
+                new JComboBoxItem(0L, "杩涜涓�"),
+                new JComboBoxItem(1L, "宸插畬鎴�"),
         };
 
         // 鍒涘缓宸︿晶琛ㄦ牸
@@ -92,11 +101,11 @@
         columnDto.add(new ColumnDto("鍏ュ簱鏃堕棿", "warehouseTime", 130, "selectDate", true, null, null));
         columnDto.add(new ColumnDto("鍏ュ簱浜哄憳", "warehouseStaff", 120, null, true, null, null));
         columnDto.add(new ColumnDto("褰撳墠瀛樻斁浣嶇疆", "currentLocation", 160, null, true, null, null));
-        columnDto.add(new ColumnDto("鐘舵��", "status", 120, "dict", true, null, statusList));
+        columnDto.add(new ColumnDto("鐘舵��", "status", 120, "dicts", true, null, statusList));
 
         trackTable = CommonTable.createCommonTable(list, columnDto);
         trackTable.setRowHeight(25);
-        trackTable.setAutoCreateRowSorter(true);
+
         trackTable.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
 
 
@@ -113,10 +122,16 @@
         trackTable = new ComplexTable(headerRows,body);
         CommonTable.setColumnType(columnDto, trackTable);*/
 
+        btnTjz.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                statisDismantService.createTable(frame,nowLevel3.getLevel1NetworkId());
+            }
+        });
         btnTj.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                statisDismantService.createTable(frame,djJdgzNetworkLevel3.getLevel1NetworkId());
+                statisDismant2Service.createTable(frame,nowLevel3.getLevel1NetworkId());
             }
         });
 
@@ -131,11 +146,11 @@
             @Override
             public void actionPerformed(ActionEvent e) {
                 SysUser user = (SysUser) CacheUtils.get("user", "user");
-                if (user.getTeamgroup()==null||user.getTeamgroup().equals(djJdgzNetworkLevel3.getTeamgroupId())){
+                if (user.getTeamgroup()==null||user.getTeamgroup().equals(nowLevel3.getTeamgroupId().toString())){
                     CommonTable.saveTableList(list, trackTable, columnDto);
                     djJdgzDismantTrackService.save(list);
                 }else{
-                    JOptionPane.showMessageDialog(null, "涓嶅彲鎿嶄綔鍏朵粬涓撲笟鏁版嵁", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
+                    JOptionPane.showMessageDialog(null, "褰撳墠鐢ㄦ埛涓嶅彲鎿嶄綔鍏朵粬涓撲笟鏁版嵁", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
                 }
             }
         });
@@ -143,7 +158,7 @@
         btnImport.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                importDismantTrackService.FileUpload(djJdgzNetworkLevel3.getId(),frame);
+                importDismantTrackService.FileUpload(nowLevel3.getId(),frame);
             }
         });
 
@@ -156,10 +171,11 @@
         return panel;
     }
     public void refreshTable(Long level3Id){
-        List<DjJdgzDismantTrack> list = djJdgzDismantTrackService.getList(level3Id, null);
+        nowLevel3 = djJdgzNetworkLevel3Service.get(level3Id);
+        list = djJdgzDismantTrackService.getList(level3Id, null);
         CommonTable.refreshTable(list, columnDto, trackTable);
         trackTable.setRowHeight(25);
-        trackTable.setAutoCreateRowSorter(true);
+
         trackTable.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
     }
 

--
Gitblit v1.9.1