From 3a985f6b77989c95029d273864aa5f782e15ef96 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 14 十一月 2023 11:07:57 +0800
Subject: [PATCH] Changes
---
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java | 70 ++++++++++++-----------------------
1 files changed, 24 insertions(+), 46 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 a67576f..6fa1726 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
@@ -13,6 +13,7 @@
import com.zt.common.validator.group.DefaultGroup;
import com.zt.common.validator.group.UpdateGroup;
import com.zt.life.modules.project.dto.SoftwareTestOrderDto;
+import com.zt.life.modules.project.model.Project;
import com.zt.life.modules.project.model.SoftwareTestOrder;
import com.zt.life.modules.project.model.SoftwareTestOrderDeliverable;
import com.zt.life.modules.project.model.SoftwareTestOrderMeasured;
@@ -26,10 +27,14 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -78,52 +83,7 @@
@GetMapping("getDto")
@ApiOperation("淇℃伅")
public Result<SoftwareTestOrderDto> getDto(Long orderId, Long projectId) {
- SoftwareTestOrderDto data = new SoftwareTestOrderDto();
-
- if (orderId != null) {
- data.setId(orderId);
- SoftwareTestOrder softwareTestOrder = softwareTestOrderService.get(orderId);
- data.setSoftwareTestOrder(softwareTestOrder);
-
- if (projectId == null)
- projectId = softwareTestOrder.getProjectId();
-
- data.setTestAgencyInfo(testAgencyInfoService.get(orderId));
- List<SoftwareTestOrderDeliverable> deliverableList = softwareTestOrderDeliverableService.childrenTables(orderId);
- if (deliverableList.isEmpty()) {
- deliverableList = softwareTestOrderService.deliverableDict();
- deliverableList = deliverableList.stream()
- .peek(deliverable -> {
- if (deliverable.getIdentify() == null) {
- // 淇敼 identify 瀛楁鐨勫�间负鏂板��
- deliverable.setIdentify("1.0.0");
- }
- })
- .collect(Collectors.toList());
- }
- data.setSoftwareTestOrderDeliverableList(deliverableList);
-
- List<SoftwareTestOrderMeasured> measuredList = softwareTestOrderMeasuredService.childrenTables(orderId);
- if (measuredList.isEmpty()) {
- measuredList = softwareTestOrderService.MeasuredDict();
- measuredList = measuredList.stream()
- .peek(measured -> {
- if (measured.getIdentify() == null) {
- // 淇敼 identify 瀛楁鐨勫�间负鏂板��
- measured.setIdentify("1.0.0");
- }
- })
- .collect(Collectors.toList());
- }
- data.setSoftwareTestOrderMeasuredList(measuredList);} else {
- data.setTestAgencyInfo(testAgencyInfoService.get(10000L));
- }
- if (projectId != null) {
- data.setProjectId(projectId);
- data.setProject(projectService.get(projectId));
- }
-
-
+ SoftwareTestOrderDto data = softwareTestOrderService.getDto(orderId, projectId);
return Result.ok(data);
}
@@ -163,4 +123,22 @@
return Result.ok();
}
+ @GetMapping("exportWord/{id}")
+ @ApiOperation("鎵撳嵃娴嬭瘯濮旀墭鍗�")
+ @LogOperation("鎵撳嵃娴嬭瘯濮旀墭鍗�")
+ public void exportWord(@PathVariable("id") Long id, HttpServletRequest request, HttpServletResponse response) {
+ softwareTestOrderService.exportWord(id, request, response);
+ }
+
+ @GetMapping("getCode")
+ @ApiOperation("缂栧彿")
+ public Result<List<String>> getCode() {
+ return Result.ok( projectService.getCode());
+ }
+
+ @GetMapping("getProject/{code}")
+ @ApiOperation("椤圭洰鏁版嵁")
+ public Result<Project> getProject(@Param("code") String code) {
+ return Result.ok(projectService.getProject(code));
+ }
}
--
Gitblit v1.9.1