From efce7ce3e63712ecc8b4c3039a73b508fc3ea880 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 28 四月 2025 10:20:37 +0800
Subject: [PATCH] 修改
---
src/main/java/com/example/client/service/SubunitService.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/example/client/service/SubunitService.java b/src/main/java/com/example/client/service/SubunitService.java
index fa0276d..50476ba 100644
--- a/src/main/java/com/example/client/service/SubunitService.java
+++ b/src/main/java/com/example/client/service/SubunitService.java
@@ -66,7 +66,7 @@
JComboBoxItem[] teamList = sysTeamGroupClassService.getTeamList(null);
JComboBoxItem[] cabinList = cabinService.getList();
String[] typeList = new String[]{
- "","鏀硅", "鍔犺", "鎹㈣", "淇悊","鏀硅繘鎬т慨鐞�"
+ "","鏀规崲瑁�","淇悊","鏀硅繘鎬т慨鐞�","涓嶅瑁呰澶�"
};
List<DjJdgzShip> shipList = djJdgzShipService.getList();
Map<String, Long> shipMap = new HashMap<>();
@@ -120,7 +120,7 @@
jLeft.add(top, BorderLayout.NORTH);
List<ColumnDto> columnDto = new ArrayList<>();
- list = level3Service.getList(shipList.get(0).getId(), deptList[0].getId(), teamList[0].getId(), cabinList[0].getId(), typeList[0],null,null);
+ list = level3Service.getList(shipList.get(0).getId(), deptList[0].getId(), teamList[0].getId(), cabinList[0].getId(), typeList[0],null,null,null);
if (list == null || list.size() == 0) {
JOptionPane.showMessageDialog(null, "杩樻湭褰曞叆涓夌骇缃戠粶鍥炬暟鎹�", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
@@ -147,7 +147,7 @@
String type = comboBox4.getSelectedItem().toString();
Long shipId = shipMap.get(content);
- list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type,null,null);
+ list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type,null,null,null);
CommonTable.refreshTable(list, columnDto, subTable);
subTable.setRowHeight(25);
@@ -185,7 +185,7 @@
String type = comboBox4.getSelectedItem().toString();
Long shipId = shipMap.get(content);
- list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type,null,null);
+ list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type,null,null,null);
CommonTable.refreshTable(list, columnDto, subTable);
subTable.setRowHeight(25);
@@ -215,7 +215,7 @@
String type = comboBox4.getSelectedItem().toString();
Long shipId = shipMap.get(content);
- list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type,null,null);
+ list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type,null,null,null);
CommonTable.refreshTable(list, columnDto, subTable);
subTable.setRowHeight(25);
@@ -243,7 +243,7 @@
String type = comboBox4.getSelectedItem().toString();
Long shipId = shipMap.get(content);
- list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type,null,null);
+ list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type,null,null,null);
CommonTable.refreshTable(list, columnDto, subTable);
subTable.setRowHeight(25);
@@ -271,7 +271,7 @@
String type = comboBox4.getSelectedItem().toString();
Long shipId = shipMap.get(content);
- list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type,null,null);
+ list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type,null,null,null);
CommonTable.refreshTable(list, columnDto, subTable);
subTable.setRowHeight(25);
@@ -294,7 +294,7 @@
query.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
- list = level3Service.getList(null, null, null, null, null,null,sb.getText());
+ list = level3Service.getList(null, null, null, null, null,null,null,sb.getText());
CommonTable.refreshTable(list, columnDto, subTable);
subTable.setRowHeight(25);
--
Gitblit v1.9.1