From a80b4a7eb099390bb53c967126fa97b30568e1a3 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 01 四月 2025 10:01:38 +0800
Subject: [PATCH] 修改
---
src/main/java/com/example/client/service/TrackRecordManageService.java | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/example/client/service/TrackRecordManageService.java b/src/main/java/com/example/client/service/TrackRecordManageService.java
index 363d012..d4bcada 100644
--- a/src/main/java/com/example/client/service/TrackRecordManageService.java
+++ b/src/main/java/com/example/client/service/TrackRecordManageService.java
@@ -10,6 +10,8 @@
import com.example.server.progressTrack.service.DjJdgzNetworkLevel3Service;
import com.example.server.progressTrack.service.DjJdgzTrackRecordService;
import com.example.server.teamGroup.service.SysTeamGroupClassService;
+import com.example.server.user.model.SysUser;
+import com.example.server.utils.CacheUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -61,7 +63,7 @@
topJpanel.setBackground(Color.WHITE);
JPanel centerJpanel = new JPanel();
- centerJpanel.setPreferredSize(new Dimension(width - 20, Compute.ComputeHeight(100,jFrame)));
+ centerJpanel.setPreferredSize(new Dimension(width - 20, Compute.ComputeHeight(105, jFrame)));
centerJpanel.setBackground(Color.WHITE);
panel.add(topJpanel, BorderLayout.NORTH);
panel.add(centerJpanel, BorderLayout.CENTER);
@@ -77,7 +79,7 @@
JComboBoxItem[] teamList = sysTeamGroupClassService.getTeamList(null);
String[] typeList = new String[]{
- "鏀硅", "鍔犺", "鎹㈣", "鏀硅繘鎬т慨鐞�", ""
+ "","鏀硅", "鍔犺", "鎹㈣", "淇悊","鏀硅繘鎬т慨鐞�"
};
JLabel JLabel0 = new JLabel("宸ョ▼");
@@ -235,7 +237,7 @@
@Override
public void actionPerformed(ActionEvent e) {
JComboBoxItem project = (JComboBoxItem) comboBox.getSelectedItem();
- list = djJdgzTrackRecordService.getList(project.getId(), null, null, null, null, null, sb.getText());
+ list = djJdgzTrackRecordService.getList(project.getId(), null, null, null, null, 0, sb.getText());
CommonTable.refreshTable(list, columnDto, table);
table.setRowHeight(25);
@@ -248,12 +250,18 @@
btnImport.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
+ jFrame.setEnabled(false);
JComboBoxItem selectedItemNow = (JComboBoxItem) comboBox.getSelectedItem();
importTrackRecordService.FileUpload(columnDto, table, jFrame);
}
});
list = djJdgzTrackRecordService.getList(projectList[0].getId(), deptList[0].getId(), teamList[0].getId(), cabinList[0].getId(), typeList[0], Math.toIntExact(statusList[0].getId()), null);
+ if (list == null || list.size() == 0) {
+ JOptionPane.showMessageDialog(null, "杩樻湭褰曞叆涓夌骇缃戠粶鍥炬暟鎹�", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
+ return null;
+ }
+
List<TableButton> buttonList = new ArrayList<>();
buttonList.add(new TableButton("edit", "缂栬緫"));
@@ -288,7 +296,7 @@
String[] items = itemList.toArray(new String[0]);
columnModel = table.getColumnModel();
- MultiSelectComboBox2 mulcomboBox = new MultiSelectComboBox2(items,columnDto,columnModel);
+ MultiSelectComboBox2 mulcomboBox = new MultiSelectComboBox2(items, columnDto, columnModel);
/* final Integer[] lastIndex = {-1};
mulcomboBox.addItemListener(new ItemListener() {
@@ -350,6 +358,7 @@
Object cellValue = table.getValueAt(row, column);
Integer value = Integer.parseInt(cellValue.toString());
if (value > 0) {
+ jFrame.setEnabled(false);
DjJdgzTrackRecord djJdgzTrackRecord = list.get(row);
history(jFrame, djJdgzTrackRecord.getLevel3NodeId());
}
@@ -361,6 +370,7 @@
btnTj.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
+ jFrame.setEnabled(false);
JComboBoxItem selectedItemNow = (JComboBoxItem) comboBox.getSelectedItem();
statistReportsService.createTable(jFrame, selectedItemNow.getId());
}
@@ -368,6 +378,7 @@
btnJc.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
+ jFrame.setEnabled(false);
JComboBoxItem selectedItemNow = (JComboBoxItem) comboBox.getSelectedItem();
progressPromptService.createTable(jFrame, selectedItemNow.getId());
}
@@ -375,6 +386,7 @@
btnExport.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
+ jFrame.setEnabled(false);
exportTrackRecordService.openDialog(jFrame);
}
});
@@ -383,13 +395,13 @@
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, Compute.ComputeHeightWithScroll(100,jFrame)));
+ 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(100,jFrame)));
- scrollPane.setPreferredSize(new Dimension(width - 20, Compute.ComputeHeightWithScroll(100,jFrame)));
+ 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();
@@ -470,6 +482,7 @@
Object newValue = table.getModel().getValueAt(row, column);
// 杈撳嚭鍙樺寲淇℃伅
if (newValue.equals("edit")) {
+ jFrame.setEnabled(false);
DjJdgzTrackRecord data = recordList.get(row);
Long level1Id = data.getLevel1NetworkId();
data.setProcessName(data.getLevel3NodeName());
@@ -488,7 +501,6 @@
data.setRepairUnitContact(level3.getRepairUnitContact());
}
addOrUpdate.openDialog(data, jFrame, level1Id, columnDto, table);
- jFrame.setEnabled(false);
} else {
}
@@ -518,7 +530,9 @@
int row = table.rowAtPoint(e.getPoint());
int col = table.columnAtPoint(e.getPoint());
DjJdgzTrackRecord djJdgzTrackRecord = list.get(row);
- if (djJdgzTrackRecord.getCurrentStatus() == 1) {
+ String site = (String) CacheUtils.get("site", "site");
+
+ if (djJdgzTrackRecord.getCurrentStatus() == 1 && site.equals("宸ヤ綔缁�")) {
table.setRowSelectionInterval(row, row);
popupMenu.show(e.getComponent(), e.getX(), e.getY());
menuItem1.addActionListener(ex -> {
--
Gitblit v1.9.1