From 7ce2d2cc98ee4ed0361d8376b8d49d567af7b268 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 21 十一月 2023 08:36:45 +0800
Subject: [PATCH] Changes
---
modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java | 65 ++++++++++++++++++++++----------
1 files changed, 45 insertions(+), 20 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 433d2af..3347e6f 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
@@ -4,27 +4,27 @@
import com.zt.life.modules.project.dao.EnvironDao;
import com.zt.life.modules.project.dto.SoftwareTestOrderDto;
import com.zt.life.modules.project.model.*;
+import com.zt.life.modules.sysBaseInfo.model.TestAgencyInfo;
+import com.zt.life.modules.sysBaseInfo.service.TestAgencyInfoService;
import com.zt.life.sys.service.SysOssConfigService;
import com.zt.modules.coderule.service.SysCodeRuleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
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.*;
/**
* environ
*
- * @author zt generator
+ * @author zt generator
* @since 1.0.0 2023-11-17
*/
@Service
-public class EnvironService extends BaseService<EnvironDao, Environ> {
- @Autowired
- private SoftwareTestOrder softwareTestOrder;
+public class EnvironService extends BaseService<EnvironDao, Environ> {
@Autowired
private EnvironSoftwareResourcesService environSoftwareResourcesService;
@@ -44,15 +44,21 @@
@Autowired
private EnvironAnalysisService environAnalysisService;
- public SoftwareTestOrderDto getDto(Long orderId, Long environId) {
+ @Autowired
+ private ProjectService projectService;
+
+ @Autowired
+ private TestAgencyInfoService testAgencyInfoService;
+
+
+ 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));
- orderId = softwareTestOrder.getId();
-
+ projectId = environ.getProjectId();
List<EnvironSoftwareResources> softwareResourcesList = environSoftwareResourcesService.getList(environId);
data.setSoftwareResourcesList(softwareResourcesList);
@@ -62,13 +68,15 @@
List<EnvironAnalysis> environAnalysesList = environAnalysisService.getList(environId);
data.setEnvironAnalysisList(environAnalysesList);
} else {
- SoftwareTestOrder softwareTestOrder = softwareTestOrderService.get(orderId);
+ Environ environ =new Environ();
+ data.setEnviron(environ);
}
-
- if (orderId != null) {
- data.setOrderId(orderId);
- data.setSoftwareTestOrder(softwareTestOrderService.get(orderId));
+ if (projectId != null) {
+ data.setProjectId(projectId);
+ data.setProject(projectService.get(projectId));
}
+ if (data.getTestAgencyInfo() == null)
+ data.setTestAgencyInfo(testAgencyInfoService.get(10000L));
return data;
}
@@ -97,45 +105,62 @@
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");
- softwareTestOrderDto.getEnviron().setOrderId(softwareTestOrderDto.getOrderId());
+ map.put("year",year);
+ softwareTestOrderDto.getEnviron().setYear(year);
+ softwareTestOrderDto.getEnviron().setProjectId(softwareTestOrderDto.getProjectId());
softwareTestOrderDto.getEnviron().setCode(sysCodeRuleService.getNewCode(map));
baseDao.insert(softwareTestOrderDto.getEnviron());
environId = softwareTestOrderDto.getEnviron().getId();
}
+ int i = 0;
for (EnvironSoftwareResources environSoftwareResources : softwareTestOrderDto.getSoftwareResourcesList()) {
environSoftwareResources.setEnvironId(environId);
if (environSoftwareResources.getId() != null) {
environSoftwareResourcesService.update(environSoftwareResources);
} else {
+ i++;
+ environSoftwareResources.setNo(i);
environSoftwareResources.setEnvironId(environId);
environSoftwareResourcesService.insert(environSoftwareResources);
}
}
-
+ i = 0;
for (EnvironHardwareResources environHardwareResources : softwareTestOrderDto.getHardwareResourcesList()) {
environHardwareResources.setEnvironId(environId);
if (environHardwareResources.getId() != null) {
environHardwareResourcesService.update(environHardwareResources);
} else {
+ i++;
+ environHardwareResources.setNo(i);
environHardwareResources.setEnvironId(environId);
environHardwareResourcesService.insert(environHardwareResources);
}
}
+ i = 0;
for (EnvironAnalysis environAnalysis : softwareTestOrderDto.getEnvironAnalysisList()) {
environAnalysis.setEnvironId(environId);
if (environAnalysis.getId() != null) {
environAnalysisService.update(environAnalysis);
} else {
+ i++;
+ environAnalysis.setNo(i);
environAnalysis.setEnvironId(environId);
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