Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
xiaofang li
MeterSphere
Commits
c6972c46
Commit
c6972c46
authored
3 years ago
by
chenjianxing
Committed by
jianxing
3 years ago
Browse files
Options
Download
Email Patches
Plain Diff
fix: 用例导入无法显示责任人
parent
cff1e956
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
backend/src/main/java/io/metersphere/excel/domain/TestCaseExcelDataCn.java
+1
-1
...java/io/metersphere/excel/domain/TestCaseExcelDataCn.java
backend/src/main/java/io/metersphere/track/service/TestCaseService.java
+9
-10
...in/java/io/metersphere/track/service/TestCaseService.java
frontend/src/business/components/track/case/components/TestCaseList.vue
+13
-8
...usiness/components/track/case/components/TestCaseList.vue
with
23 additions
and
19 deletions
+23
-19
backend/src/main/java/io/metersphere/excel/domain/TestCaseExcelDataCn.java
+
1
-
1
View file @
c6972c46
...
...
@@ -35,7 +35,7 @@ public class TestCaseExcelDataCn extends TestCaseExcelData {
private
String
nodePath
;
@NotBlank
(
message
=
"{cannot_be_null}"
)
@ExcelProperty
(
"维护
人"
)
@ExcelProperty
(
value
=
"责任
人"
)
private
String
maintainer
;
@NotBlank
(
message
=
"{cannot_be_null}"
)
...
...
This diff is collapsed.
Click to expand it.
backend/src/main/java/io/metersphere/track/service/TestCaseService.java
+
9
-
10
View file @
c6972c46
...
...
@@ -16,6 +16,7 @@ import io.metersphere.commons.exception.MSException;
import
io.metersphere.commons.user.SessionUser
;
import
io.metersphere.commons.utils.*
;
import
io.metersphere.controller.request.OrderRequest
;
import
io.metersphere.controller.request.member.QueryMemberRequest
;
import
io.metersphere.excel.domain.ExcelErrData
;
import
io.metersphere.excel.domain.ExcelResponse
;
import
io.metersphere.excel.domain.TestCaseExcelData
;
...
...
@@ -32,6 +33,7 @@ import io.metersphere.log.vo.OperatingLogDetails;
import
io.metersphere.log.vo.track.TestCaseReference
;
import
io.metersphere.service.FileService
;
import
io.metersphere.service.ProjectService
;
import
io.metersphere.service.UserService
;
import
io.metersphere.track.dto.TestCaseCommentDTO
;
import
io.metersphere.track.dto.TestCaseDTO
;
import
io.metersphere.track.request.testcase.EditTestCaseRequest
;
...
...
@@ -74,7 +76,7 @@ public class TestCaseService {
ExtTestCaseMapper
extTestCaseMapper
;
@Resource
TestPlanMapper
testPlanMapper
;
UserService
userService
;
@Resource
TestPlanTestCaseMapper
testPlanTestCaseMapper
;
...
...
@@ -488,16 +490,13 @@ public class TestCaseService {
}
}
else
{
GroupExample
groupExample
=
new
GroupExample
();
groupExample
.
createCriteria
().
andTypeIn
(
Arrays
.
asList
(
UserGroupType
.
WORKSPACE
,
UserGroupType
.
PROJECT
));
List
<
Group
>
groups
=
groupMapper
.
selectByExample
(
groupExample
);
List
<
String
>
groupIds
=
groups
.
stream
().
map
(
Group:
:
getId
).
collect
(
Collectors
.
toList
());
UserGroupExample
userGroupExample
=
new
UserGroupExample
();
userGroupExample
.
createCriteria
()
.
andGroupIdIn
(
groupIds
)
.
andSourceIdEqualTo
(
currentWorkspaceId
);
Set
<
String
>
userIds
=
userGroupMapper
.
selectByExample
(
userGroupExample
).
stream
().
map
(
UserGroup:
:
getUserId
).
collect
(
Collectors
.
toSet
());
QueryMemberRequest
queryMemberRequest
=
new
QueryMemberRequest
();
queryMemberRequest
.
setProjectId
(
projectId
);
Set
<
String
>
userIds
=
userService
.
getProjectMemberList
(
queryMemberRequest
)
.
stream
()
.
map
(
User:
:
getId
)
.
collect
(
Collectors
.
toSet
());
try
{
//根据本地语言环境选择用哪种数据对象进行存放读取的数据
...
...
This diff is collapsed.
Click to expand it.
frontend/src/business/components/track/case/components/TestCaseList.vue
+
13
-
8
View file @
c6972c46
...
...
@@ -57,13 +57,6 @@
:label=
"$t('commons.create_user')"
min-width=
"120"
/>
<ms-table-column
prop=
"maintainer"
:field=
"item"
:fields-width=
"fieldsWidth"
:label=
"$t('custom_field.case_maintainer')"
min-width=
"120"
/>
<ms-table-column
prop=
"reviewStatus"
min-width=
"100px"
...
...
@@ -353,7 +346,19 @@ export default {
});
},
getCustomFieldValue
(
row
,
field
)
{
return
getCustomFieldValue
(
row
,
field
,
this
.
members
);
let
value
=
getCustomFieldValue
(
row
,
field
,
this
.
members
);
if
(
!
value
)
{
if
(
field
.
name
===
'
用例等级
'
)
{
return
row
.
priority
;
}
if
(
field
.
name
===
'
责任人
'
)
{
return
row
.
maintainer
;
}
if
(
field
.
name
===
'
用例状态
'
)
{
return
row
.
status
;
}
}
return
value
;
},
checkRedirectEditPage
(
redirectParam
)
{
if
(
redirectParam
!=
null
)
{
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help