progressTrack.git

			@@ -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;
			@@ -49,6 +50,10 @@

			@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}

			@@ -262,18 +267,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 +293,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 +320,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 +347,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 +374,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 +406,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);
			}