From d30e385951ce03335a5023f0775fd144da3c0b88 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 18 三月 2025 11:18:31 +0800
Subject: [PATCH] 修改

---
 src/main/java/com/example/server/progressTrack/service/DjJdgzNetworkLevel3Service.java |   36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 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..4f1382d 100644
--- a/src/main/java/com/example/server/progressTrack/service/DjJdgzNetworkLevel3Service.java
+++ b/src/main/java/com/example/server/progressTrack/service/DjJdgzNetworkLevel3Service.java
@@ -262,18 +262,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 +288,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 +315,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 +342,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 +369,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 +401,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);
                 }
 

--
Gitblit v1.9.1