diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/domain/PmsProjectTestcase.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/domain/PmsProjectTestcase.java
index 82efb63df..38fd8274c 100644
--- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/domain/PmsProjectTestcase.java
+++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/domain/PmsProjectTestcase.java
@@ -146,9 +146,15 @@ public class PmsProjectTestcase extends BaseEntity {
@ApiModelProperty(value = "测试用例标识")
private String identifier;
+ @ApiModelProperty(value = "测试追踪")
+ private String testTracking;
+
@ApiModelProperty(value = "产品需求id")
private Long productReqSpecsId;
+ @ApiModelProperty(value = "是否导入")
+ private Long isImport;
+
public PmsProjectTestcaseDataVo toPmsProjectTestcaseDataVo() {
PmsProjectTestcaseDataVo target = new PmsProjectTestcaseDataVo();
BeanUtils.copyProperties(this, target);
diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/domain/vo/PmsProjectTestcaseInputVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/domain/vo/PmsProjectTestcaseInputVo.java
index 4b0a4b3c6..66c93cf29 100644
--- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/domain/vo/PmsProjectTestcaseInputVo.java
+++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/domain/vo/PmsProjectTestcaseInputVo.java
@@ -105,6 +105,14 @@ public class PmsProjectTestcaseInputVo {
@Size(max = 500, message = "长度需要小于500")
private String terminationConditions;
+ @ApiModelProperty(value = "测试用例标识")
+ @Size(max = 255, message = "长度需要小于500")
+ private String identifier;
+
+ @ApiModelProperty(value = "测试追踪")
+ @Size(max = 255, message = "长度需要小于500")
+ private String testTracking;
+
/**
* 测试步骤列表
*/
diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectTestcaseServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectTestcaseServiceImpl.java
index 32896a61b..7fbf345e2 100644
--- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectTestcaseServiceImpl.java
+++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/project/service/impl/PmsProjectTestcaseServiceImpl.java
@@ -149,20 +149,22 @@ public class PmsProjectTestcaseServiceImpl implements IPmsProjectTestcaseService
, x -> pmsProductModuleService.selectPmsProductModuleById(x, false)
, pmsProjectTestcase.getPmsModuleId()));
}
- // 设置需求创建人
- pmsProjectTestcaseDataVo.setCreateBy(
- PmsUtils.getSelectObjectInCache(
- hashMap
- , pmsCommonService::getNickNameByUsername
- , pmsProjectTestcase.getCreateBy())
- );
- // 设置需求更新人
- pmsProjectTestcaseDataVo.setUpdateBy(
- PmsUtils.getSelectObjectInCache(
- hashMap
- , pmsCommonService::getNickNameByUsername
- , pmsProjectTestcase.getUpdateBy())
- );
+ if (pmsProjectTestcase.getIsImport() != null) {
+ // 设置需求创建人
+ pmsProjectTestcaseDataVo.setCreateBy(
+ PmsUtils.getSelectObjectInCache(
+ hashMap
+ , pmsCommonService::getNickNameByUsername
+ , pmsProjectTestcase.getCreateBy())
+ );
+ // 设置需求更新人
+ pmsProjectTestcaseDataVo.setUpdateBy(
+ PmsUtils.getSelectObjectInCache(
+ hashMap
+ , pmsCommonService::getNickNameByUsername
+ , pmsProjectTestcase.getUpdateBy())
+ );
+ }
// 设置产品需求
if (pmsProjectTestcase.getProductReqSpecsId() != null) {
pmsProjectTestcaseDataVo.setProductReqSpecs(
@@ -1277,8 +1279,18 @@ public class PmsProjectTestcaseServiceImpl implements IPmsProjectTestcaseService
break;
}
}
+ testcase.setIsImport(1L);
testcase.setTestcaseStepList(testcaseSteps);
+ if (testcase.getAssigneeGitlinkId() == null) {
+ // 未设置维护用户时默认为当前操作用户
+ testcase.setAssigneeGitlinkId(SecurityUtils.getGitlinkUserId());
+ }
+ if (testcase.getTypeId() == null) {
+ // 设置类型为默认值
+ PmsProjectTestcaseType defaultType = pmsProjectTestcaseTypeService.selectDefaultPmsProjectTestcaseType();
+ testcase.setTypeId(defaultType.getId());
+ }
testcase.setAssigneeGitlinkId(1L);
// 获取当前项目下测试用例的最大索引值
Long maxIndex = pmsProjectTestcaseMapper.selectPmsProjectTestcaseMaxIndexByProjectId(testcase.getPmsProjectId());
diff --git a/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProjectTestcaseMapper.xml b/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProjectTestcaseMapper.xml
index 2a1b4cc4d..a378e5a52 100644
--- a/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProjectTestcaseMapper.xml
+++ b/microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProjectTestcaseMapper.xml
@@ -25,7 +25,9 @@
+
+
@@ -131,7 +133,9 @@
test_method,
termination_conditions,
identifier,
+ test_tracking,
product_req_specs_id,
+ is_import,
#{title},
@@ -153,7 +157,9 @@
#{testMethod},
#{terminationConditions},
#{identifier},
+ #{test_tracking},
#{productReqSpecsId},
+ #{isImport},
@@ -179,7 +185,9 @@
test_method = #{testMethod},
termination_conditions = #{terminationConditions},
identifier = #{identifier},
- product_req_specs_id = #{productReqSpecsId},
+ #{testTracking},
+ #{productReqSpecsId},
+ #{isImport},
where id = #{id}