From 92705ac08a97ddc4904795f024723aab69e1abd8 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期六, 05 四月 2025 21:47:59 +0800
Subject: [PATCH] 修改
---
src/main/java/com/example/client/service/Level1AddOrUpdate.java | 4
src/main/java/com/example/client/service/TrackRecordAddOrUpdate.java | 6
src/main/java/com/example/client/service/ImportDismantTrackService.java | 6
src/main/resources/templateFile/跟踪记录导入模板.xlsx | 0
src/main/java/com/example/client/service/DismantTrackAddOrUpdate.java | 4
src/main/java/com/example/server/progressTrack/service/DjJdgzDismantTrackService.java | 2
src/main/java/com/example/client/service/HandoverAddOrUpdate.java | 4
src/main/java/com/example/client/service/UserManageService.java | 2
src/main/java/com/example/server/progressTrack/model/DjJdgzNetworkLevel3.java | 3
src/main/java/com/example/client/service/DataImportManageService.java | 6
src/main/resources/mapper/progressTrack/DjJdgzNetworkLevel3Dao.xml | 3
src/main/java/com/example/client/service/ConfigManageService.java | 6
src/main/java/com/example/client/service/DataExportManageService.java | 4
src/main/java/com/example/client/service/Level3ViewService.java | 2
src/main/java/com/example/client/service/Level2AddOrUpdate.java | 4
src/main/java/com/example/client/service/TeamGroupAddOrUpdate.java | 19 +-
src/main/resources/templateFile/三级网络图导入模板.xlsx | 0
src/main/java/com/example/client/service/DismantTrackService.java | 14
src/main/java/com/example/client/service/SubunitService.java | 14
src/main/java/com/example/client/service/TrackRecordManageService.java | 115 ++++++++----
src/main/java/com/example/server/progressTrack/dao/DjJdgzNetworkLevel3Dao.java | 2
src/main/java/com/example/server/entity/FieldMetaObjectHandler.java | 12
src/main/java/com/example/client/service/ImportLevel2Service.java | 6
src/main/java/com/example/client/service/ImportLevel3Service.java | 8
src/main/java/com/example/client/service/Level3ManageService.java | 89 +++++++--
src/main/java/com/example/client/service/SubunitAddOrUpdate.java | 6
src/main/java/com/example/client/service/ShipManageService.java | 4
src/main/java/com/example/server/progressTrack/service/DjJdgzNetworkLevel3Service.java | 45 ++--
src/main/resources/db/csiczb1.db | 0
src/main/java/com/example/client/utils/MultiSelectComboBox2.java | 1
src/main/java/com/example/client/service/UserAddOrUpdate.java | 10
src/main/java/com/example/server/progressTrack/dao/DjJdgzTrackRecordDao.java | 2
src/main/java/com/example/server/utils/UserAndSiteUtils.java | 31 +++
src/main/java/com/example/client/service/ImportTrackRecordService.java | 8
src/main/java/com/example/server/progressTrack/service/DjJdgzTrackRecordService.java | 10
src/main/java/com/example/server/DataSync/service/DataSyncService.java | 15 +
src/main/java/com/example/client/service/MenuService.java | 4
src/main/java/com/example/client/service/Level3AddOrUpdate.java | 4
src/main/java/com/example/server/progressTrack/model/DjJdgzTrackRecord.java | 4
src/main/java/com/example/client/Login.java | 9
src/main/resources/mapper/progressTrack/DjJdgzTrackRecordDao.xml | 4
src/main/java/com/example/server/user/model/SysUser.java | 4
42 files changed, 320 insertions(+), 176 deletions(-)
diff --git a/src/main/java/com/example/client/Login.java b/src/main/java/com/example/client/Login.java
index be1237b..8339a98 100644
--- a/src/main/java/com/example/client/Login.java
+++ b/src/main/java/com/example/client/Login.java
@@ -4,7 +4,7 @@
import com.example.client.utils.GBC;
import com.example.server.user.model.SysUser;
import com.example.server.user.service.UserService;
-import com.example.server.utils.CacheUtils;
+import com.example.server.utils.UserAndSiteUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -198,10 +198,9 @@
} catch (IOException ep) {
ep.printStackTrace();
}
- user.setBoatfleet(finalTeam);
- CacheUtils.put("user", "user", user);
- CacheUtils.put("site", "site", finalSite);
- CacheUtils.put("teamGroup", "teamGroup", finalTeamGroup);
+ user.setBoatFleet(finalTeam);
+ UserAndSiteUtils.put("user", "user", user);
+ UserAndSiteUtils.put("site", "site", finalSite);
main.Start(role, user.getId());
frame.dispose();
} else {
diff --git a/src/main/java/com/example/client/service/ConfigManageService.java b/src/main/java/com/example/client/service/ConfigManageService.java
index 75ad3f7..fcc9e37 100644
--- a/src/main/java/com/example/client/service/ConfigManageService.java
+++ b/src/main/java/com/example/client/service/ConfigManageService.java
@@ -9,7 +9,7 @@
import com.example.server.DataSync.service.DataSyncService;
import com.example.server.teamGroup.service.SysTeamGroupClassService;
import com.example.server.user.model.SysUser;
-import com.example.server.utils.CacheUtils;
+import com.example.server.utils.UserAndSiteUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -149,8 +149,8 @@
properties.setProperty("site", comboBox.getSelectedItem().toString());
properties.setProperty("team", teamName.getText() + "TD");
properties.setProperty("teamGroup", String.valueOf(selectedIds));
- CacheUtils.remove("site", "site");
- CacheUtils.put("site", "site", comboBox.getSelectedItem().toString());
+ UserAndSiteUtils.remove("site", "site");
+ UserAndSiteUtils.put("site", "site", comboBox.getSelectedItem().toString());
properties.store(outputStream, "rxkj");
outputStream.close();
} catch (FileNotFoundException ex) {
diff --git a/src/main/java/com/example/client/service/DataExportManageService.java b/src/main/java/com/example/client/service/DataExportManageService.java
index 21fd0fd..b08575d 100644
--- a/src/main/java/com/example/client/service/DataExportManageService.java
+++ b/src/main/java/com/example/client/service/DataExportManageService.java
@@ -7,7 +7,7 @@
import com.example.server.progressTrack.dao.ExportRecordDao;
import com.example.server.progressTrack.model.ExportRecord;
import com.example.server.user.model.SysUser;
-import com.example.server.utils.CacheUtils;
+import com.example.server.utils.UserAndSiteUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -78,7 +78,7 @@
btnExport.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
- SysUser user = (SysUser) CacheUtils.get("user","user");
+ SysUser user = (SysUser) UserAndSiteUtils.get("user","user");
if (user==null){
JOptionPane.showMessageDialog(null, "鐢ㄦ埛澶辨晥璇烽��鍑哄苟閲嶆柊鐧诲綍", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
return;
diff --git a/src/main/java/com/example/client/service/DataImportManageService.java b/src/main/java/com/example/client/service/DataImportManageService.java
index e5180d3..8053049 100644
--- a/src/main/java/com/example/client/service/DataImportManageService.java
+++ b/src/main/java/com/example/client/service/DataImportManageService.java
@@ -10,7 +10,7 @@
import com.example.server.progressTrack.model.ExportRecord;
import com.example.server.progressTrack.model.ImportRecord;
import com.example.server.user.model.SysUser;
-import com.example.server.utils.CacheUtils;
+import com.example.server.utils.UserAndSiteUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -38,7 +38,7 @@
private JTable table;
public JPanel createTable(Integer width, Integer height, JFrame jFrame) {
- SysUser user = (SysUser) CacheUtils.get("user","user");
+ SysUser user = (SysUser) UserAndSiteUtils.get("user","user");
if (user==null){
JOptionPane.showMessageDialog(null, "鐢ㄦ埛澶辨晥璇烽��鍑哄苟閲嶆柊鐧诲綍", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
return null;
@@ -64,7 +64,7 @@
south.setPreferredSize(new Dimension((width - 10) / 2, (height-50)/3*2));
- String site = (String) CacheUtils.get("site", "site");
+ String site = (String) UserAndSiteUtils.get("site", "site");
JLabel label = new JLabel(site + "鏈哄櫒");
top.add(label);
diff --git a/src/main/java/com/example/client/service/DismantTrackAddOrUpdate.java b/src/main/java/com/example/client/service/DismantTrackAddOrUpdate.java
index f8850a7..ce64642 100644
--- a/src/main/java/com/example/client/service/DismantTrackAddOrUpdate.java
+++ b/src/main/java/com/example/client/service/DismantTrackAddOrUpdate.java
@@ -14,7 +14,7 @@
import com.example.server.progressTrack.service.DjJdgzNetworkLevel3Service;
import com.example.server.teamGroup.service.SysTeamGroupClassService;
import com.example.server.user.model.SysUser;
-import com.example.server.utils.CacheUtils;
+import com.example.server.utils.UserAndSiteUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -151,7 +151,7 @@
if (trackTable.isEditing()) {
trackTable.getCellEditor().stopCellEditing();
}
- SysUser user = (SysUser) CacheUtils.get("user", "user");
+ SysUser user = (SysUser) UserAndSiteUtils.get("user", "user");
if (user == null) {
JOptionPane.showMessageDialog(null, "褰撳墠鐢ㄦ埛宸插け鏁堣閲嶆柊鐧诲綍", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
return;
diff --git a/src/main/java/com/example/client/service/DismantTrackService.java b/src/main/java/com/example/client/service/DismantTrackService.java
index b4f85dd..9a1c1c0 100644
--- a/src/main/java/com/example/client/service/DismantTrackService.java
+++ b/src/main/java/com/example/client/service/DismantTrackService.java
@@ -113,7 +113,7 @@
top.add(query, new GBC(6, 1, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
List<ColumnDto> columnDto = new ArrayList<>();
- list = level3Service.getList(null, deptList[0].getId(), teamList[0].getId(), cabinList[0].getId(), typeList[0], null);
+ list = level3Service.getList(shipList.get(0).getId(), deptList[0].getId(), teamList[0].getId(), cabinList[0].getId(), typeList[0],null, null);
if (list == null || list.size() == 0) {
JOptionPane.showMessageDialog(null, "杩樻湭褰曞叆涓夌骇缃戠粶鍥炬暟鎹�", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
return null;
@@ -139,7 +139,7 @@
String type = comboBox4.getSelectedItem().toString();
Long shipId = shipMap.get(content);
- list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, null);
+ list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type,null, null);
CommonTable.refreshTable(list, columnDto, subTable);
subTable.setRowHeight(25);
@@ -178,7 +178,7 @@
String type = comboBox4.getSelectedItem().toString();
Long shipId = shipMap.get(content);
- list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, null);
+ list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, null,null);
CommonTable.refreshTable(list, columnDto, subTable);
subTable.setRowHeight(25);
@@ -208,7 +208,7 @@
String type = comboBox4.getSelectedItem().toString();
Long shipId = shipMap.get(content);
- list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, null);
+ list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type,null, null);
CommonTable.refreshTable(list, columnDto, subTable);
subTable.setRowHeight(25);
@@ -236,7 +236,7 @@
String type = comboBox4.getSelectedItem().toString();
Long shipId = shipMap.get(content);
- list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, null);
+ list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, null,null);
CommonTable.refreshTable(list, columnDto, subTable);
subTable.setRowHeight(25);
@@ -264,7 +264,7 @@
String type = comboBox4.getSelectedItem().toString();
Long shipId = shipMap.get(content);
- list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, null);
+ list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type,null, null);
CommonTable.refreshTable(list, columnDto, subTable);
subTable.setRowHeight(25);
@@ -287,7 +287,7 @@
query.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
- list = level3Service.getList(null, null, null, null, null, sb.getText());
+ list = level3Service.getList(null, null, null, null, null,null, sb.getText());
CommonTable.refreshTable(list, columnDto, subTable);
subTable.setRowHeight(25);
diff --git a/src/main/java/com/example/client/service/HandoverAddOrUpdate.java b/src/main/java/com/example/client/service/HandoverAddOrUpdate.java
index 1106bfa..7bddad5 100644
--- a/src/main/java/com/example/client/service/HandoverAddOrUpdate.java
+++ b/src/main/java/com/example/client/service/HandoverAddOrUpdate.java
@@ -12,7 +12,7 @@
import com.example.server.progressTrack.service.DjJdgzTrackRecordService;
import com.example.server.sysOss.model.SysOss;
import com.example.server.user.model.SysUser;
-import com.example.server.utils.CacheUtils;
+import com.example.server.utils.UserAndSiteUtils;
import org.apache.commons.lang3.StringUtils;
import org.jdesktop.swingx.JXDatePicker;
import org.springframework.beans.factory.annotation.Autowired;
@@ -177,7 +177,7 @@
saveButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
- SysUser user = (SysUser) CacheUtils.get("user","user");
+ SysUser user = (SysUser) UserAndSiteUtils.get("user","user");
if (user==null){
JOptionPane.showMessageDialog(null, "鐢ㄦ埛澶辨晥璇烽��鍑哄苟閲嶆柊鐧诲綍", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
return;
diff --git a/src/main/java/com/example/client/service/ImportDismantTrackService.java b/src/main/java/com/example/client/service/ImportDismantTrackService.java
index 1aebb3f..99b0b48 100644
--- a/src/main/java/com/example/client/service/ImportDismantTrackService.java
+++ b/src/main/java/com/example/client/service/ImportDismantTrackService.java
@@ -6,7 +6,7 @@
import com.example.server.progressTrack.model.DjJdgzNetworkLevel3;
import com.example.server.progressTrack.service.*;
import com.example.server.user.model.SysUser;
-import com.example.server.utils.CacheUtils;
+import com.example.server.utils.UserAndSiteUtils;
import com.example.server.utils.DownLoadTmpFile;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -139,7 +139,7 @@
return;
}
- SysUser user = (SysUser) CacheUtils.get("user","user");
+ SysUser user = (SysUser) UserAndSiteUtils.get("user","user");
if (user==null){
JOptionPane.showMessageDialog(null, "鐢ㄦ埛澶辨晥璇烽��鍑哄苟閲嶆柊鐧诲綍", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
return ;
@@ -250,7 +250,7 @@
return flag;
}
- SysUser user = (SysUser) CacheUtils.get("user","user");
+ SysUser user = (SysUser) UserAndSiteUtils.get("user","user");
if (user==null){
flag = false;
JOptionPane.showMessageDialog(null, "鐢ㄦ埛澶辨晥璇烽��鍑哄苟閲嶆柊鐧诲綍", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
diff --git a/src/main/java/com/example/client/service/ImportLevel2Service.java b/src/main/java/com/example/client/service/ImportLevel2Service.java
index 64cee0f..6e568b4 100644
--- a/src/main/java/com/example/client/service/ImportLevel2Service.java
+++ b/src/main/java/com/example/client/service/ImportLevel2Service.java
@@ -7,7 +7,7 @@
import com.example.server.progressTrack.model.DjJdgzNetworkLevel2List;
import com.example.server.progressTrack.service.DjJdgzNetworkLevel2ListService;
import com.example.server.user.model.SysUser;
-import com.example.server.utils.CacheUtils;
+import com.example.server.utils.UserAndSiteUtils;
import com.mxgraph.view.mxGraph;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -133,7 +133,7 @@
return;
}
- SysUser user = (SysUser) CacheUtils.get("user","user");
+ SysUser user = (SysUser) UserAndSiteUtils.get("user","user");
if (user==null){
JOptionPane.showMessageDialog(null, "鐢ㄦ埛澶辨晥璇烽��鍑哄苟閲嶆柊鐧诲綍", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
return;
@@ -245,7 +245,7 @@
return flag;
}
- SysUser user = (SysUser) CacheUtils.get("user","user");
+ SysUser user = (SysUser) UserAndSiteUtils.get("user","user");
if (user==null){
flag = false;
JOptionPane.showMessageDialog(null, "鐢ㄦ埛澶辨晥璇烽��鍑哄苟閲嶆柊鐧诲綍", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
diff --git a/src/main/java/com/example/client/service/ImportLevel3Service.java b/src/main/java/com/example/client/service/ImportLevel3Service.java
index 3f25be0..feb2866 100644
--- a/src/main/java/com/example/client/service/ImportLevel3Service.java
+++ b/src/main/java/com/example/client/service/ImportLevel3Service.java
@@ -8,7 +8,7 @@
import com.example.server.progressTrack.service.*;
import com.example.server.teamGroup.service.SysTeamGroupClassService;
import com.example.server.user.model.SysUser;
-import com.example.server.utils.CacheUtils;
+import com.example.server.utils.UserAndSiteUtils;
import com.example.server.utils.DownLoadTmpFile;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -241,7 +241,7 @@
return;
}
- SysUser user = (SysUser) CacheUtils.get("user","user");
+ SysUser user = (SysUser) UserAndSiteUtils.get("user","user");
if (user==null){
JOptionPane.showMessageDialog(null, "鐢ㄦ埛澶辨晥璇烽��鍑哄苟閲嶆柊鐧诲綍", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
return;
@@ -305,7 +305,7 @@
String[] typeList = new String[]{
"","鏀硅", "鍔犺", "鎹㈣", "淇悊","鏀硅繘鎬т慨鐞�"
};
- List<DjJdgzNetworkLevel3> list = level3Service.getList(null, deptList[0].getId(), teamList[0].getId(), cabinList[0].getId(), typeList[0],null);
+ List<DjJdgzNetworkLevel3> list = level3Service.getList(null, deptList[0].getId(), teamList[0].getId(), cabinList[0].getId(), typeList[0],0,null);
CommonTable.refreshTable(list, columnDto, subTable);
level3ManageService.tableModelListener(list, subTable, jFrame);
System.out.println("瀵煎叆鎴愬姛鏃堕棿" + new Date());
@@ -360,7 +360,7 @@
return flag;
}
- SysUser user = (SysUser) CacheUtils.get("user","user");
+ SysUser user = (SysUser) UserAndSiteUtils.get("user","user");
if (user==null){
flag = false;
JOptionPane.showMessageDialog(null, "鐢ㄦ埛澶辨晥璇烽��鍑哄苟閲嶆柊鐧诲綍", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
diff --git a/src/main/java/com/example/client/service/ImportTrackRecordService.java b/src/main/java/com/example/client/service/ImportTrackRecordService.java
index a84efa9..26d589a 100644
--- a/src/main/java/com/example/client/service/ImportTrackRecordService.java
+++ b/src/main/java/com/example/client/service/ImportTrackRecordService.java
@@ -8,7 +8,7 @@
import com.example.server.progressTrack.service.*;
import com.example.server.teamGroup.service.SysTeamGroupClassService;
import com.example.server.user.model.SysUser;
-import com.example.server.utils.CacheUtils;
+import com.example.server.utils.UserAndSiteUtils;
import com.example.server.utils.DownLoadTmpFile;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -269,7 +269,7 @@
return;
}
- SysUser user = (SysUser) CacheUtils.get("user","user");
+ SysUser user = (SysUser) UserAndSiteUtils.get("user","user");
if (user==null){
JOptionPane.showMessageDialog(null, "鐢ㄦ埛澶辨晥璇烽��鍑哄苟閲嶆柊鐧诲綍", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
return;
@@ -333,7 +333,7 @@
String[] typeList = new String[]{
"","鏀硅", "鍔犺", "鎹㈣", "淇悊","鏀硅繘鎬т慨鐞�"
};
- List<DjJdgzTrackRecord> list = djJdgzTrackRecordService.getList(level1Id[0], deptList[0].getId(), teamList[0].getId(), cabinList[0].getId(), typeList[0], 0, null);
+ List<DjJdgzTrackRecord> list = djJdgzTrackRecordService.getList(level1Id[0], deptList[0].getId(), teamList[0].getId(), cabinList[0].getId(), typeList[0], 0,0, null);
CommonTable.refreshTable(list, columnDto, subTable);
trackRecordManageService.tableModelListener(subTable, jFrame, list);
System.out.println("瀵煎叆鎴愬姛鏃堕棿" + new Date());
@@ -388,7 +388,7 @@
return flag;
}
- SysUser user = (SysUser) CacheUtils.get("user","user");
+ SysUser user = (SysUser) UserAndSiteUtils.get("user","user");
if (user==null){
flag = false;
JOptionPane.showMessageDialog(null, "鐢ㄦ埛澶辨晥璇烽��鍑哄苟閲嶆柊鐧诲綍", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
diff --git a/src/main/java/com/example/client/service/Level1AddOrUpdate.java b/src/main/java/com/example/client/service/Level1AddOrUpdate.java
index 8faca10..c57ff3b 100644
--- a/src/main/java/com/example/client/service/Level1AddOrUpdate.java
+++ b/src/main/java/com/example/client/service/Level1AddOrUpdate.java
@@ -8,7 +8,7 @@
import com.example.server.progressTrack.service.DjJdgzNetworkLevel1ListService;
import com.example.server.progressTrack.service.NetWorkDiagramService;
import com.example.server.user.model.SysUser;
-import com.example.server.utils.CacheUtils;
+import com.example.server.utils.UserAndSiteUtils;
import com.mxgraph.swing.mxGraphComponent;
import com.mxgraph.view.mxGraph;
import org.apache.poi.ss.usermodel.HorizontalAlignment;
@@ -161,7 +161,7 @@
btnSave.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
- SysUser user = (SysUser) CacheUtils.get("user","user");
+ SysUser user = (SysUser) UserAndSiteUtils.get("user","user");
if (user==null){
JOptionPane.showMessageDialog(null, "鐢ㄦ埛澶辨晥璇烽��鍑哄苟閲嶆柊鐧诲綍", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
return;
diff --git a/src/main/java/com/example/client/service/Level2AddOrUpdate.java b/src/main/java/com/example/client/service/Level2AddOrUpdate.java
index 5aee1a8..60bc7c0 100644
--- a/src/main/java/com/example/client/service/Level2AddOrUpdate.java
+++ b/src/main/java/com/example/client/service/Level2AddOrUpdate.java
@@ -10,7 +10,7 @@
import com.example.server.progressTrack.model.DjJdgzNetworkLevel2List;
import com.example.server.progressTrack.service.*;
import com.example.server.user.model.SysUser;
-import com.example.server.utils.CacheUtils;
+import com.example.server.utils.UserAndSiteUtils;
import com.mxgraph.swing.mxGraphComponent;
import com.mxgraph.view.mxGraph;
import org.apache.commons.lang3.StringUtils;
@@ -204,7 +204,7 @@
btnSave.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
- SysUser user = (SysUser) CacheUtils.get("user","user");
+ SysUser user = (SysUser) UserAndSiteUtils.get("user","user");
if (user==null){
JOptionPane.showMessageDialog(null, "鐢ㄦ埛澶辨晥璇烽��鍑哄苟閲嶆柊鐧诲綍", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
return;
diff --git a/src/main/java/com/example/client/service/Level3AddOrUpdate.java b/src/main/java/com/example/client/service/Level3AddOrUpdate.java
index 3031d43..301e001 100644
--- a/src/main/java/com/example/client/service/Level3AddOrUpdate.java
+++ b/src/main/java/com/example/client/service/Level3AddOrUpdate.java
@@ -13,7 +13,7 @@
import com.example.server.progressTrack.service.NetWorkDiagramService;
import com.example.server.teamGroup.service.SysTeamGroupClassService;
import com.example.server.user.model.SysUser;
-import com.example.server.utils.CacheUtils;
+import com.example.server.utils.UserAndSiteUtils;
import com.mxgraph.swing.mxGraphComponent;
import com.mxgraph.view.mxGraph;
import org.springframework.beans.factory.annotation.Autowired;
@@ -163,7 +163,7 @@
btnSave.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
- SysUser user = (SysUser) CacheUtils.get("user","user");
+ SysUser user = (SysUser) UserAndSiteUtils.get("user","user");
if (user==null){
JOptionPane.showMessageDialog(null, "鐢ㄦ埛澶辨晥璇烽��鍑哄苟閲嶆柊鐧诲綍", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
return;
diff --git a/src/main/java/com/example/client/service/Level3ManageService.java b/src/main/java/com/example/client/service/Level3ManageService.java
index 4558479..8a77db6 100644
--- a/src/main/java/com/example/client/service/Level3ManageService.java
+++ b/src/main/java/com/example/client/service/Level3ManageService.java
@@ -80,6 +80,10 @@
String[] typeList = new String[]{
"","鏀硅", "鍔犺", "鎹㈣", "淇悊","鏀硅繘鎬т慨鐞�"
};
+ JComboBoxItem[] isealCabin = {
+ new JComboBoxItem(0L, "鍚�"),
+ new JComboBoxItem(1L, "鏄�"),
+ };
JLabel JLabel0 = new JLabel("宸ョ▼");
JComboBox comboBox = new JComboBox();
@@ -103,6 +107,10 @@
JComboBox<String> comboBox4 = new JComboBox<>(typeList);
comboBox4.setPreferredSize(new Dimension(185, 28));
+ JLabel JLabel5 = new JLabel("鏄惁褰卞搷灏佽埍");
+ JComboBox<JComboBoxItem> comboBox5 = new JComboBox<>(isealCabin);
+ comboBox5.setPreferredSize(new Dimension(185, 28));
+
JTextField sb = new JTextField(16);
JButton query = new JButton("鏌ヨ");
@@ -120,12 +128,14 @@
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(sb, new GBC(0, 1, 2, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
- topJpanel.add(query, new GBC(2, 1, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
- topJpanel.add(btnInsert, new GBC(3, 1, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
- topJpanel.add(btnImport, new GBC(4, 1, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
+ topJpanel.add(JLabel5, new GBC(0, 1, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
+ topJpanel.add(comboBox5, new GBC(1, 1, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
+ topJpanel.add(sb, new GBC(2, 1, 2, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
+ topJpanel.add(query, new GBC(4, 1, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
+ topJpanel.add(btnInsert, new GBC(5, 1, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
+ topJpanel.add(btnImport, new GBC(6, 1, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
- list = level3Service.getList(shipList.get(0).getId(), deptList[0].getId(), teamList[0].getId(), cabinList[0].getId(), typeList[0], null);
+ list = level3Service.getList(shipList.get(0).getId(), deptList[0].getId(), teamList[0].getId(), cabinList[0].getId(), typeList[0], Math.toIntExact(isealCabin[0].getId()), null);
List<TableButton> buttonList = new ArrayList<>();
buttonList.add(new TableButton("edit", "缂栬緫"));
buttonList.add(new TableButton("del", "鍒犻櫎"));
@@ -133,15 +143,16 @@
columnDto = new ArrayList<>();
//columnDto.add(new ColumnDto("ID", "id", -1, null,false));
- columnDto.add(new ColumnDto("搴忓彿", "", 176, "autoCreate", false, null, null));
+ columnDto.add(new ColumnDto("搴忓彿", "", 100, "autoCreate", false, null, null));
//columnDto.add(new ColumnDto("宸ョ▼", "ProjectName", 150, null, false, null, null));
columnDto.add(new ColumnDto("閮ㄩ棬", "deptId", 176, "dict", false, null, deptList));
columnDto.add(new ColumnDto("涓撲笟", "teamgroupId", 176, "dict", false, null, teamList));
- columnDto.add(new ColumnDto("鑸卞", "cabinId", 176, "dict", false, null, cabinList));
- columnDto.add(new ColumnDto("绫诲埆", "type", 176, null, false, null, null));
- columnDto.add(new ColumnDto("涓�绾х綉缁滃浘鑺傜偣鍚嶇О", "level1NodeName", 176, null, false, null, null));
+ columnDto.add(new ColumnDto("鑸卞", "cabinId", 100, "dict", false, null, cabinList));
+ columnDto.add(new ColumnDto("绫诲埆", "type", 120, null, false, null, null));
+ columnDto.add(new ColumnDto("涓�绾х綉缁滃浘鑺傜偣鍚嶇О", "level1NodeName", 185, null, false, null, null));
columnDto.add(new ColumnDto("浜岀骇缃戠粶鍥捐妭鐐瑰悕绉�", "level2NodeName", 185, null, false, null, null));
columnDto.add(new ColumnDto("涓夌骇缃戠粶鍥惧悕绉�", "name", 176, null, false, null, null));
+ columnDto.add(new ColumnDto("鏄惁褰卞搷灏佽埍", "isealCabin", 176, "dict", false, null, isealCabin));
columnDto.add(new ColumnDto("鎿嶄綔", "", 190, "", true, buttonList, null));
table = CommonTable.createCommonTable(list, columnDto);
@@ -161,9 +172,10 @@
JComboBoxItem team = (JComboBoxItem) comboBox2.getSelectedItem();
JComboBoxItem cabin = (JComboBoxItem) comboBox3.getSelectedItem();
String type = comboBox4.getSelectedItem().toString();
+ JComboBoxItem isCabin = (JComboBoxItem) comboBox5.getSelectedItem();
Long shipId = shipMap.get(content);
- list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, null);
+ list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(isCabin.getId()),null);
CommonTable.refreshTable(list, columnDto, table);
table.setRowHeight(25);
@@ -187,10 +199,11 @@
JComboBoxItem dept = (JComboBoxItem) comboBox1.getSelectedItem();
JComboBoxItem team = (JComboBoxItem) comboBox2.getSelectedItem();
JComboBoxItem cabin = (JComboBoxItem) comboBox3.getSelectedItem();
+ JComboBoxItem isCabin = (JComboBoxItem) comboBox5.getSelectedItem();
String type = comboBox4.getSelectedItem().toString();
Long shipId = shipMap.get(content);
- list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, null);
+ list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(isCabin.getId()),null);
CommonTable.refreshTable(list, columnDto, table);
table.setRowHeight(25);
@@ -208,10 +221,11 @@
JComboBoxItem dept = (JComboBoxItem) comboBox1.getSelectedItem();
JComboBoxItem team = (JComboBoxItem) comboBox2.getSelectedItem();
JComboBoxItem cabin = (JComboBoxItem) comboBox3.getSelectedItem();
+ JComboBoxItem isCabin = (JComboBoxItem) comboBox5.getSelectedItem();
String type = comboBox4.getSelectedItem().toString();
Long shipId = shipMap.get(content);
- list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, null);
+ list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(isCabin.getId()),null);
CommonTable.refreshTable(list, columnDto, table);
table.setRowHeight(25);
@@ -226,10 +240,11 @@
JComboBoxItem dept = (JComboBoxItem) comboBox1.getSelectedItem();
JComboBoxItem team = (JComboBoxItem) comboBox2.getSelectedItem();
JComboBoxItem cabin = (JComboBoxItem) comboBox3.getSelectedItem();
+ JComboBoxItem isCabin = (JComboBoxItem) comboBox5.getSelectedItem();
String type = comboBox4.getSelectedItem().toString();
Long shipId = shipMap.get(content);
- list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, null);
+ list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(isCabin.getId()),null);
CommonTable.refreshTable(list, columnDto, table);
table.setRowHeight(25);
@@ -244,10 +259,11 @@
JComboBoxItem dept = (JComboBoxItem) comboBox1.getSelectedItem();
JComboBoxItem team = (JComboBoxItem) comboBox2.getSelectedItem();
JComboBoxItem cabin = (JComboBoxItem) comboBox3.getSelectedItem();
+ JComboBoxItem isCabin = (JComboBoxItem) comboBox5.getSelectedItem();
String type = comboBox4.getSelectedItem().toString();
Long shipId = shipMap.get(content);
- list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, null);
+ list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(isCabin.getId()),null);
CommonTable.refreshTable(list, columnDto, table);
table.setRowHeight(25);
@@ -257,10 +273,31 @@
}
});
+ comboBox5.addItemListener(new ItemListener() {
+ public void itemStateChanged(final ItemEvent event) {
+ String content = comboBox.getSelectedItem().toString();
+ JComboBoxItem dept = (JComboBoxItem) comboBox1.getSelectedItem();
+ JComboBoxItem team = (JComboBoxItem) comboBox2.getSelectedItem();
+ JComboBoxItem cabin = (JComboBoxItem) comboBox3.getSelectedItem();
+ JComboBoxItem isCabin = (JComboBoxItem) comboBox5.getSelectedItem();
+ String type = comboBox4.getSelectedItem().toString();
+
+ Long shipId = shipMap.get(content);
+ list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type, Math.toIntExact(isCabin.getId()),null);
+
+ CommonTable.refreshTable(list, columnDto, table);
+ table.setRowHeight(25);
+
+ table.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
+ tableModelListener(list, table, jFrame);
+ }
+ });
+
+
query.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
- list = level3Service.getList(null, null, null, null, null, sb.getText());
+ list = level3Service.getList(null, null, null, null, null,null, sb.getText());
CommonTable.refreshTable(list, columnDto, table);
table.setRowHeight(25);
@@ -310,7 +347,7 @@
private void insert(JFrame jFrame) {
JFrame frame1 = new JFrame("鏂板涓夌骇缃戠粶鍥�");
- frame1.setSize(470, 430);
+ frame1.setSize(500, 460);
frame1.setResizable(true);
frame1.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
frame1.setLocationRelativeTo(null);
@@ -331,6 +368,10 @@
JComboBoxItem[] teamList = sysTeamGroupClassService.getTeamList(null);
String[] typeList = new String[]{
"","鏀硅", "鍔犺", "鎹㈣", "淇悊","鏀硅繘鎬т慨鐞�"
+ };
+ JComboBoxItem[] isealCabin = {
+ new JComboBoxItem(0L, "鍚�"),
+ new JComboBoxItem(1L, "鏄�"),
};
JLabel JLabel1 = new JLabel("宸ョ▼");
@@ -363,6 +404,9 @@
JLabel JLabel7 = new JLabel("绫诲埆");
JComboBox<String> comboBox6 = new JComboBox<>(typeList);
+ JLabel JLabel78 = new JLabel("鏄惁褰卞搷灏佽埍");
+ JComboBox<JComboBoxItem> comboBox7 = new JComboBox<>(isealCabin);
+ comboBox7.setPreferredSize(new Dimension(185, 28));
JLabel JLabel8 = new JLabel("涓夌骇缃戠粶鍥惧悕绉�");
JTextField level3Name = new JTextField(16);
@@ -435,11 +479,13 @@
frame1.add(JLabel7, new GBC(0, 6, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
frame1.add(comboBox6, new GBC(1, 6, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
+ frame1.add(JLabel78, new GBC(0, 7, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
+ frame1.add(comboBox7, new GBC(1, 7, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
- frame1.add(JLabel8, new GBC(0, 7, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
- frame1.add(level3Name, new GBC(1, 7, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
+ frame1.add(JLabel8, new GBC(0, 8, 1, 1).setAnchor(GBC.SOUTHEAST).setInsets(5));
+ frame1.add(level3Name, new GBC(1, 8, 1, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
- frame1.add(btnSave, new GBC(0, 8, 2, 1).setWeight(1, 0));
+ frame1.add(btnSave, new GBC(0, 9, 2, 1).setWeight(1, 0));
btnSave.addActionListener((e) -> {
JComboBoxItem level1 = (JComboBoxItem) comboBox0.getSelectedItem();
@@ -447,6 +493,7 @@
JComboBoxItem level2Node = (JComboBoxItem) comboBox2.getSelectedItem();
JComboBoxItem dept = (JComboBoxItem) comboBox3.getSelectedItem();
JComboBoxItem team = (JComboBoxItem) comboBox4.getSelectedItem();
+ JComboBoxItem isealCabinItem = (JComboBoxItem) comboBox7.getSelectedItem();
Set<JComboBoxItem> selectedItems = comboBox5.getSelectedItems();
StringBuilder selectedIds = new StringBuilder();
for (JComboBoxItem item : selectedItems) {
@@ -459,13 +506,14 @@
data.setLevel2NetworkId(level2.getId());
data.setLevel2NodeId(level2Node.getId());
data.setName(name);
+ data.setIsealCabin(Math.toIntExact(isealCabinItem.getId()));
data.setDeptId(dept.getId());
data.setTeamgroupId(team.getId());
data.setTeamgroupName(team.getName());
data.setCabinId(String.valueOf(selectedIds));
data.setType(comboBox6.getSelectedItem().toString());
level3Service.insert(data);
- list = level3Service.getList(level1Data.getShipId(), deptList[0].getId(), teamList[0].getId(), cabinList[0].getId(), typeList[0], null);
+ list = level3Service.getList(level1Data.getShipId(), deptList[0].getId(), teamList[0].getId(), cabinList[0].getId(), typeList[0], Math.toIntExact(isealCabin[0].getId()), null);
CommonTable.refreshTable(list, columnDto, table);
table.setRowHeight(25);
@@ -473,6 +521,7 @@
tableModelListener(list, table, jFrame);
frame1.dispose();
jFrame.setEnabled(true);//灏嗕富鐣岄潰鍐嶈缃负鍙搷浣滅殑
+ JOptionPane.showMessageDialog(null, "淇濆瓨鎴愬姛", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
});
}
diff --git a/src/main/java/com/example/client/service/Level3ViewService.java b/src/main/java/com/example/client/service/Level3ViewService.java
index 4479a87..c2c3954 100644
--- a/src/main/java/com/example/client/service/Level3ViewService.java
+++ b/src/main/java/com/example/client/service/Level3ViewService.java
@@ -41,7 +41,7 @@
// 鍒涘缓瀛愯〃鏍�
List<ColumnDto> columnDto = new ArrayList<>();
- List<DjJdgzNetworkLevel3> list = level3Service.getList(null, null, null, null, null,null);
+ List<DjJdgzNetworkLevel3> list = level3Service.getList(null, null, null, null, null,null,null);
//columnDto.add(new ColumnDto("ID", "id", -1, null,false));
diff --git a/src/main/java/com/example/client/service/MenuService.java b/src/main/java/com/example/client/service/MenuService.java
index 0716926..5e3114f 100644
--- a/src/main/java/com/example/client/service/MenuService.java
+++ b/src/main/java/com/example/client/service/MenuService.java
@@ -4,7 +4,7 @@
import com.example.client.Main;
import com.example.server.menu.model.Menu;
import com.example.server.menu.service.SysMenuService;
-import com.example.server.utils.CacheUtils;
+import com.example.server.utils.UserAndSiteUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -61,7 +61,7 @@
node.setMenuName("榛樿鏍硅妭鐐�");
DefaultMutableTreeNode rootNode = new DefaultMutableTreeNode(node);
- String site = (String) CacheUtils.get("site", "site");
+ String site = (String) UserAndSiteUtils.get("site", "site");
List<Menu> list = menuService.getList(site);
createSubNode(rootNode, list);
diff --git a/src/main/java/com/example/client/service/ShipManageService.java b/src/main/java/com/example/client/service/ShipManageService.java
index eeabd81..70f3f16 100644
--- a/src/main/java/com/example/client/service/ShipManageService.java
+++ b/src/main/java/com/example/client/service/ShipManageService.java
@@ -12,7 +12,7 @@
import com.example.server.progressTrack.service.DjJdgzNetworkLevel1Service;
import com.example.server.progressTrack.service.DjJdgzShipService;
import com.example.server.user.model.SysUser;
-import com.example.server.utils.CacheUtils;
+import com.example.server.utils.UserAndSiteUtils;
import org.jdesktop.swingx.JXDatePicker;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -101,7 +101,7 @@
btnSave.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
- SysUser user = (SysUser) CacheUtils.get("user","user");
+ SysUser user = (SysUser) UserAndSiteUtils.get("user","user");
if (user==null){
JOptionPane.showMessageDialog(null, "鐢ㄦ埛澶辨晥璇烽��鍑哄苟閲嶆柊鐧诲綍", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
return;
diff --git a/src/main/java/com/example/client/service/SubunitAddOrUpdate.java b/src/main/java/com/example/client/service/SubunitAddOrUpdate.java
index 9def481..6b23d93 100644
--- a/src/main/java/com/example/client/service/SubunitAddOrUpdate.java
+++ b/src/main/java/com/example/client/service/SubunitAddOrUpdate.java
@@ -15,7 +15,7 @@
import com.example.server.progressTrack.service.DjJdgzNetworkLevel3Service;
import com.example.server.teamGroup.service.SysTeamGroupClassService;
import com.example.server.user.model.SysUser;
-import com.example.server.utils.CacheUtils;
+import com.example.server.utils.UserAndSiteUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -91,7 +91,7 @@
@Override
public void actionPerformed(ActionEvent e) {
nowFrame.setEnabled(false);
- SysUser user = (SysUser) CacheUtils.get("user", "user");
+ SysUser user = (SysUser) UserAndSiteUtils.get("user", "user");
if (user == null) {
nowFrame.setEnabled(true);
JOptionPane.showMessageDialog(null, "褰撳墠鐢ㄦ埛宸插け鏁堣閲嶆柊鐧诲綍", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
@@ -176,7 +176,7 @@
frame1.add(btnSave, new GBC(0, 2, 2, 1).setWeight(1, 0));
btnSave.addActionListener((e) -> {
- SysUser user = (SysUser) CacheUtils.get("user","user");
+ SysUser user = (SysUser) UserAndSiteUtils.get("user","user");
if (user==null){
JOptionPane.showMessageDialog(null, "鐢ㄦ埛澶辨晥璇烽��鍑哄苟閲嶆柊鐧诲綍", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
return;
diff --git a/src/main/java/com/example/client/service/SubunitService.java b/src/main/java/com/example/client/service/SubunitService.java
index 51c101e..fa0276d 100644
--- a/src/main/java/com/example/client/service/SubunitService.java
+++ b/src/main/java/com/example/client/service/SubunitService.java
@@ -120,7 +120,7 @@
jLeft.add(top, BorderLayout.NORTH);
List<ColumnDto> columnDto = new ArrayList<>();
- list = level3Service.getList(null, deptList[0].getId(), teamList[0].getId(), cabinList[0].getId(), typeList[0],null);
+ list = level3Service.getList(shipList.get(0).getId(), deptList[0].getId(), teamList[0].getId(), cabinList[0].getId(), typeList[0],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);
+ list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type,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);
+ list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type,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);
+ list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type,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);
+ list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type,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);
+ list = level3Service.getList(shipId, dept.getId(), team.getId(), cabin.getId(), type,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,sb.getText());
+ list = level3Service.getList(null, null, null, null, null,null,sb.getText());
CommonTable.refreshTable(list, columnDto, subTable);
subTable.setRowHeight(25);
diff --git a/src/main/java/com/example/client/service/TeamGroupAddOrUpdate.java b/src/main/java/com/example/client/service/TeamGroupAddOrUpdate.java
index a6d2fe4..3f56a13 100644
--- a/src/main/java/com/example/client/service/TeamGroupAddOrUpdate.java
+++ b/src/main/java/com/example/client/service/TeamGroupAddOrUpdate.java
@@ -10,7 +10,7 @@
import com.example.server.teamGroup.service.SysTeamGroupClassService;
import com.example.server.user.model.SysUser;
import com.example.server.user.service.UserService;
-import com.example.server.utils.CacheUtils;
+import com.example.server.utils.UserAndSiteUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -53,7 +53,7 @@
JLabel JLabel0 = new JLabel("绫诲瀷");
JComboBox<String> comboBox1 = new JComboBox<>(typeList);
- comboBox1.setPreferredSize(new Dimension(185,28));
+ comboBox1.setPreferredSize(new Dimension(185, 28));
if (StringUtils.isNotBlank(data.getType())) {
comboBox1.setSelectedItem(data.getType());
}
@@ -66,11 +66,11 @@
JLabel JLabel4 = new JLabel("鎵�灞為儴闂�");
JComboBox<JComboBoxItem> comboBox2 = new JComboBox<>(deptList);
- comboBox2.setPreferredSize(new Dimension(185,28));
+ comboBox2.setPreferredSize(new Dimension(185, 28));
if (data.getPid() != null) {
- if (data.getPid()!=0){
+ if (data.getPid() != 0) {
comboBox2.setSelectedItem(BoxIteUtils.GetSelectItemById(deptList, data.getPid()));
- }else {
+ } else {
comboBox2.setEditable(false);
}
}
@@ -106,8 +106,8 @@
saveButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
- SysUser user = (SysUser) CacheUtils.get("user","user");
- if (user==null){
+ SysUser user = (SysUser) UserAndSiteUtils.get("user", "user");
+ if (user == null) {
JOptionPane.showMessageDialog(null, "鐢ㄦ埛澶辨晥璇烽��鍑哄苟閲嶆柊鐧诲綍", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
return;
}
@@ -120,7 +120,7 @@
data.setSort(sortMax + 100);
} else {
data.setPid(dept.getId());
- sortMax = sysTeamGroupClassService.getSortMax(dept.getId());
+ sortMax = sysTeamGroupClassService.getSortMax(dept.getId()) == null ? 0 : sysTeamGroupClassService.getSortMax(dept.getId());
data.setSort(sortMax + 1);
}
@@ -130,7 +130,8 @@
sysTeamGroupClassService.save(data);
- List<SysTeamGroupClass> list = sysTeamGroupClassService.getListByTree();;
+ List<SysTeamGroupClass> list = sysTeamGroupClassService.getListByTree();
+ ;
CommonTable.refreshTable(list, columnDto, table);
teamGroupManageService.tableModelListener(table, jFrame, list);
frame1.dispose();
diff --git a/src/main/java/com/example/client/service/TrackRecordAddOrUpdate.java b/src/main/java/com/example/client/service/TrackRecordAddOrUpdate.java
index d90ef1a..471b063 100644
--- a/src/main/java/com/example/client/service/TrackRecordAddOrUpdate.java
+++ b/src/main/java/com/example/client/service/TrackRecordAddOrUpdate.java
@@ -11,7 +11,7 @@
import com.example.server.progressTrack.service.*;
import com.example.server.sysOss.model.SysOss;
import com.example.server.user.model.SysUser;
-import com.example.server.utils.CacheUtils;
+import com.example.server.utils.UserAndSiteUtils;
import org.apache.commons.lang3.StringUtils;
import org.jdesktop.swingx.JXDatePicker;
import org.springframework.beans.factory.annotation.Autowired;
@@ -298,7 +298,7 @@
saveButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
- SysUser user = (SysUser) CacheUtils.get("user", "user");
+ SysUser user = (SysUser) UserAndSiteUtils.get("user", "user");
if (user == null) {
JOptionPane.showMessageDialog(null, "褰撳墠鐢ㄦ埛宸插け鏁堣閲嶆柊鐧诲綍", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
return;
@@ -343,7 +343,7 @@
data.setRemark(remark.getText());
Long id = djJdgzTrackRecordService.save(data);
uploadFile.save(id);
- List<DjJdgzTrackRecord> list = djJdgzTrackRecordService.getList(level1Id, level3.getDeptId(), null, null, level3.getType(), 0, null);
+ List<DjJdgzTrackRecord> list = djJdgzTrackRecordService.getList(level1Id, level3.getDeptId(), null, null, level3.getType(), 0,0, null);
CommonTable.refreshTable(list, columnDto, table);
trackRecordManageService.tableModelListener(table, jFrame, list);
frame1.dispose();
diff --git a/src/main/java/com/example/client/service/TrackRecordManageService.java b/src/main/java/com/example/client/service/TrackRecordManageService.java
index d4bcada..f38194d 100644
--- a/src/main/java/com/example/client/service/TrackRecordManageService.java
+++ b/src/main/java/com/example/client/service/TrackRecordManageService.java
@@ -11,7 +11,7 @@
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 com.example.server.utils.UserAndSiteUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -81,35 +81,43 @@
String[] typeList = new String[]{
"","鏀硅", "鍔犺", "鎹㈣", "淇悊","鏀硅繘鎬т慨鐞�"
};
+ JComboBoxItem[] isealCabin = {
+ 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(200, 28));
JLabel JLabel1 = new JLabel("閮ㄩ棬");
JComboBox<JComboBoxItem> comboBox1 = new JComboBox<>(deptList);
- comboBox1.setPreferredSize(new Dimension(150, 28));
+ comboBox1.setPreferredSize(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));
JLabel JLabel3 = new JLabel("鑸卞");
JComboBox<JComboBoxItem> comboBox3 = new JComboBox<>(cabinList);
- comboBox3.setPreferredSize(new Dimension(150, 28));
+ comboBox3.setPreferredSize(new Dimension(140, 28));
JLabel JLabel4 = new JLabel("绫诲埆");
JComboBox<String> comboBox4 = new JComboBox<>(typeList);
- comboBox4.setPreferredSize(new Dimension(150, 28));
+ comboBox4.setPreferredSize(new Dimension(140, 28));
JLabel JLabel5 = new JLabel("鐘舵��");
JComboBox<JComboBoxItem> comboBox5 = new JComboBox<>(statusList);
- comboBox5.setPreferredSize(new Dimension(150, 28));
+ comboBox5.setPreferredSize(new Dimension(140, 28));
+
+ JLabel JLabel78 = new JLabel("鏄惁褰卞搷灏佽埍");
+ JComboBox<JComboBoxItem> comboBox7 = new JComboBox<>(isealCabin);
+ comboBox7.setPreferredSize(new Dimension(140, 28));
JTextField sb = new JTextField(16);
- sb.setPreferredSize(new Dimension(150, 28));
+ sb.setPreferredSize(new Dimension(140, 28));
JButton query = new JButton("鏌ヨ");
JButton btnTj = new JButton("缁熻鎶ヨ〃");
@@ -126,7 +134,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);
@@ -149,7 +159,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);
@@ -168,7 +180,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);
@@ -187,7 +201,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);
@@ -205,7 +221,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);
@@ -223,8 +241,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);
@@ -237,7 +275,7 @@
@Override
public void actionPerformed(ActionEvent e) {
JComboBoxItem project = (JComboBoxItem) comboBox.getSelectedItem();
- list = djJdgzTrackRecordService.getList(project.getId(), null, null, null, null, 0, sb.getText());
+ list = djJdgzTrackRecordService.getList(project.getId(), null, null, null, null, 0, 0,sb.getText());
CommonTable.refreshTable(list, columnDto, table);
table.setRowHeight(25);
@@ -256,7 +294,7 @@
}
});
- 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;
@@ -275,6 +313,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));
@@ -297,7 +336,6 @@
String[] items = itemList.toArray(new String[0]);
columnModel = table.getColumnModel();
MultiSelectComboBox2 mulcomboBox = new MultiSelectComboBox2(items, columnDto, columnModel);
-
/* final Integer[] lastIndex = {-1};
mulcomboBox.addItemListener(new ItemListener() {
@Override
@@ -322,27 +360,28 @@
});*/
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(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(comboBox, new GBC(1, 0, 3, 1).setAnchor(GBC.SOUTHWEST).setInsets(5));
+ 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));
+ 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));
+ 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));
+ 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));
+ 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));
+ 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));
+ 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) {
@@ -530,14 +569,14 @@
int row = table.rowAtPoint(e.getPoint());
int col = table.columnAtPoint(e.getPoint());
DjJdgzTrackRecord djJdgzTrackRecord = list.get(row);
- String site = (String) CacheUtils.get("site", "site");
+ 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);
});
diff --git a/src/main/java/com/example/client/service/UserAddOrUpdate.java b/src/main/java/com/example/client/service/UserAddOrUpdate.java
index 9890606..71581ce 100644
--- a/src/main/java/com/example/client/service/UserAddOrUpdate.java
+++ b/src/main/java/com/example/client/service/UserAddOrUpdate.java
@@ -14,7 +14,7 @@
import com.example.server.teamGroup.service.SysTeamGroupClassService;
import com.example.server.user.model.SysUser;
import com.example.server.user.service.UserService;
-import com.example.server.utils.CacheUtils;
+import com.example.server.utils.UserAndSiteUtils;
import org.apache.commons.lang3.StringUtils;
import org.jdesktop.swingx.JXDatePicker;
import org.springframework.beans.factory.annotation.Autowired;
@@ -59,8 +59,8 @@
JLabel JLabel0 = new JLabel("鐢ㄦ埛鍚�");
JTextField userName = new JTextField(16);
- if (StringUtils.isNotBlank(data.getUsername())) {
- userName.setText(data.getUsername());
+ if (StringUtils.isNotBlank(data.getUserName())) {
+ userName.setText(data.getUserName());
}
JLabel JLabel1 = new JLabel("鏄电О");
@@ -139,7 +139,7 @@
saveButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
- SysUser user = (SysUser) CacheUtils.get("user","user");
+ SysUser user = (SysUser) UserAndSiteUtils.get("user","user");
if (user==null){
JOptionPane.showMessageDialog(null, "鐢ㄦ埛澶辨晥璇烽��鍑哄苟閲嶆柊鐧诲綍", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
return;
@@ -150,7 +150,7 @@
data.setDept(String.valueOf(dept.getId()));
data.setTeamgroup(String.valueOf(team.getId()));
//data.setBoatfleet(String.valueOf(boat.getId()));
- data.setUsername(userName.getText());
+ data.setUserName(userName.getText());
data.setNickName(nickName.getText());
data.setPassword(passWord.getText());
userService.save(data);
diff --git a/src/main/java/com/example/client/service/UserManageService.java b/src/main/java/com/example/client/service/UserManageService.java
index cbb42f2..c0ea12a 100644
--- a/src/main/java/com/example/client/service/UserManageService.java
+++ b/src/main/java/com/example/client/service/UserManageService.java
@@ -75,7 +75,7 @@
columnDto = new ArrayList<>();
//columnDto.add(new ColumnDto("ID", "id", -1, null,false));
columnDto.add(new ColumnDto("搴忓彿", "", (width - 10) / 7, "autoCreate", false, null,null));
- columnDto.add(new ColumnDto("鐢ㄦ埛鍚�", "username", (width - 10) / 7, null, false, null,null));
+ columnDto.add(new ColumnDto("鐢ㄦ埛鍚�", "userName", (width - 10) / 7, null, false, null,null));
columnDto.add(new ColumnDto("鏄电О", "nickName", (width - 10) / 7, null, false, null,null));
columnDto.add(new ColumnDto("瀵嗙爜", "password", (width - 10) / 7, null, false, null,null));
//columnDto.add(new ColumnDto("鎵�灞濼闃�", "boatFleetId", (width - 10) / 8, "dict", true, null,boatList));
diff --git a/src/main/java/com/example/client/utils/MultiSelectComboBox2.java b/src/main/java/com/example/client/utils/MultiSelectComboBox2.java
index fed687b..fd47bbe 100644
--- a/src/main/java/com/example/client/utils/MultiSelectComboBox2.java
+++ b/src/main/java/com/example/client/utils/MultiSelectComboBox2.java
@@ -18,7 +18,6 @@
super(items);
this.defaultText = "鑷畾涔夎〃澶�"; // 璁剧疆榛樿鏂囨湰
setEditable(true);
-
// 鑷畾涔夋覆鏌撳櫒
setRenderer(new DefaultListCellRenderer() {
@Override
diff --git a/src/main/java/com/example/server/DataSync/service/DataSyncService.java b/src/main/java/com/example/server/DataSync/service/DataSyncService.java
index 371ebe0..6de5609 100644
--- a/src/main/java/com/example/server/DataSync/service/DataSyncService.java
+++ b/src/main/java/com/example/server/DataSync/service/DataSyncService.java
@@ -11,7 +11,7 @@
import com.example.server.progressTrack.dao.ImportRecordDao;
import com.example.server.progressTrack.model.ExportRecord;
import com.example.server.progressTrack.model.ImportRecord;
-import com.example.server.utils.CacheUtils;
+import com.example.server.utils.UserAndSiteUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -63,7 +63,7 @@
String configPath = configPath2;
String directoryPath = localPath + "life-protection";
- String mySite = (String) CacheUtils.get("site", "site");
+ String mySite = (String) UserAndSiteUtils.get("site", "site");
// 寮瑰嚭鏂囦欢閫夋嫨妗嗭紝璁╃敤鎴烽�夋嫨淇濆瓨ZIP鏂囦欢鐨勮矾寰�
String outputZipPath = showSaveFileDialog(mySite + "鍚屾鏁版嵁鍖�.zip");
@@ -171,9 +171,13 @@
e.printStackTrace();
}
- String mySite = (String) CacheUtils.get("site", "site");
+ String mySite = (String) UserAndSiteUtils.get("site", "site");
String otherSite = properties.get("site").toString();
if ("宸ヤ綔缁�".equals(mySite)) {
+ syncTable("dj_jdgz_network_level1");
+ syncTable("dj_jdgz_network_level1_list");
+ syncTable("dj_jdgz_network_level2");
+ syncTable("dj_jdgz_network_level2_list");
syncTable("dj_jdgz_handover");
syncTable("dj_jdgz_network_level3");
syncTable("dj_jdgz_network_level3_list");
@@ -205,8 +209,8 @@
syncTable("dj_jdgz_track_record");
syncTable("dj_sys_oss");
syncTable("dj_jdgz_dismant_track");
- syncTable("dj_sys_teamgroup_class");
- syncTable("sys_user");
+/* syncTable("dj_sys_teamgroup_class");
+ syncTable("sys_user");*/
syncTable("dj_jdgz_ship");
}
} else if ("鍘傚".equals(mySite)) {
@@ -219,6 +223,7 @@
syncTable("dj_jdgz_network_level3_list");
syncTable("dj_jdgz_track_record");
syncTable("dj_sys_oss");
+ syncTable("dj_jdgz_ship");
syncTable("dj_jdgz_dismant_track");
}
ImportRecord data =new ImportRecord();
diff --git a/src/main/java/com/example/server/entity/FieldMetaObjectHandler.java b/src/main/java/com/example/server/entity/FieldMetaObjectHandler.java
index 573a52e..7d955ef 100644
--- a/src/main/java/com/example/server/entity/FieldMetaObjectHandler.java
+++ b/src/main/java/com/example/server/entity/FieldMetaObjectHandler.java
@@ -14,7 +14,7 @@
import com.example.client.entity.TenantEntity;
import com.example.server.progressTrack.model.TeamEntity;
import com.example.server.user.model.SysUser;
-import com.example.server.utils.CacheUtils;
+import com.example.server.utils.UserAndSiteUtils;
import org.apache.ibatis.reflection.MetaObject;
import org.springframework.stereotype.Component;
@@ -35,7 +35,7 @@
@Override
public void insertFill(MetaObject metaObject) {
Object object = metaObject.getOriginalObject();
- SysUser user = (SysUser) CacheUtils.get("user","user");
+ SysUser user = (SysUser) UserAndSiteUtils.get("user","user");
LocalDateTime currentDateTime = LocalDateTime.now();
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
// 灏嗗綋鍓嶆棩鏈熸牸寮忓寲涓哄瓧绗︿覆
@@ -43,8 +43,8 @@
if (object instanceof TeamEntity) {
TeamEntity entity = (TeamEntity) object;
- entity.setCreateTeam(user.getBoatfleet());// 鍒涘缓鑰�
- entity.setUpdateTeam(user.getBoatfleet());// 鍒涘缓鑰�
+ entity.setCreateTeam(user.getBoatFleet());// 鍒涘缓鑰�
+ entity.setUpdateTeam(user.getBoatFleet());// 鍒涘缓鑰�
}
if (object instanceof PlatformLogEntity) {
@@ -70,7 +70,7 @@
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
// 灏嗗綋鍓嶆棩鏈熸牸寮忓寲涓哄瓧绗︿覆
String date = currentDateTime.format(formatter);
- SysUser user =(SysUser) CacheUtils.get("user","user");
+ SysUser user =(SysUser) UserAndSiteUtils.get("user","user");
Object object = metaObject.getOriginalObject();
if (object instanceof PlatformEntity) {
PlatformEntity entity = (PlatformEntity) object;
@@ -80,7 +80,7 @@
if (object instanceof TeamEntity) {
TeamEntity entity = (TeamEntity) object;
- entity.setUpdateTeam(user.getBoatfleet());// 鍒涘缓鑰�
+ entity.setUpdateTeam(user.getBoatFleet());// 鍒涘缓鑰�
}
}
diff --git a/src/main/java/com/example/server/progressTrack/dao/DjJdgzNetworkLevel3Dao.java b/src/main/java/com/example/server/progressTrack/dao/DjJdgzNetworkLevel3Dao.java
index 9ac4ef1..fc5f467 100644
--- a/src/main/java/com/example/server/progressTrack/dao/DjJdgzNetworkLevel3Dao.java
+++ b/src/main/java/com/example/server/progressTrack/dao/DjJdgzNetworkLevel3Dao.java
@@ -21,7 +21,7 @@
@Mapper
public interface DjJdgzNetworkLevel3Dao extends BaseDao<DjJdgzNetworkLevel3> {
- List<DjJdgzNetworkLevel3> getList(Long shipId, Long deptId, Long teamId, Long cabinId, String type,String name);
+ List<DjJdgzNetworkLevel3> getList(Long shipId, Long deptId, Long teamId, Long cabinId, String type,Integer isealCabin,String name);
List<NetworkNodeStatusDto> getNodeStatusData(Long id);
void deleteLevel3(Long id);
diff --git a/src/main/java/com/example/server/progressTrack/dao/DjJdgzTrackRecordDao.java b/src/main/java/com/example/server/progressTrack/dao/DjJdgzTrackRecordDao.java
index f3c0914..5cb0260 100644
--- a/src/main/java/com/example/server/progressTrack/dao/DjJdgzTrackRecordDao.java
+++ b/src/main/java/com/example/server/progressTrack/dao/DjJdgzTrackRecordDao.java
@@ -20,7 +20,7 @@
@Mapper
public interface DjJdgzTrackRecordDao extends BaseDao<DjJdgzTrackRecord> {
- List<DjJdgzTrackRecord> getList(Long level1NetworkId, Long deptId, Long teamId, Long cabinId, String type, Integer status, String name);
+ List<DjJdgzTrackRecord> getList(Long level1NetworkId, Long deptId, Long teamId, Long cabinId, String type, Integer status,Integer isealCabin, String name);
List<DjJdgzTrackRecord> getHistory(Long level3NodeId);
diff --git a/src/main/java/com/example/server/progressTrack/model/DjJdgzNetworkLevel3.java b/src/main/java/com/example/server/progressTrack/model/DjJdgzNetworkLevel3.java
index 6722265..9003534 100644
--- a/src/main/java/com/example/server/progressTrack/model/DjJdgzNetworkLevel3.java
+++ b/src/main/java/com/example/server/progressTrack/model/DjJdgzNetworkLevel3.java
@@ -31,6 +31,9 @@
@ApiModelProperty(value = "缃戠粶鍥惧悕绉帮紙璁惧鍚嶇О锛�")
private String name;
+ @ApiModelProperty(value = "鏄惁褰卞搷灏佽埍")
+ private Integer isealCabin;
+
@ApiModelProperty(value = "鐝粍涓撲笟ID")
private Long teamgroupId;
diff --git a/src/main/java/com/example/server/progressTrack/model/DjJdgzTrackRecord.java b/src/main/java/com/example/server/progressTrack/model/DjJdgzTrackRecord.java
index aaf7452..cb40cc3 100644
--- a/src/main/java/com/example/server/progressTrack/model/DjJdgzTrackRecord.java
+++ b/src/main/java/com/example/server/progressTrack/model/DjJdgzTrackRecord.java
@@ -118,6 +118,10 @@
@TableField(exist = false)
@ApiModelProperty(value = "")
+ private Integer isealCabin;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "")
private Integer trackNum;
@TableField(exist = false)
diff --git a/src/main/java/com/example/server/progressTrack/service/DjJdgzDismantTrackService.java b/src/main/java/com/example/server/progressTrack/service/DjJdgzDismantTrackService.java
index 6cd95d9..c4a2a04 100644
--- a/src/main/java/com/example/server/progressTrack/service/DjJdgzDismantTrackService.java
+++ b/src/main/java/com/example/server/progressTrack/service/DjJdgzDismantTrackService.java
@@ -93,7 +93,7 @@
sheetName = sheet.getSheetName(); //鑾峰彇褰撳墠sheet鍚嶇О
sum = sum + num;
- List<DjJdgzNetworkLevel3> list = djJdgzNetworkLevel3Service.getList(null, null, null, null, null,null);
+ List<DjJdgzNetworkLevel3> list = djJdgzNetworkLevel3Service.getList(null, null, null, null, null,null,null);
JComboBoxItem[] list1 = cabinService.getList();
diff --git a/src/main/java/com/example/server/progressTrack/service/DjJdgzNetworkLevel3Service.java b/src/main/java/com/example/server/progressTrack/service/DjJdgzNetworkLevel3Service.java
index fe05030..a7ae88b 100644
--- a/src/main/java/com/example/server/progressTrack/service/DjJdgzNetworkLevel3Service.java
+++ b/src/main/java/com/example/server/progressTrack/service/DjJdgzNetworkLevel3Service.java
@@ -60,8 +60,8 @@
String[] fillColorArr = {"#e5e5e5", "#3498DB", "#F1C40F", "#E74C3C", "#2ECC71", "#006400"};
String[] fontColorArr = {"#e5e5e5", "#3498DB", "#F1C40F", "#E74C3C", "#2ECC71", "#006400"};
- public List<DjJdgzNetworkLevel3> getList(Long shipId, Long deptId, Long teamId, Long cabinId, String type, String name) {
- List<DjJdgzNetworkLevel3> list = baseDao.getList(shipId, deptId, teamId, cabinId, type, name);
+ public List<DjJdgzNetworkLevel3> getList(Long shipId, Long deptId, Long teamId, Long cabinId, String type,Integer isealCabin, String name) {
+ List<DjJdgzNetworkLevel3> list = baseDao.getList(shipId, deptId, teamId, cabinId, type,isealCabin, name);
return list;
}
@@ -172,21 +172,27 @@
Row row = sheet.getRow(j);
String name = ImportUtil.getCellValue(row, 0, pattern);
- String deptStr = ImportUtil.getCellValue(row, 1, pattern);
- String teamGroupStr = ImportUtil.getCellValue(row, 2, pattern);
- String cabinStr = ImportUtil.getCellValue(row, 3, pattern);
- String typeStr = ImportUtil.getCellValue(row, 4, pattern);
- String time1 = ImportUtil.getCellValue(row, 5, pattern);
- String time2 = ImportUtil.getCellValue(row, 6, pattern);
- String time3 = ImportUtil.getCellValue(row, 7, pattern);
- String time4 = ImportUtil.getCellValue(row, 8, pattern);
- String time5 = ImportUtil.getCellValue(row, 9, pattern);
- String repairUnit = ImportUtil.getCellValue(row, 10, pattern);
- String repairUnitDirector = ImportUtil.getCellValue(row, 11, pattern);
- String repairUnitContact = ImportUtil.getCellValue(row, 12, pattern);
- String generalRepairUnit = ImportUtil.getCellValue(row, 13, pattern);
- String generalRepairUnitDirector = ImportUtil.getCellValue(row, 14, pattern);
- String generalRepairUnitContact = ImportUtil.getCellValue(row, 15, pattern);
+ String isealCabinStr = ImportUtil.getCellValue(row, 1, pattern);
+ String deptStr = ImportUtil.getCellValue(row, 2, pattern);
+ String teamGroupStr = ImportUtil.getCellValue(row, 3, pattern);
+ String cabinStr = ImportUtil.getCellValue(row, 4, pattern);
+ String typeStr = ImportUtil.getCellValue(row, 5, pattern);
+ String time1 = ImportUtil.getCellValue(row, 6, pattern);
+ String time2 = ImportUtil.getCellValue(row, 7, pattern);
+ String time3 = ImportUtil.getCellValue(row, 8, pattern);
+ String time4 = ImportUtil.getCellValue(row, 9, pattern);
+ String time5 = ImportUtil.getCellValue(row, 10, pattern);
+ String repairUnit = ImportUtil.getCellValue(row, 11, pattern);
+ String repairUnitDirector = ImportUtil.getCellValue(row, 12, pattern);
+ String repairUnitContact = ImportUtil.getCellValue(row, 13, pattern);
+ String generalRepairUnit = ImportUtil.getCellValue(row, 14, pattern);
+ String generalRepairUnitDirector = ImportUtil.getCellValue(row, 15, pattern);
+ String generalRepairUnitContact = ImportUtil.getCellValue(row, 16, pattern);
+
+ Integer isealCabin = 0;
+ if (isealCabinStr.equals("鏄�")){
+ isealCabin = 1;
+ }
Long id = UUIDUtil.generateId();
if (StringUtils.isEmpty(name)) {
@@ -200,6 +206,7 @@
data.setLevel1NetworkId(level1NetworkId);
data.setLevel2NetworkId(level2NetworkId);
data.setLevel2NodeId(level2NodeId);
+ data.setIsealCabin(isealCabin);
}
if (StringUtils.isEmpty(deptStr)) {
@@ -484,9 +491,9 @@
Long oldId = 0L;
TableNodeDto data = null;
for (TableNodeDto node : list) {
- if (oldId.equals(node.getNetworkId())){
+ if (oldId.equals(node.getNetworkId())) {
- }else{
+ } else {
data = new TableNodeDto();
data.setName(node.getName());
data.setNetworkId(node.getNetworkId());
diff --git a/src/main/java/com/example/server/progressTrack/service/DjJdgzTrackRecordService.java b/src/main/java/com/example/server/progressTrack/service/DjJdgzTrackRecordService.java
index f55a72a..a731789 100644
--- a/src/main/java/com/example/server/progressTrack/service/DjJdgzTrackRecordService.java
+++ b/src/main/java/com/example/server/progressTrack/service/DjJdgzTrackRecordService.java
@@ -58,7 +58,7 @@
private SysTeamGroupClassService sysTeamGroupClassService;
- public List<DjJdgzTrackRecord> getList(Long level1NetworkId, Long deptId, Long teamId, Long cabinId, String type, Integer status, String name) {
+ public List<DjJdgzTrackRecord> getList(Long level1NetworkId, Long deptId, Long teamId, Long cabinId, String type, Integer status,Integer isealCabin, String name) {
Long userId = null;
/* Map adminRole = sysUserService.adminRole();
Object isTyRole = adminRole.get("isTyRole");
@@ -66,7 +66,7 @@
if (isTyRole.equals(true) || isYwzRole.equals(true)) {
userId = UserContext.getUser().getId();
}*/
- List<DjJdgzTrackRecord> list = baseDao.getList(level1NetworkId, deptId, teamId, cabinId, type, status, name);
+ List<DjJdgzTrackRecord> list = baseDao.getList(level1NetworkId, deptId, teamId, cabinId, type, status, isealCabin,name);
/*if (list != null && list.size() > 0) {
sysOssService.setListOsses(list, "ProjectProgressFileUpload");
}*/
@@ -480,15 +480,15 @@
}
if (StringUtils.isNotBlank(trackedPerson)) {
- data.setTrackPerson(trackPersonStr);
+ data.setTrackedPerson(trackedPerson);
}
if (StringUtils.isNotBlank(trackedPersonContact)) {
- data.setTrackPersonContact(trackPersonContact);
+ data.setTrackedPersonContact(trackedPersonContact);
}
if (StringUtils.isNotBlank(trackedPersonUnit)) {
- data.setTrackPersonUnit(trackPersonUnit);
+ data.setTrackedPersonUnit(trackedPersonUnit);
}
if (StringUtils.isNotBlank(generalRepairUnit)) {
data.setGeneralRepairUnit(generalRepairUnit);
diff --git a/src/main/java/com/example/server/user/model/SysUser.java b/src/main/java/com/example/server/user/model/SysUser.java
index 498453d..473de27 100644
--- a/src/main/java/com/example/server/user/model/SysUser.java
+++ b/src/main/java/com/example/server/user/model/SysUser.java
@@ -43,7 +43,7 @@
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "鐢ㄦ埛鍚�", required = true)
- private String username;
+ private String userName;
@ApiModelProperty(value = "鏄电О", required = true)
private String nickName;
@@ -58,7 +58,7 @@
private String teamgroup;
@ApiModelProperty(value = "T闃�")
- private String boatfleet;
+ private String boatFleet;
@TableField(exist = false)
private Boolean exist;
diff --git a/src/main/java/com/example/server/utils/UserAndSiteUtils.java b/src/main/java/com/example/server/utils/UserAndSiteUtils.java
new file mode 100644
index 0000000..c674a2b
--- /dev/null
+++ b/src/main/java/com/example/server/utils/UserAndSiteUtils.java
@@ -0,0 +1,31 @@
+package com.example.server.utils;
+
+import com.example.server.user.model.SysUser;
+
+public class UserAndSiteUtils {
+ private static SysUser sysUser;
+ private static String site;
+ public static void put(String a,String b,Object value){
+ if (a.equals("site")){
+ site = value.toString();
+ }else{
+ sysUser = (SysUser)value;
+ }
+ }
+ public static Object get(String a,String b){
+ Object value = new Object();
+ if (a.equals("site")){
+ value = site;
+ }else{
+ value = sysUser;
+ }
+ return value;
+ }
+ public static void remove(String a,String b){
+ if (a.equals("site")){
+ site = null;
+ }else{
+ sysUser = null;
+ }
+ }
+}
diff --git a/src/main/resources/db/csiczb1.db b/src/main/resources/db/csiczb1.db
index c0ac496..b13c2a3 100644
--- a/src/main/resources/db/csiczb1.db
+++ b/src/main/resources/db/csiczb1.db
Binary files differ
diff --git a/src/main/resources/mapper/progressTrack/DjJdgzNetworkLevel3Dao.xml b/src/main/resources/mapper/progressTrack/DjJdgzNetworkLevel3Dao.xml
index f073930..0e5d8df 100644
--- a/src/main/resources/mapper/progressTrack/DjJdgzNetworkLevel3Dao.xml
+++ b/src/main/resources/mapper/progressTrack/DjJdgzNetworkLevel3Dao.xml
@@ -49,6 +49,9 @@
<if test="cabinId!=null">
and a.cabin_id = ${cabinId}
</if>
+ <if test="isealCabin!=null">
+ and a.iseal_cabin = ${isealCabin}
+ </if>
<if test="type!=null and type!=''">
and a.type = #{type}
</if>
diff --git a/src/main/resources/mapper/progressTrack/DjJdgzTrackRecordDao.xml b/src/main/resources/mapper/progressTrack/DjJdgzTrackRecordDao.xml
index dee1b77..ed4e022 100644
--- a/src/main/resources/mapper/progressTrack/DjJdgzTrackRecordDao.xml
+++ b/src/main/resources/mapper/progressTrack/DjJdgzTrackRecordDao.xml
@@ -35,6 +35,7 @@
c.teamgroup_name,
c.dept_id,
c.cabin_id,
+ c.iseal_cabin,
c.type,
c.`NAME` as level3NetworkName,
a.PROCESS_NAME AS level3NodeName,
@@ -88,6 +89,9 @@
<if test="deptId!=null">
and c.dept_id = ${deptId}
</if>
+ <if test="isealCabin!=null">
+ and c.iseal_cabin = ${isealCabin}
+ </if>
<if test="teamId!=null">
and c.TEAMGROUP_ID = ${teamId}
</if>
diff --git "a/src/main/resources/templateFile/\344\270\211\347\272\247\347\275\221\347\273\234\345\233\276\345\257\274\345\205\245\346\250\241\346\235\277.xlsx" "b/src/main/resources/templateFile/\344\270\211\347\272\247\347\275\221\347\273\234\345\233\276\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
index ed8da25..417287f 100644
--- "a/src/main/resources/templateFile/\344\270\211\347\272\247\347\275\221\347\273\234\345\233\276\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
+++ "b/src/main/resources/templateFile/\344\270\211\347\272\247\347\275\221\347\273\234\345\233\276\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
Binary files differ
diff --git "a/src/main/resources/templateFile/\350\267\237\350\270\252\350\256\260\345\275\225\345\257\274\345\205\245\346\250\241\346\235\277.xlsx" "b/src/main/resources/templateFile/\350\267\237\350\270\252\350\256\260\345\275\225\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
index f2b3c8d..ddc98ac 100644
--- "a/src/main/resources/templateFile/\350\267\237\350\270\252\350\256\260\345\275\225\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
+++ "b/src/main/resources/templateFile/\350\267\237\350\270\252\350\256\260\345\275\225\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
Binary files differ
--
Gitblit v1.9.1