From 1249ac088787abb46bc60a241531e2b4fcc961fe Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 13 十一月 2023 10:38:57 +0800
Subject: [PATCH] Changes
---
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java
index 0a7579e..88146dc 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java
@@ -14,6 +14,7 @@
import com.zt.common.validator.group.UpdateGroup;
import com.zt.life.modules.project.dto.SoftwareTestOrderDto;
import com.zt.life.modules.project.model.SoftwareTestOrder;
+import com.zt.life.modules.project.model.SoftwareTestOrderDeliverable;
import com.zt.life.modules.project.model.SoftwareTestOrderMeasured;
import com.zt.life.modules.project.service.ProjectService;
import com.zt.life.modules.project.service.SoftwareTestOrderDeliverableService;
@@ -27,6 +28,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.List;
/**
@@ -66,23 +69,31 @@
return PageResult.ok(softwareTestOrderService.page(queryFilter));
}
- @GetMapping("{id}")
+ @GetMapping("getDto")
@ApiOperation("淇℃伅")
- public Result<SoftwareTestOrderDto> get(@PathVariable("id") Long id, @PathVariable("projectId") Long projectId) {
+ public Result<SoftwareTestOrderDto> getDto(Long orderId, Long projectId) {
SoftwareTestOrderDto data = new SoftwareTestOrderDto();
- if (id != null) {
- data.setId(id);
- SoftwareTestOrder softwareTestOrder = softwareTestOrderService.get(id);
+ if (orderId != null) {
+ data.setId(orderId);
+ SoftwareTestOrder softwareTestOrder = softwareTestOrderService.get(orderId);
data.setSoftwareTestOrder(softwareTestOrder);
if (projectId == null)
projectId = softwareTestOrder.getProjectId();
- data.setTestAgencyInfo(testAgencyInfoService.get(id));
- data.setSoftwareTestOrderDeliverableList(softwareTestOrderDeliverableService.childrenTables(id));
- data.setSoftwareTestOrderMeasuredList(softwareTestOrderMeasuredService.childrenTables(id));
- } else {
+ data.setTestAgencyInfo(testAgencyInfoService.get(orderId));
+ List<SoftwareTestOrderDeliverable> deliverableList = softwareTestOrderDeliverableService.childrenTables(orderId);
+ if (deliverableList.isEmpty()) {
+ deliverableList = softwareTestOrderService.deliverableDict();
+ }
+ data.setSoftwareTestOrderDeliverableList(deliverableList);
+
+ List<SoftwareTestOrderMeasured> measuredList = softwareTestOrderMeasuredService.childrenTables(orderId);
+ if (measuredList.isEmpty()) {
+ measuredList = softwareTestOrderService.MeasuredDict();
+ }
+ data.setSoftwareTestOrderMeasuredList(measuredList);} else {
data.setTestAgencyInfo(testAgencyInfoService.get(10000L));
}
if (projectId != null) {
--
Gitblit v1.9.1