From 77d58298d00c11ade8862ca8acb0fdef5a45322e Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 21 三月 2025 17:39:38 +0800
Subject: [PATCH] 修改
---
src/main/java/com/example/client/service/TrackRecordAddOrUpdate.java | 86 ++++++++++++++++++++++++++-----------------
1 files changed, 52 insertions(+), 34 deletions(-)
diff --git a/src/main/java/com/example/client/service/TrackRecordAddOrUpdate.java b/src/main/java/com/example/client/service/TrackRecordAddOrUpdate.java
index 5a3bc23..f78ed46 100644
--- a/src/main/java/com/example/client/service/TrackRecordAddOrUpdate.java
+++ b/src/main/java/com/example/client/service/TrackRecordAddOrUpdate.java
@@ -2,32 +2,22 @@
import com.example.client.dto.ColumnDto;
import com.example.client.dto.JComboBoxItem;
-import com.example.client.model.TableButton;
import com.example.client.utils.CommonTable;
import com.example.client.utils.GBC;
import com.example.client.utils.UploadFile;
+import com.example.server.progressTrack.model.DjJdgzDismantTrack;
import com.example.server.progressTrack.model.DjJdgzNetworkLevel3;
-import com.example.server.progressTrack.model.DjJdgzNetworkLevel3List;
import com.example.server.progressTrack.model.DjJdgzTrackRecord;
-import com.example.server.progressTrack.service.DjJdgzNetworkLevel3ListService;
-import com.example.server.progressTrack.service.DjJdgzNetworkLevel3Service;
-import com.example.server.progressTrack.service.DjJdgzTrackRecordService;
-import com.example.server.progressTrack.service.NetWorkDiagramService;
+import com.example.server.progressTrack.service.*;
import com.example.server.sysOss.model.SysOss;
-import com.example.server.teamGroup.service.SysTeamGroupClassService;
import com.example.server.user.model.SysUser;
import com.example.server.utils.CacheUtils;
-import com.mxgraph.swing.mxGraphComponent;
-import com.mxgraph.view.mxGraph;
import org.apache.commons.lang3.StringUtils;
import org.jdesktop.swingx.JXDatePicker;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.swing.*;
-import javax.swing.event.TableModelEvent;
-import javax.swing.table.DefaultTableModel;
-import javax.swing.table.TableModel;
import java.awt.*;
import java.awt.event.*;
import java.text.ParseException;
@@ -45,9 +35,11 @@
private TrackRecordManageService trackRecordManageService;
@Autowired
private UploadFile uploadFile;
+ @Autowired
+ private DjJdgzDismantTrackService djJdgzDismantTrackService;
public void openDialog(DjJdgzTrackRecord data, JFrame jFrame, Long level1Id, List<ColumnDto> columnDto, JTable table) {
- JFrame frame1 = new JFrame("璺熻釜璁板綍");
+ JFrame frame1 = new JFrame(data.getLevel3NetworkName() + "璺熻釜璁板綍");
frame1.setSize(1200, 800);
frame1.setResizable(false);
frame1.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
@@ -76,17 +68,17 @@
hasDelayRiskMap.put(0, "鏃�");
JComboBoxItem[] trackList = {
- new JComboBoxItem(0, "绾夸笅"),
- new JComboBoxItem(1, "鐢佃瘽"),
+ new JComboBoxItem(0L, "绾夸笅"),
+ new JComboBoxItem(1L, "鐢佃瘽"),
};
JComboBoxItem[] statusList = {
- new JComboBoxItem(0, "杩涜涓�"),
- new JComboBoxItem(1, "宸插畬鎴�"),
+ new JComboBoxItem(0L, "杩涜涓�"),
+ new JComboBoxItem(1L, "宸插畬鎴�"),
};
JComboBoxItem[] hasDelayRiskList = {
- new JComboBoxItem(0, "鏃�"),
- new JComboBoxItem(1, "鏈�"),
+ new JComboBoxItem(0L, "鏃�"),
+ new JComboBoxItem(1L, "鏈�"),
};
JLabel JLabel0 = new JLabel("褰撳墠鑺傜偣");
@@ -108,10 +100,16 @@
trackLocatDesc.setText(data.getTrackLocation());
}
- JLabel JLabel3 = new JLabel("璺熻釜浜�(鑹囨柟)");
+ JLabel JLabel3 = new JLabel("璺熻釜浜�(T鏂�)");
JTextField trackPersonDesc = new JTextField(16);
if (StringUtils.isNotBlank(data.getTrackPerson())) {
trackPersonDesc.setText(data.getTrackPerson());
+ }
+
+ JLabel JLabel34 = new JLabel("鍗曚綅");
+ JTextField trackPersonUnitDesc = new JTextField(16);
+ if (StringUtils.isNotBlank(data.getTrackPersonUnit())) {
+ trackPersonUnitDesc.setText(data.getTrackPersonUnit());
}
JLabel JLabel4 = new JLabel("鑱旂郴鏂瑰紡");
@@ -124,6 +122,12 @@
JTextField trackedPersonDesc = new JTextField(16);
if (StringUtils.isNotBlank(data.getTrackedPerson())) {
trackedPersonDesc.setText(data.getTrackedPerson());
+ }
+
+ JLabel JLabel56 = new JLabel("鍗曚綅");
+ JTextField trackedPersonUnitDesc = new JTextField(16);
+ if (StringUtils.isNotBlank(data.getTrackedPersonUnit())) {
+ trackedPersonUnitDesc.setText(data.getTrackedPersonUnit());
}
JLabel JLabel6 = new JLabel("鑱旂郴鏂瑰紡");
@@ -172,7 +176,7 @@
JComboBox<JComboBoxItem> comboBox1 = new JComboBox<>(statusList);
comboBox1.setPreferredSize(new Dimension(185, 28));
if (data.getCurrentStatus() != null) {
- comboBox0.setSelectedItem(new JComboBoxItem(data.getCurrentStatus(), statusMap.get(data.getCurrentStatus())));
+ comboBox0.setSelectedItem(new JComboBoxItem(data.getCurrentStatus().longValue(), statusMap.get(data.getCurrentStatus())));
}
@@ -180,7 +184,7 @@
JComboBox<JComboBoxItem> comboBox2 = new JComboBox<>(hasDelayRiskList);
comboBox2.setPreferredSize(new Dimension(185, 28));
if (data.getHasDelayRisk() != null) {
- comboBox0.setSelectedItem(new JComboBoxItem(data.getHasDelayRisk(), hasDelayRiskMap.get(data.getHasDelayRisk())));
+ comboBox0.setSelectedItem(new JComboBoxItem(data.getHasDelayRisk().longValue(), hasDelayRiskMap.get(data.getHasDelayRisk())));
}
@@ -224,7 +228,7 @@
JLabel JLabel19 = new JLabel("闄勪欢");
SysOss oss = new SysOss();
- if (data.getId()!=null){
+ if (data.getId() != null) {
oss.setBusiId(data.getId());
}
oss.setBusiType("ProjectProgressFileUpload");
@@ -233,7 +237,7 @@
oss.setBusiFieldName("椤圭洰杩涘害鏂囦欢");
oss.setStatus(1);
oss.setChannel("local");
- JPanel jPanel = uploadFile.uploadFile(jFrame,500,220,oss);
+ JPanel jPanel = uploadFile.uploadFile(jFrame, 500, 220, oss);
JButton saveButton = new JButton("淇濆瓨");
frame1.add(JLabel0, new GBC(0, 0, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
@@ -245,13 +249,17 @@
frame1.add(JLabel3, new GBC(0, 1, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
frame1.add(trackPersonDesc, new GBC(1, 1, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
- frame1.add(JLabel4, new GBC(2, 1, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
- frame1.add(trackPersonContactDesc, new GBC(3, 1, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
+ frame1.add(JLabel34, new GBC(2, 1, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
+ frame1.add(trackPersonUnitDesc, new GBC(3, 1, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
+ frame1.add(JLabel4, new GBC(4, 1, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
+ frame1.add(trackPersonContactDesc, new GBC(5, 1, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
frame1.add(JLabel5, new GBC(0, 2, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
frame1.add(trackedPersonDesc, new GBC(1, 2, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
- frame1.add(JLabel6, new GBC(2, 2, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
- frame1.add(trackedPersonContactDesc, new GBC(3, 2, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
+ frame1.add(JLabel56, new GBC(2, 2, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
+ frame1.add(trackedPersonUnitDesc, new GBC(3, 2, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
+ frame1.add(JLabel6, new GBC(4, 2, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
+ frame1.add(trackedPersonContactDesc, new GBC(5, 2, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
frame1.add(JLabel7, new GBC(0, 3, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
frame1.add(generalRepairUnitDesc, new GBC(1, 3, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
@@ -292,19 +300,29 @@
public void actionPerformed(ActionEvent e) {
SysUser user = (SysUser) CacheUtils.get("user", "user");
DjJdgzNetworkLevel3 level3 = djJdgzNetworkLevel3Service.get(data.getLevel3NetworkId());
- if (user.getTeamgroup()!=null && !user.getTeamgroup().equals(level3.getTeamgroupId())){
- JOptionPane.showMessageDialog(null, "涓嶅彲鎿嶄綔鍏朵粬涓撲笟鏁版嵁", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
+ if (user.getTeamgroup() != null && !user.getTeamgroup().equals(level3.getTeamgroupId().toString())) {
+ JOptionPane.showMessageDialog(null, "褰撳墠鐢ㄦ埛涓嶅彲鎿嶄綔鍏朵粬涓撲笟鏁版嵁", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
return;
}
-
JComboBoxItem trackMethod = (JComboBoxItem) comboBox0.getSelectedItem();
JComboBoxItem currentStatus = (JComboBoxItem) comboBox1.getSelectedItem();
JComboBoxItem hasDelayRisk = (JComboBoxItem) comboBox2.getSelectedItem();
+ List<DjJdgzDismantTrack> list1 = djJdgzDismantTrackService.getList(data.getLevel3NetworkId(), null);
+ if (data.getProcessName().equals("璁惧鎷嗗嵏鍑鸿埍") && currentStatus.getId() == 1 && list1 != null && list1.size() > 0) {
+ Boolean status = djJdgzDismantTrackService.getStatus(data.getLevel3NetworkId());
+ if (!status) {
+ JOptionPane.showMessageDialog(null, "鏈夋湭瀹屾垚鐨勫瓙閮ㄤ欢", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
+ return;
+ }
+ }
+
data.setTrackMethod(Math.toIntExact(trackMethod.getId()));
data.setProcessName(data.getLevel3NodeName());
data.setTrackLocation(trackLocatDesc.getText());
data.setTrackPerson(trackPersonDesc.getText());
data.setTrackPersonContact(trackPersonContactDesc.getText());
+ data.setTrackPersonUnit(trackPersonUnitDesc.getText());
+ data.setTrackedPersonUnit(trackedPersonUnitDesc.getText());
data.setTrackedPerson(trackedPersonDesc.getText());
data.setTrackedPersonContact(trackedPersonContactDesc.getText());
data.setGeneralRepairUnit(generalRepairUnitDesc.getText());
@@ -321,9 +339,9 @@
data.setRemark(remark.getText());
Long id = djJdgzTrackRecordService.save(data);
uploadFile.save(id);
- List<DjJdgzTrackRecord> list = djJdgzTrackRecordService.getList(level1Id,0);
- CommonTable.refreshTable(list,columnDto,table);
- trackRecordManageService.tableModelListener(table,jFrame);
+ List<DjJdgzTrackRecord> list = djJdgzTrackRecordService.getList(level1Id, level3.getDeptId(), null, null, level3.getType(), 0, null);
+ CommonTable.refreshTable(list, columnDto, table);
+ trackRecordManageService.tableModelListener(table, jFrame, list);
frame1.dispose();
jFrame.setEnabled(true);//灏嗕富鐣岄潰鍐嶈缃负鍙搷浣滅殑
}
--
Gitblit v1.9.1