Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-evaluate
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
base_platform_enterprise
gic-evaluate
Commits
ab589590
Commit
ab589590
authored
May 12, 2020
by
zhiwj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
9e679d0c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
2 deletions
+21
-2
EvaluateDTO.java
...e-api/src/main/java/com/gic/evaluate/dto/EvaluateDTO.java
+9
-0
EvaluateReplyDTO.java
.../src/main/java/com/gic/evaluate/dto/EvaluateReplyDTO.java
+9
-0
EvaluateOutApiServiceImpl.java
...valuate/service/outer/impl/EvaluateOutApiServiceImpl.java
+3
-2
No files found.
gic-evaluate-api/src/main/java/com/gic/evaluate/dto/EvaluateDTO.java
View file @
ab589590
...
...
@@ -213,6 +213,7 @@ public class EvaluateDTO implements Serializable {
private
Double
orderMount
;
private
double
avgScore
;
private
List
<
EvaluateTagsDTO
>
quickReplyTagList
;
private
List
<
String
>
quickReplyTagNameList
;
public
Integer
getEvaluateId
()
{
return
evaluateId
;
...
...
@@ -601,5 +602,13 @@ public class EvaluateDTO implements Serializable {
public
List
<
EvaluateTagsDTO
>
getQuickReplyTagList
()
{
return
quickReplyTagList
;
}
public
List
<
String
>
getQuickReplyTagNameList
()
{
return
quickReplyTagNameList
;
}
public
void
setQuickReplyTagNameList
(
List
<
String
>
quickReplyTagNameList
)
{
this
.
quickReplyTagNameList
=
quickReplyTagNameList
;
}
}
gic-evaluate-api/src/main/java/com/gic/evaluate/dto/EvaluateReplyDTO.java
View file @
ab589590
...
...
@@ -69,6 +69,7 @@ public class EvaluateReplyDTO implements Serializable {
private
String
userName
;
private
List
<
String
>
imgList
;
private
List
<
EvaluateTagsDTO
>
quickReplyTagList
;
private
List
<
String
>
quickReplyTagNameList
;
public
Integer
getEvaluateReplyId
()
{
return
evaluateReplyId
;
...
...
@@ -181,4 +182,12 @@ public class EvaluateReplyDTO implements Serializable {
public
List
<
EvaluateTagsDTO
>
getQuickReplyTagList
()
{
return
quickReplyTagList
;
}
public
List
<
String
>
getQuickReplyTagNameList
()
{
return
quickReplyTagNameList
;
}
public
void
setQuickReplyTagNameList
(
List
<
String
>
quickReplyTagNameList
)
{
this
.
quickReplyTagNameList
=
quickReplyTagNameList
;
}
}
gic-evaluate-service/src/main/java/com/gic/evaluate/service/outer/impl/EvaluateOutApiServiceImpl.java
View file @
ab589590
...
...
@@ -297,7 +297,8 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
List
<
TabEvaluateTags
>
tagsList
=
evaluateTagsService
.
listEvaluateTags
(
evaluateDTO
.
getEnterpriseId
(),
evaluateDTO
.
getEvaluateId
());
evaluateDTO
.
setQuickReplyTagList
(
EntityUtil
.
changeEntityListByJSON
(
EvaluateTagsDTO
.
class
,
tagsList
));
evaluateDTO
.
setQuickReplyTagNameList
(
Optional
.
ofNullable
(
tagsList
).
orElse
(
Collections
.
emptyList
()).
stream
().
map
(
TabEvaluateTags:
:
getTagName
).
collect
(
Collectors
.
toList
()));
// 追评和回复的图片
for
(
EvaluateReplyDTO
replyDTO
:
replyDTOList
)
{
List
<
TabEvaluateImg
>
evaluateReplyImgList
=
evaluateImgService
.
listImageByEvaluateReplyId
(
replyDTO
.
getEvaluateReplyId
());
...
...
@@ -305,7 +306,7 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
replyDTO
.
setImgList
(
replyImgList
);
List
<
TabEvaluateTags
>
replyTagsList
=
evaluateTagsService
.
listEvaluateTags
(
replyDTO
.
getEnterpriseId
(),
replyDTO
.
getEvaluateId
(),
replyDTO
.
getEvaluateReplyId
());
replyDTO
.
setQuickReplyTag
List
(
EntityUtil
.
changeEntityListByJSON
(
EvaluateTagsDTO
.
class
,
replyTagsList
));
replyDTO
.
setQuickReplyTag
NameList
(
Optional
.
ofNullable
(
replyTagsList
).
orElse
(
Collections
.
emptyList
()).
stream
().
map
(
TabEvaluateTags:
:
getTagName
).
collect
(
Collectors
.
toList
()
));
}
evaluateDTO
.
setReplyList
(
replyDTOList
);
...
...
Write
Preview
Markdown
is supported
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