From cb573b4eee7426d0d614fd59f48c1e8575738b8e Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 10 十一月 2023 12:02:27 +0800
Subject: [PATCH] Changes
---
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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..e22ab0a 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
@@ -66,22 +66,22 @@
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));
+ data.setTestAgencyInfo(testAgencyInfoService.get(orderId));
+ data.setSoftwareTestOrderDeliverableList(softwareTestOrderDeliverableService.childrenTables(orderId));
+ data.setSoftwareTestOrderMeasuredList(softwareTestOrderMeasuredService.childrenTables(orderId));
} else {
data.setTestAgencyInfo(testAgencyInfoService.get(10000L));
}
--
Gitblit v1.9.1