修改

jinlin

2025-04-10 af67fb927c3f30fa70df834f0e97f0b4a91e6119

 src/main/java/com/example/client/service/DismantTrackService.java

@@ -62,7 +62,7 @@
        JComboBoxItem[] teamList = sysTeamGroupClassService.getTeamList(null);
        JComboBoxItem[] cabinList = cabinService.getList();
        String[] typeList = new String[]{
                "改装", "加装", "换装", "改进性修理", ""
                "","改装", "加装", "换装", "修理","改进性修理"
        };
        List<DjJdgzShip> shipList = djJdgzShipService.getList();
        Map<String, Long> shipMap = new HashMap<>();
@@ -70,7 +70,7 @@
        JLabel JLabel0 = new JLabel("工程");
        JComboBox comboBox = new JComboBox();

        comboBox.setPreferredSize(new Dimension(112, 28));
        comboBox.setPreferredSize(new Dimension(110, 28));
        for (int i = 0; i < shipList.size(); i++) {
            shipMap.put(shipList.get(i).getShipNo(), shipList.get(i).getId());
            comboBox.addItem(shipList.get(i).getShipNo());
@@ -79,23 +79,24 @@

        JLabel JLabel1 = new JLabel("部门");
        JComboBox<JComboBoxItem> comboBox1 = new JComboBox<>(deptList);
        comboBox1.setPreferredSize(new Dimension(112, 28));
        comboBox1.setPreferredSize(new Dimension(110, 28));

        JComboBoxItem[] teamList1 = sysTeamGroupClassService.getTeamList(deptList[0].getId());

        JLabel JLabel2 = new JLabel("专业");
        JComboBox<JComboBoxItem> comboBox2 = new JComboBox<>(teamList1);
        comboBox2.setPreferredSize(new Dimension(112, 28));
        comboBox2.setPreferredSize(new Dimension(110, 28));

        JLabel JLabel3 = new JLabel("舱室");
        JComboBox<JComboBoxItem> comboBox3 = new JComboBox<>(cabinList);
        comboBox3.setPreferredSize(new Dimension(112, 28));
        comboBox3.setPreferredSize(new Dimension(110, 28));

        JLabel JLabel4 = new JLabel("类别");
        JComboBox<String> comboBox4 = new JComboBox<>(typeList);
        comboBox4.setPreferredSize(new Dimension(112, 28));
        comboBox4.setPreferredSize(new Dimension(110, 28));

        JTextField sb = new JTextField(10);
        JTextField sb = new JTextField();
        sb.setPreferredSize(new Dimension(130, 28));
        JButton query = new JButton("查询");

        top.add(JLabel0, new GBC(0, 0, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
@@ -113,7 +114,11 @@
        top.add(query, new GBC(6, 1, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));

        List<ColumnDto> columnDto = new ArrayList<>();
        list = level3Service.getList(null, deptList[0].getId(), teamList[0].getId(), cabinList[0].getId(), typeList[0], null);
        list = level3Service.getList(shipList.get(0).getId(), deptList[0].getId(), teamList[0].getId(), cabinList[0].getId(), typeList[0],null, null);
        if (list == null || list.size() == 0) {
            JOptionPane.showMessageDialog(null, "还未录入三级网络图数据", "提示", JOptionPane.WARNING_MESSAGE);
            return null;
        }

        columnDto.add(new ColumnDto("序号", "", 60, "autoCreate", false, null, null));
        columnDto.add(new ColumnDto("设备名称", "name", 200, null, false, null, null));
@@ -135,7 +140,7 @@
                String type = comboBox4.getSelectedItem().toString();

                Long shipId = shipMap.get(content);
                list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, null);
                list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type,null, null);

                CommonTable.refreshTable(list, columnDto, subTable);
                subTable.setRowHeight(25);
@@ -174,7 +179,7 @@
                        String type = comboBox4.getSelectedItem().toString();

                        Long shipId = shipMap.get(content);
                        list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, null);
                        list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, null,null);

                        CommonTable.refreshTable(list, columnDto, subTable);
                        subTable.setRowHeight(25);
@@ -204,7 +209,7 @@
                String type = comboBox4.getSelectedItem().toString();

                Long shipId = shipMap.get(content);
                list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, null);
                list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type,null, null);

                CommonTable.refreshTable(list, columnDto, subTable);
                subTable.setRowHeight(25);
@@ -232,7 +237,7 @@
                String type = comboBox4.getSelectedItem().toString();

                Long shipId = shipMap.get(content);
                list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, null);
                list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, null,null);

                CommonTable.refreshTable(list, columnDto, subTable);
                subTable.setRowHeight(25);
@@ -260,7 +265,7 @@
                String type = comboBox4.getSelectedItem().toString();

                Long shipId = shipMap.get(content);
                list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, null);
                list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type,null, null);

                CommonTable.refreshTable(list, columnDto, subTable);
                subTable.setRowHeight(25);
@@ -283,7 +288,7 @@
        query.addActionListener(new ActionListener() {
            @Override
            public void actionPerformed(ActionEvent e) {
                list = level3Service.getList(null, null, null, null, null, sb.getText());
                list = level3Service.getList(null, null, null, null, null,null, sb.getText());

                CommonTable.refreshTable(list, columnDto, subTable);
                subTable.setRowHeight(25);