修改

jinlin

2025-03-18 d30e385951ce03335a5023f0775fd144da3c0b88

 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();