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/TrackRecordManageService.java | 42 +++++++++++++++++++++++++-----------------
1 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/example/client/service/TrackRecordManageService.java b/src/main/java/com/example/client/service/TrackRecordManageService.java
index 817593e..a2fca00 100644
--- a/src/main/java/com/example/client/service/TrackRecordManageService.java
+++ b/src/main/java/com/example/client/service/TrackRecordManageService.java
@@ -79,7 +79,7 @@
JComboBoxItem[] teamList = sysTeamGroupClassService.getTeamList(null);
String[] typeList = new String[]{
- "","鏀硅", "鍔犺", "鎹㈣", "淇悊","鏀硅繘鎬т慨鐞�"
+ "","鏀规崲瑁�","淇悊","鏀硅繘鎬т慨鐞�","涓嶅瑁呰澶�"
};
JComboBoxItem[] isealCabin = {
new JComboBoxItem(10000L, ""),
@@ -284,7 +284,14 @@
@Override
public void actionPerformed(ActionEvent e) {
JComboBoxItem project = (JComboBoxItem) comboBox.getSelectedItem();
- list = djJdgzTrackRecordService.getList(project.getId(), null, null, null, null, 0, 0,sb.getText());
+ 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()),sb.getText());
CommonTable.refreshTable(list, columnDto, table);
table.setRowHeight(25);
@@ -323,6 +330,7 @@
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("鏄惁鑱旇皟", "islt", 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));
@@ -400,7 +408,7 @@
// 妫�鏌ユ槸鍚︾偣鍑讳簡鏈夋晥鍗曞厓鏍�
if (row >= 0 && column >= 0) {
- if (column == 13) { // 鍒楃储寮曚粠0寮�濮�
+ if (column == 15) { // 鍒楃储寮曚粠0寮�濮�
// 鑾峰彇璇ュ崟鍏冩牸鐨勫��
Object cellValue = table.getValueAt(row, column);
Integer value = Integer.parseInt(cellValue.toString());
@@ -466,7 +474,7 @@
public void history(JFrame jFrame, Long level3NodeId) {
jFrame.setEnabled(false);
JFrame frame1 = new JFrame("鍘嗗彶璺熻釜璁板綍");
- frame1.setSize(1500, 800);
+ frame1.setSize(2000, 800);
frame1.setResizable(true);
frame1.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
frame1.setLocationRelativeTo(null);
@@ -494,19 +502,19 @@
new JComboBoxItem(1L, "鏈�"),
};
- columnDto.add(new ColumnDto("搴忓彿", "", 50, "autoCreate", false, null, null));
- columnDto.add(new ColumnDto("璺熻釜鏂瑰紡", "trackMethod", 80, "dict", false, null, trackList));
- columnDto.add(new ColumnDto("璺熻釜鍦扮偣", "trackLocation", 160, null, false, null, null));
- columnDto.add(new ColumnDto("鍔╀慨浜哄強鍏惰仈绯绘柟寮�", "trackPerson", 160, null, false, null, null));
- columnDto.add(new ColumnDto("鍘傛柟鍙婂叾鑱旂郴鏂瑰紡", "trackedPerson", 160, null, false, null, null));
- columnDto.add(new ColumnDto("鎬绘壙淇崟浣�", "generalRepair", 160, null, false, null, null));
- columnDto.add(new ColumnDto("鍒嗘壙淇崟浣�", "repair", 160, null, false, null, null));
- columnDto.add(new ColumnDto("鑺傜偣杩涘睍", "currentStatus", 100, "dict", false, null, statusList));
- columnDto.add(new ColumnDto("鏈夋棤鑴辨湡椋庨櫓", "hasDelayRisk", 50, "dict", false, null, hasDelayRiskList));
- columnDto.add(new ColumnDto("棰勮瀹屾垚鏃堕棿", "estimatedCompletionTime", 120, "selectDate", false, null, null));
- columnDto.add(new ColumnDto("瀛樺湪闂", "problem", 120, null, false, null, null));
- columnDto.add(new ColumnDto("鍚庣画璁″垝", "followupPlan", 120, null, false, null, null));
- columnDto.add(new ColumnDto("澶囨敞", "remark", 120, null, false, null, null));
+ columnDto.add(new ColumnDto("搴忓彿", "", 80, "autoCreate", false, null, null));
+ columnDto.add(new ColumnDto("璺熻釜鏂瑰紡", "trackMethod", 120, "dict", false, null, trackList));
+ columnDto.add(new ColumnDto("璺熻釜鍦扮偣", "trackLocation", 180, null, false, null, null));
+ columnDto.add(new ColumnDto("鍔╀慨浜�", "trackPerson", 180, null, false, null, null));
+ columnDto.add(new ColumnDto("鍘傛柟", "trackedPerson", 180, null, false, null, null));
+ columnDto.add(new ColumnDto("鎬绘壙淇崟浣�", "generalRepair", 180, null, false, null, null));
+ columnDto.add(new ColumnDto("鍒嗘壙淇崟浣�", "repair", 180, null, false, null, null));
+ columnDto.add(new ColumnDto("鑺傜偣杩涘睍", "currentStatus", 120, "dict", false, null, statusList));
+ columnDto.add(new ColumnDto("鑴辨湡椋庨櫓", "hasDelayRisk", 120, "dict", false, null, hasDelayRiskList));
+ columnDto.add(new ColumnDto("棰勮瀹屾垚鏃堕棿", "estimatedCompletionTime", 200, "selectDate", false, null, null));
+ columnDto.add(new ColumnDto("瀛樺湪闂", "problem", 180, null, false, null, null));
+ columnDto.add(new ColumnDto("鍚庣画璁″垝", "followupPlan", 180, null, false, null, null));
+ columnDto.add(new ColumnDto("澶囨敞", "remark", 180, null, false, null, null));
JTable subTable = CommonTable.createCommonTable(list, columnDto);
subTable.setRowHeight(25);
--
Gitblit v1.9.1