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/server/progressTrack/service/DjJdgzNetworkLevel3Service.java | 86 ++++++++++++++++++++++++------------------
1 files changed, 49 insertions(+), 37 deletions(-)
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 6cebd68..a7ae88b 100644
--- a/src/main/java/com/example/server/progressTrack/service/DjJdgzNetworkLevel3Service.java
+++ b/src/main/java/com/example/server/progressTrack/service/DjJdgzNetworkLevel3Service.java
@@ -4,6 +4,7 @@
import com.example.client.service.BaseService;
import com.example.server.cabin.service.CabinService;
import com.example.server.progressTrack.Dto.NetworkNodeStatusDto;
+import com.example.server.progressTrack.Dto.StatistProductDto;
import com.example.server.progressTrack.Dto.TableNodeDto;
import com.example.server.progressTrack.dao.DjJdgzNetworkLevel3Dao;
import com.example.server.progressTrack.model.DjJdgzNetworkLevel3;
@@ -50,13 +51,17 @@
@Value("${zt.oss.local-path}")
private String path;
+ public List<StatistProductDto> getStatist(Long level1Id) {
+ return baseDao.getStatist(level1Id);
+ }
+
enum StatusEnum {zy, jxz, lq, yq, zcwc, cqwc}
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;
}
@@ -167,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)) {
@@ -195,6 +206,7 @@
data.setLevel1NetworkId(level1NetworkId);
data.setLevel2NetworkId(level2NetworkId);
data.setLevel2NodeId(level2NodeId);
+ data.setIsealCabin(isealCabin);
}
if (StringUtils.isEmpty(deptStr)) {
@@ -262,18 +274,18 @@
time1 = time1.replace("/", "-");
node.setRequiredCompletionTime(time1);
node.setProcessName(mapProcessName.get(1));
- node.setSort(sort + 1);
+ node.setSort(1);
DjJdgzNetworkLevel3ListService.insert(node);
} else if (time1.matches("[0-9.]+")) {
time1 = time1.replace(".", "-");
node.setRequiredCompletionTime(time1);
node.setProcessName(mapProcessName.get(1));
- node.setSort(sort + 1);
+ node.setSort(1);
DjJdgzNetworkLevel3ListService.insert(node);
} else if (time1.matches("[0-9-]+")) {
node.setRequiredCompletionTime(time1);
node.setProcessName(mapProcessName.get(1));
- node.setSort(sort + 1);
+ node.setSort(1);
DjJdgzNetworkLevel3ListService.insert(node);
} else {
result = "绗�" + j + "琛�" + "绗�" + 1 + "涓�" + "鑺傜偣鏃堕棿鏃ユ湡鏍煎紡涓嶈鑼�";
@@ -288,18 +300,18 @@
if (time2.matches("[0-9/]+")) {
node.setRequiredCompletionTime(time2);
node.setProcessName(mapProcessName.get(2));
- node.setSort(sort + 1);
+ node.setSort(2);
DjJdgzNetworkLevel3ListService.insert(node);
} else if (time2.matches("[0-9.]+")) {
time2 = time2.replace(".", "-");
node.setRequiredCompletionTime(time2);
node.setProcessName(mapProcessName.get(2));
- node.setSort(sort + 1);
+ node.setSort(2);
DjJdgzNetworkLevel3ListService.insert(node);
} else if (time2.matches("[0-9-]+")) {
node.setRequiredCompletionTime(time2);
node.setProcessName(mapProcessName.get(2));
- node.setSort(sort + 1);
+ node.setSort(2);
DjJdgzNetworkLevel3ListService.insert(node);
} else {
result = "绗�" + j + "琛�" + "绗�" + 2 + "涓�" + "鑺傜偣鏃堕棿鐨勬棩鏈熸牸寮忎笉瑙勮寖";
@@ -315,18 +327,18 @@
time3 = time3.replace("/", "-");
node.setRequiredCompletionTime(time3);
node.setProcessName(mapProcessName.get(3));
- node.setSort(sort + 1);
+ node.setSort(3);
DjJdgzNetworkLevel3ListService.insert(node);
} else if (time3.matches("[0-9.]+")) {
time3 = time3.replace(".", "-");
node.setRequiredCompletionTime(time3);
node.setProcessName(mapProcessName.get(3));
- node.setSort(sort + 1);
+ node.setSort(3);
DjJdgzNetworkLevel3ListService.insert(node);
} else if (time3.matches("[0-9-]+")) {
node.setRequiredCompletionTime(time3);
node.setProcessName(mapProcessName.get(3));
- node.setSort(sort + 1);
+ node.setSort(3);
DjJdgzNetworkLevel3ListService.insert(node);
} else {
result = "绗�" + j + "琛�" + "绗�" + 3 + "涓�" + "鑺傜偣鏃堕棿鐨勬棩鏈熸牸寮忎笉瑙勮寖";
@@ -342,18 +354,18 @@
time4 = time4.replace("/", "-");
node.setRequiredCompletionTime(time4);
node.setProcessName(mapProcessName.get(4));
- node.setSort(sort + 1);
+ node.setSort(4);
DjJdgzNetworkLevel3ListService.insert(node);
} else if (time4.matches("[0-9.]+")) {
time4 = time4.replace(".", "-");
node.setRequiredCompletionTime(time4);
node.setProcessName(mapProcessName.get(4));
- node.setSort(sort + 1);
+ node.setSort(4);
DjJdgzNetworkLevel3ListService.insert(node);
} else if (time4.matches("[0-9-]+")) {
node.setRequiredCompletionTime(time4);
node.setProcessName(mapProcessName.get(4));
- node.setSort(sort + 1);
+ node.setSort(4);
DjJdgzNetworkLevel3ListService.insert(node);
} else {
result = "绗�" + j + "琛�" + "绗�" + 4 + "涓�" + "鑺傜偣鏃堕棿鐨勬棩鏈熸牸寮忎笉瑙勮寖";
@@ -369,18 +381,18 @@
time5 = time5.replace("/", "-");
node.setRequiredCompletionTime(time5);
node.setProcessName(mapProcessName.get(5));
- node.setSort(sort + 1);
+ node.setSort(5);
DjJdgzNetworkLevel3ListService.insert(node);
} else if (time5.matches("[0-9.]+")) {
time5 = time5.replace(".", "-");
node.setRequiredCompletionTime(time5);
node.setProcessName(mapProcessName.get(5));
- node.setSort(sort + 1);
+ node.setSort(5);
DjJdgzNetworkLevel3ListService.insert(node);
} else if (time5.matches("[0-9-]+")) {
node.setRequiredCompletionTime(time5);
node.setProcessName(mapProcessName.get(5));
- node.setSort(sort + 1);
+ node.setSort(5);
DjJdgzNetworkLevel3ListService.insert(node);
} else {
result = "绗�" + j + "琛�" + "绗�" + 5 + "涓�" + "瑕佹眰瀹屾垚鏃堕棿鐨勬棩鏈熸牸寮忎笉瑙勮寖";
@@ -401,13 +413,13 @@
if (StringUtils.isNotBlank(generalRepairUnitDirector)) {
data.setGeneralRepairUnitDirector(generalRepairUnitDirector);
}
- if (StringUtils.isNotBlank(generalRepairUnit)) {
+ if (StringUtils.isNotBlank(repairUnit)) {
data.setRepairUnit(repairUnit);
}
- if (StringUtils.isNotBlank(generalRepairUnit)) {
+ if (StringUtils.isNotBlank(repairUnitContact)) {
data.setRepairUnitContact(repairUnitContact);
}
- if (StringUtils.isNotBlank(generalRepairUnit)) {
+ if (StringUtils.isNotBlank(repairUnitDirector)) {
data.setRepairUnitDirector(repairUnitDirector);
}
@@ -479,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());
--
Gitblit v1.9.1