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 | 61 ++++++++++++++++++------------
1 files changed, 36 insertions(+), 25 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 e22ab0a..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,20 +13,32 @@
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;
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.service.TestAgencyInfoService;
+import com.zt.modules.coderule.service.SysCodeRuleService;
import io.swagger.annotations.Api;
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;
+import java.util.stream.Collectors;
/**
@@ -50,6 +62,8 @@
private SoftwareTestOrderMeasuredService softwareTestOrderMeasuredService;
@Autowired
private TestAgencyInfoService testAgencyInfoService;
+ @Autowired
+ private SysCodeRuleService sysCodeRuleService;
@GetMapping("page")
@ApiOperation("鍒嗛〉")
@@ -69,28 +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));
- data.setSoftwareTestOrderDeliverableList(softwareTestOrderDeliverableService.childrenTables(orderId));
- data.setSoftwareTestOrderMeasuredList(softwareTestOrderMeasuredService.childrenTables(orderId));
- } 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);
}
@@ -102,10 +95,10 @@
//鏁堥獙鏁版嵁
ValidatorUtils.validateEntity(softwareTestOrderDto.getSoftwareTestOrder(), AddGroup.class, DefaultGroup.class);
-
+ Map<String,String> map = new HashMap<>();
+ map.put("funCode","software_test_order");
+ softwareTestOrderDto.getSoftwareTestOrder().setCode(sysCodeRuleService.getNewCode(map));
Boolean result = softwareTestOrderService.save(softwareTestOrderDto);
-
-
return Result.ok();
}
@@ -130,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