From d99b897011b3d0c2e96b7fa8d21255effe4317f7 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 20 十一月 2023 15:15:46 +0800
Subject: [PATCH] Changes
---
modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java
index c8f7deb..7c835b6 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java
@@ -54,9 +54,9 @@
public SoftwareTestOrderDto getDto(Long environId, Long projectId) {
SoftwareTestOrderDto data = new SoftwareTestOrderDto();
if (environId != null) {
- data.setId(environId);
Environ environ = this.get(environId);
data.setEnviron(environ);
+ data.setTestAgencyInfo(testAgencyInfoService.get(environId));
projectId = environ.getProjectId();
List<EnvironSoftwareResources> softwareResourcesList = environSoftwareResourcesService.getList(environId);
@@ -68,16 +68,15 @@
List<EnvironAnalysis> environAnalysesList = environAnalysisService.getList(environId);
data.setEnvironAnalysisList(environAnalysesList);
} else {
- Project project = projectService.get(projectId);
- Environ environ = new Environ();
+ Environ environ =new Environ();
data.setEnviron(environ);
- data.getEnviron().setSoftwareName(project.getSoftwareName());
- data.getEnviron().setSoftwareIdentity(project.getSoftwareIdentity());
- data.getEnviron().setProjectId(projectId);
+ }
+ if (projectId != null) {
+ data.setProjectId(projectId);
+ data.setProject(projectService.get(projectId));
}
if (data.getTestAgencyInfo() == null)
- data.getEnviron().setAgencyName(testAgencyInfoService.get(10000L).getAgencyName());
- data.getEnviron().setSite(testAgencyInfoService.get(10000L).getSite());
+ data.setTestAgencyInfo(testAgencyInfoService.get(10000L));
return data;
}
@@ -147,8 +146,13 @@
environAnalysisService.insert(environAnalysis);
}
}
-
- sysOssConfigService.updateOss(softwareTestOrderDto.getId(), softwareTestOrderDto.getFiles());// 淇濆瓨闄勪欢
+ if (softwareTestOrderDto.getTestAgencyInfo().getId() == 10000) {
+ softwareTestOrderDto.getTestAgencyInfo().setId(environId);
+ testAgencyInfoService.insert(softwareTestOrderDto.getTestAgencyInfo());
+ } else {
+ testAgencyInfoService.update(softwareTestOrderDto.getTestAgencyInfo());
+ }
+ sysOssConfigService.updateOss(softwareTestOrderDto.getEnviron().getId(), softwareTestOrderDto.getFiles());// 淇濆瓨闄勪欢
return true;
}
}
--
Gitblit v1.9.1