From af67fb927c3f30fa70df834f0e97f0b4a91e6119 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 10 四月 2025 14:58:22 +0800
Subject: [PATCH] 修改
---
src/main/java/com/example/client/service/TrackRecordManageService.java | 155 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 110 insertions(+), 45 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..817593e 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.UserAndSiteUtils;
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,37 +79,54 @@
JComboBoxItem[] teamList = sysTeamGroupClassService.getTeamList(null);
String[] typeList = new String[]{
- "鏀硅", "鍔犺", "鎹㈣", "鏀硅繘鎬т慨鐞�", ""
+ "","鏀硅", "鍔犺", "鎹㈣", "淇悊","鏀硅繘鎬т慨鐞�"
+ };
+ JComboBoxItem[] isealCabin = {
+ new JComboBoxItem(10000L, ""),
+ new JComboBoxItem(0L, "鍚�"),
+ new JComboBoxItem(1L, "鏄�"),
};
JLabel JLabel0 = new JLabel("宸ョ▼");
JComboBox<JComboBoxItem> comboBox = new JComboBox<>(projectList);
- comboBox.setPreferredSize(new Dimension(150, 28));
+ comboBox.setPreferredSize(new Dimension(210, 28));
JLabel JLabel1 = new JLabel("閮ㄩ棬");
JComboBox<JComboBoxItem> comboBox1 = new JComboBox<>(deptList);
- comboBox1.setPreferredSize(new Dimension(150, 28));
+ comboBox1.setPreferredSize(new Dimension(140, 28));
+ comboBox1.setMaximumSize(new Dimension(140, 28));
JComboBoxItem[] teamList1 = sysTeamGroupClassService.getTeamList(deptList[0].getId());
JLabel JLabel2 = new JLabel("涓撲笟");
JComboBox<JComboBoxItem> comboBox2 = new JComboBox<>(teamList1);
- comboBox2.setPreferredSize(new Dimension(150, 28));
+ comboBox2.setPreferredSize(new Dimension(140, 28));
+ comboBox2.setMaximumSize(new Dimension(140, 28));
JLabel JLabel3 = new JLabel("鑸卞");
JComboBox<JComboBoxItem> comboBox3 = new JComboBox<>(cabinList);
- comboBox3.setPreferredSize(new Dimension(150, 28));
+ comboBox3.setPreferredSize(new Dimension(120, 28));
+ comboBox3.setMaximumSize(new Dimension(120, 28));
JLabel JLabel4 = new JLabel("绫诲埆");
JComboBox<String> comboBox4 = new JComboBox<>(typeList);
- comboBox4.setPreferredSize(new Dimension(150, 28));
+ comboBox4.setPreferredSize(new Dimension(140, 28));
+ comboBox4.setMaximumSize(new Dimension(140, 28));
JLabel JLabel5 = new JLabel("鐘舵��");
JComboBox<JComboBoxItem> comboBox5 = new JComboBox<>(statusList);
- comboBox5.setPreferredSize(new Dimension(150, 28));
+ comboBox5.setPreferredSize(new Dimension(120, 28));
+ comboBox5.setMaximumSize(new Dimension(120, 28));
+
+ JLabel JLabel78 = new JLabel("鏄惁褰卞搷灏佽埍");
+ JComboBox<JComboBoxItem> comboBox7 = new JComboBox<>(isealCabin);
+ comboBox7.setPreferredSize(new Dimension(120, 28));
+ comboBox7.setMaximumSize(new Dimension(120, 28));
JTextField sb = new JTextField(16);
- sb.setPreferredSize(new Dimension(150, 28));
+ sb.setPreferredSize(new Dimension(140, 28));
+ sb.setMaximumSize(new Dimension(140, 28));
+
JButton query = new JButton("鏌ヨ");
JButton btnTj = new JButton("缁熻鎶ヨ〃");
@@ -124,7 +143,9 @@
String type = comboBox4.getSelectedItem().toString();
JComboBoxItem status = (JComboBoxItem) comboBox5.getSelectedItem();
- list = djJdgzTrackRecordService.getList(project.getId(), dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(status.getId()), null);
+ JComboBoxItem isealCabinItem = (JComboBoxItem) comboBox7.getSelectedItem();
+
+ list = djJdgzTrackRecordService.getList(project.getId(), dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(status.getId()),Math.toIntExact(isealCabinItem.getId()), null);
CommonTable.refreshTable(list, columnDto, table);
table.setRowHeight(25);
@@ -147,7 +168,9 @@
String type = comboBox4.getSelectedItem().toString();
JComboBoxItem status = (JComboBoxItem) comboBox5.getSelectedItem();
- list = djJdgzTrackRecordService.getList(project.getId(), dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(status.getId()), null);
+ JComboBoxItem isealCabinItem = (JComboBoxItem) comboBox7.getSelectedItem();
+
+ list = djJdgzTrackRecordService.getList(project.getId(), dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(status.getId()),Math.toIntExact(isealCabinItem.getId()), null);
CommonTable.refreshTable(list, columnDto, table);
table.setRowHeight(25);
@@ -166,7 +189,9 @@
String type = comboBox4.getSelectedItem().toString();
JComboBoxItem status = (JComboBoxItem) comboBox5.getSelectedItem();
- list = djJdgzTrackRecordService.getList(project.getId(), dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(status.getId()), null);
+ JComboBoxItem isealCabinItem = (JComboBoxItem) comboBox7.getSelectedItem();
+
+ list = djJdgzTrackRecordService.getList(project.getId(), dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(status.getId()),Math.toIntExact(isealCabinItem.getId()), null);
CommonTable.refreshTable(list, columnDto, table);
table.setRowHeight(25);
@@ -185,7 +210,9 @@
String type = comboBox4.getSelectedItem().toString();
JComboBoxItem status = (JComboBoxItem) comboBox5.getSelectedItem();
- list = djJdgzTrackRecordService.getList(project.getId(), dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(status.getId()), null);
+ JComboBoxItem isealCabinItem = (JComboBoxItem) comboBox7.getSelectedItem();
+
+ list = djJdgzTrackRecordService.getList(project.getId(), dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(status.getId()),Math.toIntExact(isealCabinItem.getId()), null);
CommonTable.refreshTable(list, columnDto, table);
table.setRowHeight(25);
@@ -203,7 +230,9 @@
String type = comboBox4.getSelectedItem().toString();
JComboBoxItem status = (JComboBoxItem) comboBox5.getSelectedItem();
- list = djJdgzTrackRecordService.getList(project.getId(), dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(status.getId()), null);
+ JComboBoxItem isealCabinItem = (JComboBoxItem) comboBox7.getSelectedItem();
+
+ list = djJdgzTrackRecordService.getList(project.getId(), dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(status.getId()),Math.toIntExact(isealCabinItem.getId()), null);
CommonTable.refreshTable(list, columnDto, table);
table.setRowHeight(25);
@@ -221,8 +250,28 @@
JComboBoxItem cabin = (JComboBoxItem) comboBox3.getSelectedItem();
String type = comboBox4.getSelectedItem().toString();
JComboBoxItem status = (JComboBoxItem) comboBox5.getSelectedItem();
+ JComboBoxItem isealCabinItem = (JComboBoxItem) comboBox7.getSelectedItem();
- list = djJdgzTrackRecordService.getList(project.getId(), dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(status.getId()), null);
+ list = djJdgzTrackRecordService.getList(project.getId(), dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(status.getId()),Math.toIntExact(isealCabinItem.getId()), null);
+
+ CommonTable.refreshTable(list, columnDto, table);
+ table.setRowHeight(25);
+
+ table.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
+ tableModelListener(table, jFrame, list);
+ }
+ });
+ comboBox7.addItemListener(new ItemListener() {
+ public void itemStateChanged(final ItemEvent event) {
+ JComboBoxItem project = (JComboBoxItem) comboBox.getSelectedItem();
+ JComboBoxItem dept = (JComboBoxItem) comboBox1.getSelectedItem();
+ JComboBoxItem team = (JComboBoxItem) comboBox2.getSelectedItem();
+ JComboBoxItem cabin = (JComboBoxItem) comboBox3.getSelectedItem();
+ String type = comboBox4.getSelectedItem().toString();
+ JComboBoxItem status = (JComboBoxItem) comboBox5.getSelectedItem();
+ JComboBoxItem isealCabinItem = (JComboBoxItem) comboBox7.getSelectedItem();
+
+ list = djJdgzTrackRecordService.getList(project.getId(), dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(status.getId()),Math.toIntExact(isealCabinItem.getId()), null);
CommonTable.refreshTable(list, columnDto, table);
table.setRowHeight(25);
@@ -235,7 +284,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, 0,sb.getText());
CommonTable.refreshTable(list, columnDto, table);
table.setRowHeight(25);
@@ -248,12 +297,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);
+ list = djJdgzTrackRecordService.getList(projectList[0].getId(), deptList[0].getId(), teamList[0].getId(), cabinList[0].getId(), typeList[0], Math.toIntExact(statusList[0].getId()), Math.toIntExact(isealCabin[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", "缂栬緫"));
@@ -267,6 +322,7 @@
columnDto.add(new ColumnDto("涓�绾ц妭鐐�", "level1NodeName", 120, null, false, null, null));
columnDto.add(new ColumnDto("浜岀骇鑺傜偣", "level2NodeName", 120, null, false, null, null));
columnDto.add(new ColumnDto("璁惧鍚嶇О", "level3NetworkName", 120, null, false, null, null));
+ columnDto.add(new ColumnDto("鏄惁褰卞搷灏佽埍", "isealCabin", 180, "dict", false, null, isealCabin));
columnDto.add(new ColumnDto("褰撳墠鑺傜偣", "level3NodeName", 150, null, false, null, null));
columnDto.add(new ColumnDto("璁″垝瀹屾垚鏃堕棿", "requiredCompletionTime", 180, null, false, null, null));
columnDto.add(new ColumnDto("璺熻釜璁板綍", "", 100, "", true, buttonList, null));
@@ -288,8 +344,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() {
@Override
@@ -314,27 +369,27 @@
});*/
topJpanel.add(JLabel0, new GBC(0, 0, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
- topJpanel.add(comboBox, new GBC(1, 0, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
- topJpanel.add(JLabel1, new GBC(2, 0, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
- topJpanel.add(comboBox1, new GBC(3, 0, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
- topJpanel.add(JLabel2, new GBC(4, 0, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
- topJpanel.add(comboBox2, new GBC(5, 0, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
- topJpanel.add(JLabel3, new GBC(6, 0, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
- topJpanel.add(comboBox3, new GBC(7, 0, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
- topJpanel.add(JLabel4, new GBC(8, 0, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
- topJpanel.add(comboBox4, new GBC(9, 0, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
- topJpanel.add(JLabel5, new GBC(10, 0, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
- topJpanel.add(comboBox5, new GBC(11, 0, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
+ topJpanel.add(comboBox, new GBC(1, 0, 3, 1).setAnchor(GBC.SOUTHWEST).setInsets(5).setWeight(0,0));
+ topJpanel.add(JLabel1, new GBC(4, 0, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
+ topJpanel.add(comboBox1, new GBC(5, 0, 2, 1).setAnchor(GBC.SOUTHWEST).setInsets(5).setWeight(0,0));
+ topJpanel.add(JLabel2, new GBC(7, 0, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
+ topJpanel.add(comboBox2, new GBC(8, 0, 2, 1).setAnchor(GBC.SOUTHWEST).setInsets(5).setWeight(0,0));
+ topJpanel.add(JLabel3, new GBC(10, 0, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
+ topJpanel.add(comboBox3, new GBC(11, 0, 2, 1).setAnchor(GBC.SOUTHWEST).setInsets(5).setWeight(0,0));
+ topJpanel.add(JLabel4, new GBC(13, 0, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
+ topJpanel.add(comboBox4, new GBC(14, 0, 2, 1).setAnchor(GBC.SOUTHWEST).setInsets(5).setWeight(0,0));
+ topJpanel.add(JLabel5, new GBC(16, 0, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
+ topJpanel.add(comboBox5, new GBC(17, 0, 2, 1).setAnchor(GBC.SOUTHWEST).setInsets(5).setWeight(0,0));
+ topJpanel.add(JLabel78, new GBC(19, 0, 3, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
+ topJpanel.add(comboBox7, new GBC(22, 0, 2, 1).setAnchor(GBC.SOUTHWEST).setInsets(5).setWeight(0,0));
- topJpanel.add(btnTj, new GBC(1, 1, 1, 1).setInsets(5));
- topJpanel.add(btnJc, new GBC(2, 1, 2, 1).setInsets(5));
- topJpanel.add(btnImport, new GBC(4, 1, 2, 1).setInsets(5));
- topJpanel.add(btnExport, new GBC(6, 1, 2, 1).setInsets(5));
- topJpanel.add(mulcomboBox, new GBC(8, 1, 2, 1).setInsets(5));
- topJpanel.add(sb, new GBC(10, 1, 2, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
- topJpanel.add(query, new GBC(12, 1, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
-
-
+ topJpanel.add(btnTj, new GBC(1, 1, 3, 1).setInsets(5));
+ topJpanel.add(btnJc, new GBC(4, 1, 3, 1).setInsets(5));
+ topJpanel.add(btnImport, new GBC(7, 1, 3, 1).setInsets(5));
+ topJpanel.add(btnExport, new GBC(10, 1, 3, 1).setInsets(5));
+ topJpanel.add(mulcomboBox, new GBC(13, 1, 3, 1).setInsets(5));
+ topJpanel.add(sb, new GBC(16, 1, 3, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
+ topJpanel.add(query, new GBC(19, 1, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
table.addMouseListener(new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent e) {
@@ -350,6 +405,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 +417,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 +425,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 +433,7 @@
btnExport.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
+ jFrame.setEnabled(false);
exportTrackRecordService.openDialog(jFrame);
}
});
@@ -383,19 +442,23 @@
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();
scrollPane.repaint();
}
});
+
+ System.out.println("comboBox width: " + comboBox.getPreferredSize().height);
+ System.out.println("comboBox2 width: " + comboBox2.getPreferredSize().height);
+ System.out.println("topJpanel width: " + topJpanel.getPreferredSize().height);
return panel;
}
@@ -470,6 +533,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 +552,6 @@
data.setRepairUnitContact(level3.getRepairUnitContact());
}
addOrUpdate.openDialog(data, jFrame, level1Id, columnDto, table);
- jFrame.setEnabled(false);
} else {
}
@@ -518,12 +581,14 @@
int row = table.rowAtPoint(e.getPoint());
int col = table.columnAtPoint(e.getPoint());
DjJdgzTrackRecord djJdgzTrackRecord = list.get(row);
- if (djJdgzTrackRecord.getCurrentStatus() == 1) {
+ String site = (String) UserAndSiteUtils.get("site", "site");
+
+ if (djJdgzTrackRecord.getCurrentStatus() == 1 && site.equals("宸ヤ綔缁�")) {
table.setRowSelectionInterval(row, row);
popupMenu.show(e.getComponent(), e.getX(), e.getY());
menuItem1.addActionListener(ex -> {
djJdgzTrackRecordService.retract(djJdgzTrackRecord.getId());
- List<DjJdgzTrackRecord> list = djJdgzTrackRecordService.getList(djJdgzTrackRecord.getLevel1NetworkId(), null, null, null, null, 0, null);
+ List<DjJdgzTrackRecord> list = djJdgzTrackRecordService.getList(djJdgzTrackRecord.getLevel1NetworkId(), null, null, null, null, 0,0, null);
CommonTable.refreshTable(list, columnDto, table);
tableModelListener(table, jFrame, list);
});
--
Gitblit v1.9.1