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/server/progressTrack/service/DjJdgzNetworkLevel3Service.java | 146 ++++++++++++++++++++++++++++++++----------------
1 files changed, 98 insertions(+), 48 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 a7ae88b..c17dd52 100644
--- a/src/main/java/com/example/server/progressTrack/service/DjJdgzNetworkLevel3Service.java
+++ b/src/main/java/com/example/server/progressTrack/service/DjJdgzNetworkLevel3Service.java
@@ -51,8 +51,8 @@
@Value("${zt.oss.local-path}")
private String path;
- public List<StatistProductDto> getStatist(Long level1Id) {
- return baseDao.getStatist(level1Id);
+ public List<StatistProductDto> getStatist(Long level1Id,String type) {
+ return baseDao.getStatist(level1Id,type);
}
enum StatusEnum {zy, jxz, lq, yq, zcwc, cqwc}
@@ -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,Integer isealCabin, String name) {
- List<DjJdgzNetworkLevel3> list = baseDao.getList(shipId, deptId, teamId, cabinId, type,isealCabin, name);
+ public List<DjJdgzNetworkLevel3> getList(Long shipId, Long deptId, Long teamId, Long cabinId, String type, Integer isealCabin,Integer isLt, String name) {
+ List<DjJdgzNetworkLevel3> list = baseDao.getList(shipId, deptId, teamId, cabinId, type, isealCabin,isLt, name);
return list;
}
@@ -135,13 +135,6 @@
sheetName = sheet.getSheetName(); //鑾峰彇褰撳墠sheet鍚嶇О
sum = sum + num;
- Map<Integer, String> mapProcessName = new HashMap<>();
- mapProcessName.put(1, "璁惧鎷嗗嵏鍑鸿埍");
- mapProcessName.put(2, "璁惧鍒嗕氦");
- mapProcessName.put(3, "鎷嗘閴村畾");
- mapProcessName.put(4, "璁惧杩斿巶");
- mapProcessName.put(5, "鍥炶");
-
Map<String, String> mapTeamGroup = sysTeamGroupClassService.getMapGroup(false, "hld");
JComboBoxItem[] cabinList = cabinService.getList();
JComboBoxItem[] deptList = sysTeamGroupClassService.getDeptList();
@@ -173,25 +166,30 @@
String name = ImportUtil.getCellValue(row, 0, 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);
+ String isltStr = ImportUtil.getCellValue(row, 2, pattern);
+ String deptStr = ImportUtil.getCellValue(row, 3, pattern);
+ String teamGroupStr = ImportUtil.getCellValue(row, 4, pattern);
+ String cabinStr = ImportUtil.getCellValue(row, 5, pattern);
+ String typeStr = ImportUtil.getCellValue(row, 6, pattern);
+ String time1 = ImportUtil.getCellValue(row, 7, pattern);
+ String time2 = ImportUtil.getCellValue(row, 8, pattern);
+ String time3 = ImportUtil.getCellValue(row, 9, pattern);
+ String time4 = ImportUtil.getCellValue(row, 10, pattern);
+ String time5 = ImportUtil.getCellValue(row, 11, pattern);
+ String repairUnit = ImportUtil.getCellValue(row, 12, pattern);
+ String repairUnitDirector = ImportUtil.getCellValue(row, 13, pattern);
+ String repairUnitContact = ImportUtil.getCellValue(row, 14, pattern);
+ String generalRepairUnit = ImportUtil.getCellValue(row, 15, pattern);
+ String generalRepairUnitDirector = ImportUtil.getCellValue(row, 16, pattern);
+ String generalRepairUnitContact = ImportUtil.getCellValue(row, 17, pattern);
Integer isealCabin = 0;
- if (isealCabinStr.equals("鏄�")){
+ Integer islt = 0;
+ if (isealCabinStr.equals("鏄�")) {
isealCabin = 1;
+ }
+ if (isltStr.equals("鏄�")) {
+ islt = 1;
}
Long id = UUIDUtil.generateId();
@@ -207,6 +205,7 @@
data.setLevel2NetworkId(level2NetworkId);
data.setLevel2NodeId(level2NodeId);
data.setIsealCabin(isealCabin);
+ data.setIslt(islt);
}
if (StringUtils.isEmpty(deptStr)) {
@@ -270,21 +269,29 @@
}
if (StringUtils.isNotBlank(time1)) {
+ String Pname = "";
+ if (typeStr.equals("鏀规崲瑁�")||typeStr.equals("鏀硅繘鎬т慨鐞�")){
+ Pname = "璁惧鍒板巶";
+ }else if(typeStr.equals("淇悊")){
+ Pname = "璁惧鎷嗗嵏鍑鸿埍";
+ }else if(typeStr.equals("涓嶅瑁呰澶�")){
+ Pname = "鎷嗗嵏鍑鸿埍";
+ }
if (time1.matches("[0-9/]+")) {
time1 = time1.replace("/", "-");
node.setRequiredCompletionTime(time1);
- node.setProcessName(mapProcessName.get(1));
+ node.setProcessName(Pname);
node.setSort(1);
DjJdgzNetworkLevel3ListService.insert(node);
} else if (time1.matches("[0-9.]+")) {
time1 = time1.replace(".", "-");
node.setRequiredCompletionTime(time1);
- node.setProcessName(mapProcessName.get(1));
+ node.setProcessName(Pname);
node.setSort(1);
DjJdgzNetworkLevel3ListService.insert(node);
} else if (time1.matches("[0-9-]+")) {
node.setRequiredCompletionTime(time1);
- node.setProcessName(mapProcessName.get(1));
+ node.setProcessName(Pname);
node.setSort(1);
DjJdgzNetworkLevel3ListService.insert(node);
} else {
@@ -297,20 +304,28 @@
if (node.getId() != null) {
node.setId(null);
}
+ String Pname = "";
+ if (typeStr.equals("鏀规崲瑁�")||typeStr.equals("鏀硅繘鎬т慨鐞�")){
+ Pname = "璁惧瀹夎";
+ }else if(typeStr.equals("淇悊")){
+ Pname = "璁惧鍒嗕氦";
+ }else if(typeStr.equals("涓嶅瑁呰澶�")){
+ Pname = "鍏ュ簱";
+ }
if (time2.matches("[0-9/]+")) {
node.setRequiredCompletionTime(time2);
- node.setProcessName(mapProcessName.get(2));
+ node.setProcessName(Pname);
node.setSort(2);
DjJdgzNetworkLevel3ListService.insert(node);
} else if (time2.matches("[0-9.]+")) {
time2 = time2.replace(".", "-");
node.setRequiredCompletionTime(time2);
- node.setProcessName(mapProcessName.get(2));
+ node.setProcessName(Pname);
node.setSort(2);
DjJdgzNetworkLevel3ListService.insert(node);
} else if (time2.matches("[0-9-]+")) {
node.setRequiredCompletionTime(time2);
- node.setProcessName(mapProcessName.get(2));
+ node.setProcessName(Pname);
node.setSort(2);
DjJdgzNetworkLevel3ListService.insert(node);
} else {
@@ -323,21 +338,27 @@
if (node.getId() != null) {
node.setId(null);
}
+ String Pname = "";
+ if(typeStr.equals("淇悊")){
+ Pname = "鎷嗘閴村畾";
+ }else if(typeStr.equals("涓嶅瑁呰澶�")){
+ Pname = "瀛樻斁浣嶇疆";
+ }
if (time3.matches("[0-9/]+")) {
time3 = time3.replace("/", "-");
node.setRequiredCompletionTime(time3);
- node.setProcessName(mapProcessName.get(3));
+ node.setProcessName(Pname);
node.setSort(3);
DjJdgzNetworkLevel3ListService.insert(node);
} else if (time3.matches("[0-9.]+")) {
time3 = time3.replace(".", "-");
node.setRequiredCompletionTime(time3);
- node.setProcessName(mapProcessName.get(3));
+ node.setProcessName(Pname);
node.setSort(3);
DjJdgzNetworkLevel3ListService.insert(node);
} else if (time3.matches("[0-9-]+")) {
node.setRequiredCompletionTime(time3);
- node.setProcessName(mapProcessName.get(3));
+ node.setProcessName(Pname);
node.setSort(3);
DjJdgzNetworkLevel3ListService.insert(node);
} else {
@@ -350,21 +371,27 @@
if (node.getId() != null) {
node.setId(null);
}
+ String Pname = "";
+ if(typeStr.equals("淇悊")){
+ Pname = "璁惧杩斿巶";
+ }else if(typeStr.equals("涓嶅瑁呰澶�")){
+ Pname = "绉讳氦T闃�";
+ }
if (time4.matches("[0-9/]+")) {
time4 = time4.replace("/", "-");
node.setRequiredCompletionTime(time4);
- node.setProcessName(mapProcessName.get(4));
+ node.setProcessName(Pname);
node.setSort(4);
DjJdgzNetworkLevel3ListService.insert(node);
} else if (time4.matches("[0-9.]+")) {
time4 = time4.replace(".", "-");
node.setRequiredCompletionTime(time4);
- node.setProcessName(mapProcessName.get(4));
+ node.setProcessName(Pname);
node.setSort(4);
DjJdgzNetworkLevel3ListService.insert(node);
} else if (time4.matches("[0-9-]+")) {
node.setRequiredCompletionTime(time4);
- node.setProcessName(mapProcessName.get(4));
+ node.setProcessName(Pname);
node.setSort(4);
DjJdgzNetworkLevel3ListService.insert(node);
} else {
@@ -380,18 +407,18 @@
if (time5.matches("[0-9/]+")) {
time5 = time5.replace("/", "-");
node.setRequiredCompletionTime(time5);
- node.setProcessName(mapProcessName.get(5));
+ node.setProcessName("鍥炶");
node.setSort(5);
DjJdgzNetworkLevel3ListService.insert(node);
} else if (time5.matches("[0-9.]+")) {
time5 = time5.replace(".", "-");
node.setRequiredCompletionTime(time5);
- node.setProcessName(mapProcessName.get(5));
+ node.setProcessName("鍥炶");
node.setSort(5);
DjJdgzNetworkLevel3ListService.insert(node);
} else if (time5.matches("[0-9-]+")) {
node.setRequiredCompletionTime(time5);
- node.setProcessName(mapProcessName.get(5));
+ node.setProcessName("鍥炶");
node.setSort(5);
DjJdgzNetworkLevel3ListService.insert(node);
} else {
@@ -449,8 +476,8 @@
return list;
}
- public List<TableNodeDto> getNodeList(Long shipId, Long deptId, Long teamId, Long cabinId, String type, String name) {
- List<TableNodeDto> list = baseDao.getNodeList(shipId, deptId, teamId, cabinId, type, name);
+ public List<TableNodeDto> getNodeList(Long shipId, Long deptId, Long teamId, Long cabinId, String type,Integer isCabin,Integer islt, String name) {
+ List<TableNodeDto> list = baseDao.getNodeList(shipId, deptId, teamId, cabinId, type,isCabin,islt, name);
Map<Long, StatusEnum> statusMap = new HashMap<>();
Date today = new Date();
@@ -472,8 +499,12 @@
if (node.getCurrentStatus() == null || node.getCurrentStatus() == 0) {
if (today.after(requiredCompletionDate)) {
statusMap.put(node.getId(), StatusEnum.yq);
+ int days = (int) ((today.getTime() - requiredCompletionDate.getTime()) / (1000 * 60 * 60 * 24));
+ node.setYqText("瑕佹眰鏃堕棿涓�" + sdf.format(requiredCompletionDate) + "宸查�炬湡" + days + "澶�");
} else if ((requiredCompletionDate.getTime() - today.getTime()) / (1000 * 60 * 60 * 24) < 7) {
statusMap.put(node.getId(), StatusEnum.lq);
+ int days = (int) ((requiredCompletionDate.getTime() - today.getTime()) / (1000 * 60 * 60 * 24));
+ node.setLqText("瑕佹眰鏃堕棿涓�" + sdf.format(requiredCompletionDate) + "杩樻湁" + days + "澶╀复鏈�");
} else {
statusMap.put(node.getId(), StatusEnum.jxz);
}
@@ -481,6 +512,8 @@
// 宸插畬鎴�
if (node.getActualCompletion() != null && actualCompletionDate.after(requiredCompletionDate)) {
statusMap.put(node.getId(), StatusEnum.cqwc);
+ int days = (int) ((today.getTime() - requiredCompletionDate.getTime()) / (1000 * 60 * 60 * 24));
+ node.setCqText("瑕佹眰鏃堕棿涓�" + sdf.format(requiredCompletionDate) + "瓒呮湡" + days + "澶╁畬鎴�");
} else {
statusMap.put(node.getId(), StatusEnum.zcwc);
}
@@ -495,20 +528,37 @@
} else {
data = new TableNodeDto();
+ String remark = baseDao.getRemark(node.getNetworkId(),type);
+ if (StringUtils.isNotBlank(remark)){
+ data.setRemark(remark);
+ }
data.setName(node.getName());
data.setNetworkId(node.getNetworkId());
+ data.setIsealCabin(node.getIsealCabin());
+ data.setIslt(node.getIslt());
dataList.add(data);
oldId = node.getNetworkId();
}
+
status = statusMap.get(node.getId());
- if (node.getProcessName().equals("璁惧鎷嗗嵏鍑鸿埍")) {
+ if (StringUtils.isNotBlank(node.getLqText())) {
+ data.setLqText(node.getLqText());
+ }
+ if (StringUtils.isNotBlank(node.getYqText())) {
+ data.setYqText(node.getYqText());
+ }
+ if (StringUtils.isNotBlank(node.getCqText())) {
+ data.setCqText(node.getCqText());
+ }
+
+ if (node.getProcessName().equals("璁惧鎷嗗嵏鍑鸿埍")||node.getProcessName().equals("璁惧鍒板巶")||node.getProcessName().equals("鎷嗗嵏鍑鸿埍")) {
data.setTime1Color(fillColorArr[status.ordinal()]);
- } else if (node.getProcessName().equals("璁惧鍒嗕氦")) {
+ } else if (node.getProcessName().equals("璁惧鍒嗕氦")||node.getProcessName().equals("璁惧瀹夎")||node.getProcessName().equals("鍏ュ簱")) {
data.setTime2Color(fillColorArr[status.ordinal()]);
- } else if (node.getProcessName().equals("鎷嗘閴村畾")) {
+ } else if (node.getProcessName().equals("鎷嗘閴村畾")||node.getProcessName().equals("瀛樻斁浣嶇疆")) {
data.setTime3Color(fillColorArr[status.ordinal()]);
- } else if (node.getProcessName().equals("璁惧杩斿巶")) {
+ } else if (node.getProcessName().equals("璁惧杩斿巶")||node.getProcessName().equals("绉讳氦T闃�")) {
data.setTime4Color(fillColorArr[status.ordinal()]);
} else if (node.getProcessName().equals("鍥炶")) {
data.setTime5Color(fillColorArr[status.ordinal()]);
--
Gitblit v1.9.1