Commit ab589590 by zhiwj

修改bug

parent 9e679d0c
......@@ -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;
}
}
......@@ -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;
}
}
......@@ -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.setQuickReplyTagList(EntityUtil.changeEntityListByJSON(EvaluateTagsDTO.class, replyTagsList));
replyDTO.setQuickReplyTagNameList(Optional.ofNullable(replyTagsList).orElse(Collections.emptyList()).stream().map(TabEvaluateTags::getTagName).collect(Collectors.toList()));
}
evaluateDTO.setReplyList(replyDTOList);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment