From 68fa4972eb9c0b1aaff20d6f400f9105a7042b71 Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期一, 20 十一月 2023 09:39:53 +0800
Subject: [PATCH] 项目表
---
modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java | 36 ++++++++++++++++++++++++------------
1 files changed, 24 insertions(+), 12 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..556abeb 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,11 +4,14 @@
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;
@@ -18,13 +21,11 @@
/**
* 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,14 +45,21 @@
@Autowired
private EnvironAnalysisService environAnalysisService;
- public SoftwareTestOrderDto getDto(Long orderId, Long environId) {
+ @Autowired
+ private ProjectService projectService;
+
+ @Autowired
+ private TestAgencyInfoService testAgencyInfoService;
+
+
+ public SoftwareTestOrderDto getDto(Long projectId, Long environId) {
SoftwareTestOrderDto data = new SoftwareTestOrderDto();
if (environId != null) {
data.setId(environId);
Environ environ = this.get(environId);
data.setEnviron(environ);
- orderId = softwareTestOrder.getId();
+ projectId = environ.getProjectId();
List<EnvironSoftwareResources> softwareResourcesList = environSoftwareResourcesService.getList(environId);
data.setSoftwareResourcesList(softwareResourcesList);
@@ -62,12 +70,16 @@
List<EnvironAnalysis> environAnalysesList = environAnalysisService.getList(environId);
data.setEnvironAnalysisList(environAnalysesList);
} else {
- SoftwareTestOrder softwareTestOrder = softwareTestOrderService.get(orderId);
+ Project project = projectService.get(projectId);
+ data.getEnviron().setSoftwareName(project.getSoftwareName());
+ data.getEnviron().setSoftwareIdentity(project.getSoftwareIdentity());
}
-
- if (orderId != null) {
- data.setOrderId(orderId);
- data.setSoftwareTestOrder(softwareTestOrderService.get(orderId));
+ 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));
}
return data;
@@ -99,7 +111,7 @@
else {
Map<String, String> map = new HashMap<>();
map.put("funCode", "environ");
- softwareTestOrderDto.getEnviron().setOrderId(softwareTestOrderDto.getOrderId());
+ softwareTestOrderDto.getEnviron().setProjectId(softwareTestOrderDto.getProjectId());
softwareTestOrderDto.getEnviron().setCode(sysCodeRuleService.getNewCode(map));
baseDao.insert(softwareTestOrderDto.getEnviron());
environId = softwareTestOrderDto.getEnviron().getId();
--
Gitblit v1.9.1