From fbdc3cb5768e3484648edf3ff96df03c881e78fa Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期四, 16 十一月 2023 09:32:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java | 63 +++++--------------------------
1 files changed, 11 insertions(+), 52 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..89b512c 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,8 +14,6 @@
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;
import com.zt.life.modules.project.service.SoftwareTestOrderMeasuredService;
@@ -30,10 +28,10 @@
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
-import java.util.stream.Collectors;
/**
@@ -77,53 +75,8 @@
@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));
- }
-
-
+ public Result<SoftwareTestOrderDto> getDto(Long projectId,Long orderId) {
+ SoftwareTestOrderDto data = softwareTestOrderService.getDto(projectId, orderId);
return Result.ok(data);
}
@@ -152,7 +105,7 @@
return Result.ok();
}
- @DeleteMapping
+ @DeleteMapping("deleteOrder")
@ApiOperation("鍒犻櫎")
@LogOperation("鍒犻櫎")
public Result delete(@RequestBody Long[] ids) {
@@ -163,4 +116,10 @@
return Result.ok();
}
+ @GetMapping("exportWord")
+ @ApiOperation("鎵撳嵃娴嬭瘯濮旀墭鍗�")
+ @LogOperation("鎵撳嵃娴嬭瘯濮旀墭鍗�")
+ public void exportWord(Long id, HttpServletRequest request, HttpServletResponse response) {
+ softwareTestOrderService.exportWord(id, request, response);
+ }
}
--
Gitblit v1.9.1