From a3fe79e605b07a5a908599aaa830a0860e9423d2 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 14 五月 2025 17:34:27 +0800
Subject: [PATCH] 修改
---
src/main/java/com/example/client/service/HandoverAddOrUpdate.java | 66 ++++++++++++++++++++++++++++----
1 files changed, 57 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/example/client/service/HandoverAddOrUpdate.java b/src/main/java/com/example/client/service/HandoverAddOrUpdate.java
index 0d24746..e5155c7 100644
--- a/src/main/java/com/example/client/service/HandoverAddOrUpdate.java
+++ b/src/main/java/com/example/client/service/HandoverAddOrUpdate.java
@@ -2,6 +2,7 @@
import com.example.client.dto.ColumnDto;
import com.example.client.dto.JComboBoxItem;
+import com.example.client.utils.BoxIteUtils;
import com.example.client.utils.CommonTable;
import com.example.client.utils.GBC;
import com.example.client.utils.UploadFile;
@@ -11,6 +12,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;
@@ -62,16 +65,16 @@
JLabel JLabel0 = new JLabel("宸ョ▼");
JComboBox<JComboBoxItem> comboBox = new JComboBox<>(projectList);
if(data.getLevel1NetworkId()!=null){
- comboBox.setSelectedItem(new JComboBoxItem(data.getLevel1NetworkId(),data.getProjectName()));
+ comboBox.setSelectedItem(BoxIteUtils.GetSelectItemById(projectList, data.getLevel1NetworkId()));
}
- 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 +96,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 +168,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 +178,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 +199,7 @@
handoverManageService.tableModelListener(table,jFrame,list);
frame1.dispose();
jFrame.setEnabled(true);//灏嗕富鐣岄潰鍐嶈缃负鍙搷浣滅殑
+ JOptionPane.showMessageDialog(null, "淇濆瓨鎴愬姛", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
}
});
--
Gitblit v1.9.1