From 6aaac065b98d29621590051084880fe36241624b Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 20 十一月 2023 09:08:53 +0800
Subject: [PATCH] Changes
---
modules/mainPart/src/main/java/com/zt/life/modules/project/model/Environ.java | 4 ++--
modules/mainPart/src/main/resources/mapper/sysBaseInfo/TestAgencyInfoDao.xml | 4 ++--
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java | 8 ++++----
modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java | 16 +++++++---------
4 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java
index 30bd0f6..b696495 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java
@@ -67,10 +67,10 @@
@GetMapping("getDto")
@ApiOperation("淇℃伅")
- public Result<SoftwareTestOrderDto> getDto(Long orderId, Long environId) {
- SoftwareTestOrderDto data = environService.getDto(environId, orderId);
- if (orderId != null) {
- OssDto ossDto = sysOssConfigService.getOssByBusiType(orderId, "environ");
+ public Result<SoftwareTestOrderDto> getDto(Long projectId, Long environId) {
+ SoftwareTestOrderDto data = environService.getDto(environId, projectId);
+ if (projectId != null) {
+ OssDto ossDto = sysOssConfigService.getOssByBusiType(projectId, "environ");
if (ossDto != null) {
data.setFiles(ossDto);
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/Environ.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/Environ.java
index c3f346c..2e55186 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/Environ.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/Environ.java
@@ -26,8 +26,8 @@
@ApiModelProperty(value = "缂栧彿")
private String code;
- @ApiModelProperty(value = "濮旀墭鍗旾D")
- private Long orderId;
+ @ApiModelProperty(value = "椤圭洰ID")
+ private Long projectId;
@ApiModelProperty(value = "纭蒋浠惰祫婧�")
private String hardSoftwareRes;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java
index 433d2af..2188d53 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java
@@ -23,8 +23,6 @@
*/
@Service
public class EnvironService extends BaseService<EnvironDao, Environ> {
- @Autowired
- private SoftwareTestOrder softwareTestOrder;
@Autowired
private EnvironSoftwareResourcesService environSoftwareResourcesService;
@@ -44,14 +42,14 @@
@Autowired
private EnvironAnalysisService environAnalysisService;
- public SoftwareTestOrderDto getDto(Long orderId, Long environId) {
+ public SoftwareTestOrderDto getDto(Long projectId, Long environId) {
SoftwareTestOrderDto data = new SoftwareTestOrderDto();
if (environId != null) {
data.setId(environId);
Environ environ = this.get(environId);
data.setEnviron(environ);
- orderId = softwareTestOrder.getId();
+ projectId = environ.getProjectId();
List<EnvironSoftwareResources> softwareResourcesList = environSoftwareResourcesService.getList(environId);
data.setSoftwareResourcesList(softwareResourcesList);
@@ -62,12 +60,12 @@
List<EnvironAnalysis> environAnalysesList = environAnalysisService.getList(environId);
data.setEnvironAnalysisList(environAnalysesList);
} else {
- SoftwareTestOrder softwareTestOrder = softwareTestOrderService.get(orderId);
+ SoftwareTestOrder softwareTestOrder = softwareTestOrderService.get(projectId);
}
- if (orderId != null) {
- data.setOrderId(orderId);
- data.setSoftwareTestOrder(softwareTestOrderService.get(orderId));
+ if (projectId != null) {
+ data.setOrderId(projectId);
+ data.setSoftwareTestOrder(softwareTestOrderService.get(projectId));
}
return data;
@@ -99,7 +97,7 @@
else {
Map<String, String> map = new HashMap<>();
map.put("funCode", "environ");
- softwareTestOrderDto.getEnviron().setOrderId(softwareTestOrderDto.getOrderId());
+ softwareTestOrderDto.getEnviron().setProjectId(softwareTestOrderDto.getProjectId());
softwareTestOrderDto.getEnviron().setCode(sysCodeRuleService.getNewCode(map));
baseDao.insert(softwareTestOrderDto.getEnviron());
environId = softwareTestOrderDto.getEnviron().getId();
diff --git a/modules/mainPart/src/main/resources/mapper/sysBaseInfo/TestAgencyInfoDao.xml b/modules/mainPart/src/main/resources/mapper/sysBaseInfo/TestAgencyInfoDao.xml
index b1f1e5e..5f9d9b9 100644
--- a/modules/mainPart/src/main/resources/mapper/sysBaseInfo/TestAgencyInfoDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/sysBaseInfo/TestAgencyInfoDao.xml
@@ -8,8 +8,8 @@
from test_agency_info a
<where>
a.is_delete = 0
- <if test="whereSql!=null">
- and ${whereSql}
+ <if test="ID!=null">
+ and a.ID = 10000
</if>
</where>
<if test="orderBySql!=null">
--
Gitblit v1.9.1