修改

jinlin

2025-04-05 92705ac08a97ddc4904795f024723aab69e1abd8

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

@@ -11,6 +11,8 @@
import com.example.server.progressTrack.service.DjJdgzNetworkLevel1Service;
import com.example.server.progressTrack.service.DjJdgzTrackRecordService;
import com.example.server.sysOss.model.SysOss;
import com.example.server.user.model.SysUser;
import com.example.server.utils.UserAndSiteUtils;
import org.apache.commons.lang3.StringUtils;
import org.jdesktop.swingx.JXDatePicker;
import org.springframework.beans.factory.annotation.Autowired;
@@ -65,13 +67,13 @@
            comboBox.setSelectedItem(new JComboBoxItem(data.getLevel1NetworkId(),data.getProjectName()));
        }

        JLabel JLabel1 = new JLabel("交方艇队");
        JLabel JLabel1 = new JLabel("交方T队");
        JTextField currentTeamDesc = new JTextField(16);
        if (StringUtils.isNotBlank(data.getCurrentTeam())) {
            currentTeamDesc.setText(data.getCurrentTeam());
        }

        JLabel JLabel2 = new JLabel("接方艇队");
        JLabel JLabel2 = new JLabel("接方T队");
        JTextField handoverTeamDesc = new JTextField(16);
        if (StringUtils.isNotBlank(data.getHandoverTeam())) {
            handoverTeamDesc.setText(data.getHandoverTeam());
@@ -93,11 +95,48 @@
        handoverTimeDate.setDate(parse);

        JLabel JLabel4 = new JLabel("交接情况说明");
        JTextArea handoverSitua = new JTextArea(5, 40);
        /*JTextArea handoverSitua = new JTextArea(5, 40);
        handoverSitua.setLineWrap(true);
        handoverSitua.setPreferredSize(new Dimension(600,200));
        if (StringUtils.isNotBlank(data.getHandoverSituation())) {
            handoverSitua.setText(data.getHandoverSituation());
        handoverSitua.setPreferredSize(new Dimension(600,200));*/
        JTabbedPane tabbedPane = new JTabbedPane();

        // 创建专业说明 JTextArea
        JTextArea professExplan = new JTextArea(5, 40);
        professExplan.setLineWrap(true);
        professExplan.setWrapStyleWord(true);
        professExplan.setPreferredSize(new Dimension(600, 200));
        JScrollPane professionalScrollPane = new JScrollPane(professExplan);
        professionalScrollPane.setPreferredSize(new Dimension(600, 200));

        // 创建部门说明 JTextArea
        JTextArea deptExplan = new JTextArea(5, 40);
        deptExplan.setLineWrap(true);
        deptExplan.setWrapStyleWord(true);
        deptExplan.setPreferredSize(new Dimension(600, 200));
        JScrollPane departmentScrollPane = new JScrollPane(deptExplan);
        departmentScrollPane.setPreferredSize(new Dimension(600, 200));

        // 创建TD说明 JTextArea
        JTextArea tdExplan = new JTextArea(5, 40);
        tdExplan.setLineWrap(true);
        tdExplan.setWrapStyleWord(true);
        tdExplan.setPreferredSize(new Dimension(600, 200));
        JScrollPane tdScrollPane = new JScrollPane(tdExplan);
        tdScrollPane.setPreferredSize(new Dimension(600, 200));

        // 将 JTextArea 添加到 JTabbedPane
        tabbedPane.addTab("专业交接说明", professionalScrollPane);
        tabbedPane.addTab("部门交接说明", departmentScrollPane);
        tabbedPane.addTab("T队交接说明", tdScrollPane);

        if (StringUtils.isNotBlank(data.getProfessExplan())) {
            professExplan.setText(data.getProfessExplan());
        }
        if (StringUtils.isNotBlank(data.getDeptExplan())) {
            deptExplan.setText(data.getDeptExplan());
        }
        if (StringUtils.isNotBlank(data.getTdExplan())) {
            tdExplan.setText(data.getTdExplan());
        }

        JLabel JLabel5 = new JLabel("附件");
@@ -128,7 +167,7 @@
        frame1.add(handoverTimeDate, new GBC(1, 3, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));

        frame1.add(JLabel4, new GBC(0, 4, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
        frame1.add(handoverSitua, new GBC(1, 4, 1, 5).setAnchor(GBC.SOUTHWEST).setInsets(5));
        frame1.add(tabbedPane, new GBC(1, 4, 1, 5).setAnchor(GBC.SOUTHWEST).setInsets(5));

        frame1.add(JLabel5, new GBC(0, 9, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
        frame1.add(jPanel, new GBC(1, 9, 6, 5).setAnchor(GBC.SOUTHWEST).setInsets(5));
@@ -138,13 +177,20 @@
        saveButton.addActionListener(new ActionListener() {
            @Override
            public void actionPerformed(ActionEvent e) {
                SysUser user = (SysUser) UserAndSiteUtils.get("user","user");
                if (user==null){
                    JOptionPane.showMessageDialog(null, "用户失效请退出并重新登录", "提示", JOptionPane.WARNING_MESSAGE);
                    return;
                }
                JComboBoxItem project = (JComboBoxItem) comboBox.getSelectedItem();

                data.setLevel1NetworkId(project.getId());
                data.setCurrentTeam(currentTeamDesc.getText());
                data.setHandoverTeam(handoverTeamDesc.getText());
                data.setHandoverTime(sdFormat.format(handoverTimeDate.getDate()));
                data.setHandoverSituation(handoverSitua.getText());
                data.setDeptExplan(deptExplan.getText());
                data.setProfessExplan(professExplan.getText());
                data.setTdExplan(tdExplan.getText());
                Long id = handoverService.save(data);
                uploadFile.save(id);
                List<DjJdgzHandover> list = handoverService.getList(project.getId());
@@ -152,6 +198,7 @@
                handoverManageService.tableModelListener(table,jFrame,list);
                frame1.dispose();
                jFrame.setEnabled(true);//将主界面再设置为可操作的
                JOptionPane.showMessageDialog(null, "保存成功", "提示", JOptionPane.WARNING_MESSAGE);
            }
        });