From 66f0597bf6a1e79540c6bc51dedf561c22f3bdb5 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 13 五月 2025 17:49:26 +0800
Subject: [PATCH] 修改
---
src/main/java/com/example/client/service/Level3AddOrUpdate.java | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/example/client/service/Level3AddOrUpdate.java b/src/main/java/com/example/client/service/Level3AddOrUpdate.java
index 61b7ef0..4a55e11 100644
--- a/src/main/java/com/example/client/service/Level3AddOrUpdate.java
+++ b/src/main/java/com/example/client/service/Level3AddOrUpdate.java
@@ -6,11 +6,14 @@
import com.example.client.utils.CellComboBoxEditor;
import com.example.client.utils.CellComboBoxRenderer;
import com.example.client.utils.CommonTable;
+import com.example.server.progressTrack.model.DjJdgzNetworkLevel2List;
import com.example.server.progressTrack.model.DjJdgzNetworkLevel3;
import com.example.server.progressTrack.model.DjJdgzNetworkLevel3List;
import com.example.server.progressTrack.service.DjJdgzNetworkLevel3ListService;
import com.example.server.progressTrack.service.NetWorkDiagramService;
import com.example.server.teamGroup.service.SysTeamGroupClassService;
+import com.example.server.user.model.SysUser;
+import com.example.server.utils.UserAndSiteUtils;
import com.mxgraph.swing.mxGraphComponent;
import com.mxgraph.view.mxGraph;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,7 +36,7 @@
@Autowired
private DjJdgzNetworkLevel3ListService level3ListService;
@Autowired
- private SysTeamGroupClassService sysTeamGroupClassService;
+ private Level3ManageService level3ManageService;
public void openDialog(DjJdgzNetworkLevel3 data, JFrame jFrame) {
JFrame frame1 = new JFrame("涓夌骇缃戠粶鍥剧紪杈�");
@@ -57,16 +60,16 @@
JSpinner.DateEditor timeEditor = new JSpinner.DateEditor(timeSpinner, "yyyy-MM-dd");
timeSpinner.setEditor(timeEditor);
- //JButton btnInsert = new JButton("鏂板");
+ JButton btnUpdate = new JButton("淇敼璁惧淇℃伅");
JButton btnSave = new JButton("淇濆瓨鏁版嵁");
- //topJpanel.add(btnInsert);
+ topJpanel.add(btnUpdate);
topJpanel.add(btnSave);
// 鍒涘缓瀛愯〃鏍�
List<ColumnDto> columnDto = new ArrayList<>();
List<DjJdgzNetworkLevel3List> list = level3ListService.getList(data.getId());
if (list.size() == 0) {
- list = level3ListService.getDefult();
+ list = level3ListService.getDefult(data.getType());
}
for (DjJdgzNetworkLevel3List item : list) {
if (item.getTeamgroupId() == null) {
@@ -105,6 +108,8 @@
if (newValue.equals("del")) {
DefaultTableModel model = (DefaultTableModel) subTable.getModel();
model.removeRow(row);
+ DjJdgzNetworkLevel3List djJdgzNetworkLevel3List = finalList.get(row);
+ level3ListService.deleteLogic(djJdgzNetworkLevel3List.getId());
finalList.remove(row);
} else {
/* if (column == 1 && newValue instanceof Integer) {
@@ -135,11 +140,11 @@
frame1.setVisible(true);
mxGraph graph = new mxGraph();
- graph = netWorkDiagramService.getCsDiagram(graph, data.getContent(), null, diagram.getWidth(), diagram.getHeight());
+ graph = netWorkDiagramService.getCsDiagram(graph, data.getContent(), null, diagram.getWidth(), diagram.getHeight(),null);
mxGraphComponent graphComponent = new mxGraphComponent(graph);
graphComponent.setConnectable(false);
graphComponent.setDragEnabled(false);
- graphComponent.zoomTo(2, true);
+ graphComponent.zoomTo(1, true);
diagram.add(graphComponent);
mxGraph finalGraph = graph;
@@ -158,8 +163,28 @@
btnSave.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;
+ }
+ if (subTable.isEditing()) {
+ subTable.getCellEditor().stopCellEditing();
+ }
CommonTable.saveTableList(finalList, subTable, columnDto);
level3ListService.save(finalList, data.getId(), diagram, finalGraph1);
+ JOptionPane.showMessageDialog(null, "淇濆瓨鎴愬姛", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
+ }
+ });
+ btnUpdate.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;
+ }
+ level3ManageService.insert(jFrame,data);
}
});
--
Gitblit v1.9.1