From 1368918fcda9d88bea653cc3a134b245a338d84c Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 15 十一月 2023 10:07:14 +0800
Subject: [PATCH] Changes
---
modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java
index e409b16..31ac0db 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java
@@ -14,12 +14,10 @@
import com.zt.life.modules.sysBaseInfo.service.TestAgencyInfoService;
import com.zt.modules.coderule.service.SysCodeRuleService;
import com.zt.modules.sys.service.SysDictTypeService;
-import lombok.val;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;
-import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.FileNotFoundException;
@@ -120,27 +118,34 @@
return true;
}
- public SoftwareTestOrderDto getDto(Long orderId, Long projectId) {
+ public SoftwareTestOrderDto getDto(Long projectId,Long orderId) {
SoftwareTestOrderDto data = new SoftwareTestOrderDto();
if (orderId != null) {
data.setId(orderId);
SoftwareTestOrder softwareTestOrder = this.get(orderId);
data.setSoftwareTestOrder(softwareTestOrder);
+ projectId = softwareTestOrder.getProjectId();
-/* if (projectId == null)
- projectId = softwareTestOrder.getProjectId();
data.setTestAgencyInfo(testAgencyInfoService.get(orderId));
- */
+
List<SoftwareTestOrderDeliverable> deliverableList = softwareTestOrderDeliverableService.childrenTables(orderId);
data.setDeliverableList(deliverableList);
List<SoftwareTestOrderMeasured> measuredList = softwareTestOrderMeasuredService.childrenTables(orderId);
data.setMeasuredList(measuredList);
} else {
- List<SoftwareTestOrderDeliverable> deliverableList = baseDao.getdeliverableDictList();
- List<SoftwareTestOrderMeasured> measuredList = baseDao.getMeasuredDictList();
- data.setTestAgencyInfo(testAgencyInfoService.get(10000L));
+ List<?> testItemResult = baseDao.dictList("testItem_type");
+ List<?> measuredList = testItemResult;
+ data.setMeasuredList((List<SoftwareTestOrderMeasured>) measuredList);
+
+ List<?> productLibraryResult = baseDao.dictList("product_library_file");
+ List<?> deliverableList = productLibraryResult;
+ data.setDeliverableList((List<SoftwareTestOrderDeliverable>) deliverableList);
}
+
+ if (data.getTestAgencyInfo() == null)
+ data.setTestAgencyInfo(testAgencyInfoService.get(10000L));
+
if (projectId != null) {
data.setProjectId(projectId);
data.setProject(projectService.get(projectId));
--
Gitblit v1.9.1