From e39f90ae828bcb501c0d9d39b74a148b38d69869 Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期五, 17 十一月 2023 09:49:21 +0800
Subject: [PATCH] 编号
---
modules/mainPart/src/main/java/com/zt/life/modules/project/dto/SoftwareTestOrderDto.java | 6 ++++++
zt/core/src/main/java/com/zt/modules/sys/service/SysUserService.java | 3 ---
modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java | 5 +++++
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java | 17 ++++++++++++++---
4 files changed, 25 insertions(+), 6 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..4558101 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;
@@ -58,6 +60,9 @@
@Autowired
private SysCodeRuleService sysCodeRuleService;
+ @Autowired
+ private SysOssConfigService sysOssConfigService;
+
@GetMapping("page")
@ApiOperation("鍒嗛〉")
@ApiImplicitParams({
@@ -78,6 +83,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);
}
@@ -99,10 +110,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();
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/dto/SoftwareTestOrderDto.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/dto/SoftwareTestOrderDto.java
index 0b88ba8..466f9b8 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/dto/SoftwareTestOrderDto.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/dto/SoftwareTestOrderDto.java
@@ -16,9 +16,15 @@
public class SoftwareTestOrderDto {
private Long id;
private Long projectId;
+
+ @ApiModelProperty(value = "娴嬭瘯濮旀墭鍗曡褰�")
private SoftwareTestOrder softwareTestOrder;
+ @ApiModelProperty(value = "娴嬭瘯椤圭洰鍩烘湰淇℃伅")
private Project project;
+ @ApiModelProperty(value = "娴嬭瘯鏈烘瀯淇℃伅")
private TestAgencyInfo TestAgencyInfo;
+ @ApiModelProperty(value = "娴嬭瘯濮旀墭鍗曢檮浠�")
+ private OssDto files;
@ApiModelProperty(value = "琚祴浠�")
private List<SoftwareTestOrderMeasured> measuredList = new ArrayList<>();
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java
index b488403..53531b4 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java
@@ -15,6 +15,7 @@
import com.zt.life.modules.project.model.SoftwareTestOrderDeliverable;
import com.zt.life.modules.project.model.SoftwareTestOrderMeasured;
import com.zt.life.modules.sysBaseInfo.service.TestAgencyInfoService;
+import com.zt.life.sys.service.SysOssConfigService;
import com.zt.modules.coderule.service.SysCodeRuleService;
import com.zt.modules.sys.service.SysDictTypeService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -57,6 +58,9 @@
private WordFileService wordFileService;
@Autowired
private GetShowDictList getShowDictList;
+
+ @Autowired
+ private SysOssConfigService sysOssConfigService;
/**
* 鍒嗛〉鏌ヨ
@@ -119,6 +123,7 @@
} else {
testAgencyInfoService.update(softwareTestOrderDto.getTestAgencyInfo());
}
+ sysOssConfigService.updateOss(softwareTestOrderDto.getId(), softwareTestOrderDto.getFiles());// 淇濆瓨闄勪欢
return true;
}
diff --git a/zt/core/src/main/java/com/zt/modules/sys/service/SysUserService.java b/zt/core/src/main/java/com/zt/modules/sys/service/SysUserService.java
index e3de51f..ca0c220 100644
--- a/zt/core/src/main/java/com/zt/modules/sys/service/SysUserService.java
+++ b/zt/core/src/main/java/com/zt/modules/sys/service/SysUserService.java
@@ -58,7 +58,6 @@
private SysDeptService sysDeptService;
@Autowired
private SysParamsService paramsService;
-
@Autowired
SysMapService sysMapService;
@@ -69,7 +68,6 @@
if (!user.isSuperAdmin()) {
queryFilter.addParam("deptIds", sysDeptService.getWithDescendantIds(user.getDeptId()));
}
-
// 鏌ヨ
return queryFilter.getPageList(baseDao.getList(queryFilter.getParams()));
}
@@ -80,7 +78,6 @@
if (!user.isSuperAdmin()) {
queryFilter.addParam("deptIds", sysDeptService.getWithDescendantIds(user.getDeptId()));
}
-
return baseDao.getList(queryFilter.getParams());
}
--
Gitblit v1.9.1