From 316439a908d0b2363966ebbad23e3b8001291850 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 20 十一月 2023 14:48:46 +0800
Subject: [PATCH] Changes
---
modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java | 37 +++++++++++++++++++++----------------
1 files changed, 21 insertions(+), 16 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 556abeb..9b9fb1a 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
@@ -13,9 +13,8 @@
import com.zt.common.db.query.QueryFilter;
import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
/**
@@ -52,15 +51,14 @@
private TestAgencyInfoService testAgencyInfoService;
- public SoftwareTestOrderDto getDto(Long projectId, Long environId) {
+ 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);
data.setSoftwareResourcesList(softwareResourcesList);
@@ -70,17 +68,15 @@
List<EnvironAnalysis> environAnalysesList = environAnalysisService.getList(environId);
data.setEnvironAnalysisList(environAnalysesList);
} else {
- Project project = projectService.get(projectId);
- data.getEnviron().setSoftwareName(project.getSoftwareName());
- data.getEnviron().setSoftwareIdentity(project.getSoftwareIdentity());
+ Environ environ =new Environ();
+ data.setEnviron(environ);
+ }
+ 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());
- if (projectId != null) {
- data.setOrderId(projectId);
- data.setSoftwareTestOrder(softwareTestOrderService.get(projectId));
- }
+ data.setTestAgencyInfo(testAgencyInfoService.get(10000L));
return data;
}
@@ -109,8 +105,12 @@
if (environId != null)
baseDao.updateById(softwareTestOrderDto.getEnviron());
else {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
+ String year = sdf.format(new Date());
Map<String, String> map = new HashMap<>();
map.put("funCode", "environ");
+ map.put("year",year);
+ softwareTestOrderDto.getEnviron().setYear(year);
softwareTestOrderDto.getEnviron().setProjectId(softwareTestOrderDto.getProjectId());
softwareTestOrderDto.getEnviron().setCode(sysCodeRuleService.getNewCode(map));
baseDao.insert(softwareTestOrderDto.getEnviron());
@@ -146,7 +146,12 @@
environAnalysisService.insert(environAnalysis);
}
}
-
+ if (softwareTestOrderDto.getTestAgencyInfo().getId() == 10000) {
+ softwareTestOrderDto.getTestAgencyInfo().setId(environId);
+ testAgencyInfoService.insert(softwareTestOrderDto.getTestAgencyInfo());
+ } else {
+ testAgencyInfoService.update(softwareTestOrderDto.getTestAgencyInfo());
+ }
sysOssConfigService.updateOss(softwareTestOrderDto.getId(), softwareTestOrderDto.getFiles());// 淇濆瓨闄勪欢
return true;
}
--
Gitblit v1.9.1