From 9ccaff1031985417c58a0c6d9528fd621ca0a80b Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 22 十一月 2023 14:20:53 +0800
Subject: [PATCH] Changes
---
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 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 306547e..02e6a98 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
@@ -19,6 +19,8 @@
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.life.sys.dto.OssDto;
+import com.zt.life.sys.service.SysOssConfigService;
import com.zt.modules.coderule.service.SysCodeRuleService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -30,6 +32,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -48,15 +52,10 @@
private SoftwareTestOrderService softwareTestOrderService;
@Autowired
- private ProjectService projectService;
- @Autowired
- private SoftwareTestOrderDeliverableService softwareTestOrderDeliverableService;
- @Autowired
- private SoftwareTestOrderMeasuredService softwareTestOrderMeasuredService;
- @Autowired
- private TestAgencyInfoService testAgencyInfoService;
- @Autowired
private SysCodeRuleService sysCodeRuleService;
+
+ @Autowired
+ private SysOssConfigService sysOssConfigService;
@GetMapping("page")
@ApiOperation("鍒嗛〉")
@@ -78,6 +77,12 @@
@ApiOperation("淇℃伅")
public Result<SoftwareTestOrderDto> getDto(Long projectId,Long orderId) {
SoftwareTestOrderDto data = softwareTestOrderService.getDto(projectId, orderId);
+ if (orderId!=null) {
+ OssDto ossDto = sysOssConfigService.getOssByBusiType(orderId, "test_order");
+ if (ossDto != null) {
+ data.setFiles(ossDto);
+ }
+ }
return Result.ok(data);
}
@@ -89,8 +94,9 @@
//鏁堥獙鏁版嵁
ValidatorUtils.validateEntity(softwareTestOrderDto.getSoftwareTestOrder(), AddGroup.class, DefaultGroup.class);
- Map<String,String> map = new HashMap<>();
- map.put("funCode","software_test_order");
+ Map<String, String> map = new HashMap<>();
+ map.put("funCode", "software_test_order");
+ map.put("projectId",softwareTestOrderDto.getProjectId().toString());
softwareTestOrderDto.getSoftwareTestOrder().setCode(sysCodeRuleService.getNewCode(map));
Boolean result = softwareTestOrderService.save(softwareTestOrderDto);
return Result.ok();
@@ -99,10 +105,10 @@
@PutMapping
@ApiOperation("淇敼")
@LogOperation("淇敼")
- public Result update(@RequestBody SoftwareTestOrderDto softwareTestOrderDtor) {
+ public Result update(@RequestBody SoftwareTestOrderDto softwareTestOrderDto) {
//鏁堥獙鏁版嵁
- ValidatorUtils.validateEntity(softwareTestOrderDtor.getSoftwareTestOrder(), UpdateGroup.class, DefaultGroup.class);
- Boolean result = softwareTestOrderService.save(softwareTestOrderDtor);
+ ValidatorUtils.validateEntity(softwareTestOrderDto.getSoftwareTestOrder(), UpdateGroup.class, DefaultGroup.class);
+ Boolean result = softwareTestOrderService.save(softwareTestOrderDto);
return Result.ok();
}
--
Gitblit v1.9.1