From 815cf005152ca73ca08aabd44021d5f6ac72b06a Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 20 十一月 2023 09:08:52 +0800
Subject: [PATCH] Changes
---
modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java | 41 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 40 insertions(+), 1 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 d030877..79d1ee5 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
@@ -2,7 +2,9 @@
import com.zt.common.service.BaseService;
import com.zt.life.modules.project.dao.EnvironDao;
-import com.zt.life.modules.project.model.Environ;
+import com.zt.life.modules.project.dto.SoftwareTestOrderDto;
+import com.zt.life.modules.project.model.*;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;
import javax.annotation.Resource;
@@ -17,6 +19,43 @@
*/
@Service
public class EnvironService extends BaseService<EnvironDao, Environ> {
+ @Autowired
+ private SoftwareTestOrder softwareTestOrder;
+
+ @Autowired
+ private EnvironSoftwareResourcesService environSoftwareResourcesService;
+
+ @Autowired
+ private EnvironHardwareResourcesService environHardwareResourcesService;
+
+ @Autowired
+ private SoftwareTestOrderService softwareTestOrderService;
+
+ public SoftwareTestOrderDto getDto(Long orderId, Long environId) {
+ SoftwareTestOrderDto data = new SoftwareTestOrderDto();
+ if (environId != null) {
+ data.setId(environId);
+ Environ environ = this.get(environId);
+ data.setEnviron(environ);
+
+ orderId = softwareTestOrder.getId();
+
+ List<EnvironSoftwareResources> softwareResourcesList = environSoftwareResourcesService.getList(environId);
+ data.setSoftwareResourcesList(softwareResourcesList);
+
+ List<EnvironHardwareResources> hardwareResourcesList = environHardwareResourcesService.getList(environId);
+ data.setHardwareResourcesList(hardwareResourcesList);
+ } else {
+ SoftwareTestOrder softwareTestOrder = softwareTestOrderService.get(orderId);
+ }
+
+ if (orderId != null) {
+ data.setOrderId(orderId);
+ data.setSoftwareTestOrder(softwareTestOrderService.get(orderId));
+ }
+
+ return data;
+ }
/**
* 鍒嗛〉鏌ヨ
--
Gitblit v1.9.1