From 27410959f19cf24ca0613510da2274a38fc79e69 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 10 十一月 2023 10:29:53 +0800
Subject: [PATCH] Changes
---
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 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 6b8bf9f..b74ea00 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
@@ -12,8 +12,14 @@
import com.zt.common.validator.group.AddGroup;
import com.zt.common.validator.group.DefaultGroup;
import com.zt.common.validator.group.UpdateGroup;
+import com.zt.life.modules.project.dto.ProjectDto;
import com.zt.life.modules.project.model.SoftwareTestOrder;
+import com.zt.life.modules.project.service.ProjectService;
+import com.zt.life.modules.project.service.SoftwareTestOrderDeliverableService;
+import com.zt.life.modules.project.service.SoftwareTestOrderMeasuredService;
import com.zt.life.modules.project.service.SoftwareTestOrderService;
+import com.zt.life.modules.sysBaseInfo.model.TestAgencyInfo;
+import com.zt.life.modules.sysBaseInfo.service.TestAgencyInfoService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -37,7 +43,15 @@
@Api(tags="software_test_order")
public class SoftwareTestOrderController {
@Autowired
+ private ProjectService projectService;
+ @Autowired
private SoftwareTestOrderService softwareTestOrderService;
+ @Autowired
+ private SoftwareTestOrderDeliverableService softwareTestOrderDeliverableService;
+ @Autowired
+ private SoftwareTestOrderMeasuredService softwareTestOrderMeasuredService;
+ @Autowired
+ private TestAgencyInfoService testAgencyInfoService;
@GetMapping("page")
@ApiOperation("鍒嗛〉")
@@ -56,12 +70,18 @@
@GetMapping("{id}")
@ApiOperation("淇℃伅")
- public Result<SoftwareTestOrder> get(@PathVariable("id") Long id){
- SoftwareTestOrder data = softwareTestOrderService.get(id);
-
+ public Result<ProjectDto> get(@PathVariable("id") Long id){
+ ProjectDto data = new ProjectDto();
+ SoftwareTestOrder softwareTestOrder = softwareTestOrderService.get(id);
+ data.setSoftwareTestOrder(softwareTestOrder);
+ data.setProject(projectService.get(softwareTestOrder.getProjectId()));
+ data.setTestAgencyInfo(testAgencyInfoService.get(softwareTestOrder.getAgencyId()));
+ data.setChildrenTable2(softwareTestOrderDeliverableService.childrenTables(softwareTestOrder.getId()));
+ data.setChildrenTable1(softwareTestOrderMeasuredService.childrenTables(softwareTestOrder.getId()));
return Result.ok(data);
}
+
@PostMapping
@ApiOperation("鏂板")
@LogOperation("鏂板")
--
Gitblit v1.9.1