From 6aaac065b98d29621590051084880fe36241624b Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 20 十一月 2023 09:08:53 +0800
Subject: [PATCH] Changes
---
modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 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..2188d53 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
@@ -23,8 +23,6 @@
*/
@Service
public class EnvironService extends BaseService<EnvironDao, Environ> {
- @Autowired
- private SoftwareTestOrder softwareTestOrder;
@Autowired
private EnvironSoftwareResourcesService environSoftwareResourcesService;
@@ -44,14 +42,14 @@
@Autowired
private EnvironAnalysisService environAnalysisService;
- public SoftwareTestOrderDto getDto(Long orderId, Long environId) {
+ 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 +60,12 @@
List<EnvironAnalysis> environAnalysesList = environAnalysisService.getList(environId);
data.setEnvironAnalysisList(environAnalysesList);
} else {
- SoftwareTestOrder softwareTestOrder = softwareTestOrderService.get(orderId);
+ SoftwareTestOrder softwareTestOrder = softwareTestOrderService.get(projectId);
}
- if (orderId != null) {
- data.setOrderId(orderId);
- data.setSoftwareTestOrder(softwareTestOrderService.get(orderId));
+ if (projectId != null) {
+ data.setOrderId(projectId);
+ data.setSoftwareTestOrder(softwareTestOrderService.get(projectId));
}
return data;
@@ -99,7 +97,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