修改

jinlin

2025-04-01 a80b4a7eb099390bb53c967126fa97b30568e1a3

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

@@ -4,6 +4,7 @@
import com.example.client.dto.JComboBoxItem;
import com.example.client.model.TableButton;
import com.example.client.utils.CommonTable;
import com.example.client.utils.Compute;
import com.example.client.utils.GBC;
import com.example.client.utils.MultiSelectComboBox;
import com.example.server.cabin.service.CabinService;
@@ -12,6 +13,7 @@
import com.example.server.progressTrack.model.DjJdgzShip;
import com.example.server.progressTrack.service.*;
import com.example.server.teamGroup.service.SysTeamGroupClassService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -57,6 +59,7 @@

    public JPanel createTable(Integer width, Integer height, JFrame jFrame) {
        JPanel panel = new JPanel();
        panel.setPreferredSize(new Dimension(width, height));

        JPanel topJpanel = new JPanel();
        GridBagLayout layout = new GridBagLayout();
@@ -65,7 +68,7 @@
        topJpanel.setBackground(Color.WHITE);

        JPanel centerJpanel = new JPanel();
        centerJpanel.setPreferredSize(new Dimension(width - 20, height - 100));
        centerJpanel.setPreferredSize(new Dimension(width - 20, Compute.ComputeHeight(105, jFrame)));
        centerJpanel.setBackground(Color.WHITE);
        panel.add(topJpanel, BorderLayout.NORTH);
        panel.add(centerJpanel, BorderLayout.CENTER);
@@ -75,7 +78,7 @@
        JComboBoxItem[] cabinList = cabinService.getList();
        JComboBoxItem[] deptList = sysTeamGroupClassService.getDeptList();
        String[] typeList = new String[]{
                "改装", "加装", "换装", "改进性修理",""
                "","改装", "加装", "换装", "修理","改进性修理"
        };

        JLabel JLabel0 = new JLabel("工程");
@@ -122,7 +125,7 @@
        topJpanel.add(btnInsert, new GBC(3, 1, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
        topJpanel.add(btnImport, new GBC(4, 1, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));

        list = level3Service.getList(shipList.get(0).getId(), 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);
        List<TableButton> buttonList = new ArrayList<>();
        buttonList.add(new TableButton("edit", "编辑"));
        buttonList.add(new TableButton("del", "删除"));
@@ -146,6 +149,11 @@

        table.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);

        for (int i = 0; i < shipList.size(); i++) {
            shipMap.put(shipList.get(i).getShipNo(), shipList.get(i).getId());
            comboBox.addItem(shipList.get(i).getShipNo());
        }
        comboBox.setSelectedItem(shipList.get(0).getShipNo());
        comboBox.addItemListener(new ItemListener() {
            public void itemStateChanged(final ItemEvent event) {
                String content = comboBox.getSelectedItem().toString();
@@ -155,7 +163,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);

                CommonTable.refreshTable(list, columnDto, table);
                table.setRowHeight(25);
@@ -170,11 +178,10 @@
                if (e.getStateChange() == ItemEvent.SELECTED) {
                    JComboBoxItem selectedItem = (JComboBoxItem) comboBox1.getSelectedItem();
                    if (selectedItem != null) {
                        long selectedId = selectedItem.getId();
                        Long selectedId = selectedItem.getId();

                        JComboBoxItem[] teamList = sysTeamGroupClassService.getTeamList(selectedId);
                        comboBox2.setModel(new DefaultComboBoxModel<>(teamList));
                        comboBox2.setSelectedIndex(0);

                        String content = comboBox.getSelectedItem().toString();
                        JComboBoxItem dept = (JComboBoxItem) comboBox1.getSelectedItem();
@@ -183,7 +190,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);
                        CommonTable.refreshTable(list, columnDto, table);
                        table.setRowHeight(25);

@@ -204,7 +211,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);

                CommonTable.refreshTable(list, columnDto, table);
                table.setRowHeight(25);
@@ -222,7 +229,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);

                CommonTable.refreshTable(list, columnDto, table);
                table.setRowHeight(25);
@@ -240,7 +247,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);

                CommonTable.refreshTable(list, columnDto, table);
                table.setRowHeight(25);
@@ -253,7 +260,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, sb.getText());

                CommonTable.refreshTable(list, columnDto, table);
                table.setRowHeight(25);
@@ -263,17 +270,12 @@
            }
        });

        for (int i = 0; i < shipList.size(); i++) {
            shipMap.put(shipList.get(i).getShipNo(), shipList.get(i).getId());
            comboBox.addItem(shipList.get(i).getShipNo());
        }
        comboBox.setSelectedItem(shipList.get(0).getShipNo());

        tableModelListener(list, table, jFrame);

        btnInsert.addActionListener(new ActionListener() {
            @Override
            public void actionPerformed(ActionEvent e) {
                jFrame.setEnabled(false);
                insert(jFrame);
            }
        });
@@ -281,6 +283,7 @@
        btnImport.addActionListener(new ActionListener() {
            @Override
            public void actionPerformed(ActionEvent e) {
                jFrame.setEnabled(false);
                importService.FileUpload(columnDto, table, jFrame);
            }
        });
@@ -288,8 +291,19 @@
        JScrollPane scrollPane = new JScrollPane(table, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
        scrollPane.setViewportView(table);
        scrollPane.getViewport().setBackground(Color.WHITE);
        scrollPane.setPreferredSize(new Dimension(width - 20, height - 120));
        scrollPane.setPreferredSize(new Dimension(width - 20, Compute.ComputeHeightWithScroll(105, jFrame)));
        centerJpanel.add(scrollPane);
        jFrame.addComponentListener(new ComponentAdapter() {
            @Override
            public void componentResized(ComponentEvent e) {
                centerJpanel.setPreferredSize(new Dimension(width - 20, Compute.ComputeHeight(105, jFrame)));
                scrollPane.setPreferredSize(new Dimension(width - 20, Compute.ComputeHeightWithScroll(105, jFrame)));
                centerJpanel.revalidate();
                centerJpanel.repaint();
                scrollPane.revalidate();
                scrollPane.repaint();
            }
        });

        return panel;
    }
@@ -316,7 +330,7 @@
        JComboBoxItem[] cabinList = cabinService.getList();
        JComboBoxItem[] teamList = sysTeamGroupClassService.getTeamList(null);
        String[] typeList = new String[]{
                "改装", "加装", "换装", "改进性修理",""
                "","改装", "加装", "换装", "修理","改进性修理"
        };

        JLabel JLabel1 = new JLabel("工程");
@@ -451,7 +465,7 @@
            data.setCabinId(String.valueOf(selectedIds));
            data.setType(comboBox6.getSelectedItem().toString());
            level3Service.insert(data);
            list = level3Service.getList(level1Data.getShipId(), deptList[0].getId(), teamList[0].getId(), cabinList[0].getId(), typeList[0],null);
            list = level3Service.getList(level1Data.getShipId(), deptList[0].getId(), teamList[0].getId(), cabinList[0].getId(), typeList[0], null);
            CommonTable.refreshTable(list, columnDto, table);
            table.setRowHeight(25);