diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java index 541da97d0..073c37085 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java @@ -130,4 +130,14 @@ public class ItemDetailResultDTO implements Serializable { * 一级分类编码 */ private String firstCategoryCode; + + /** + * 满意度评价得分(0-不满意,1-基本满意,2-非常满意) + */ + private Integer evaluationScore; + + /** + * 满意度评价内容 + */ + private String evaluationContent; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index f57e3a86a..dce9ceaa8 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -314,7 +314,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem @Override public Result evaluation(EvaluationFormDTO evaluationFormDTO) { ItemEntity itemEntityResult = baseDao.selectById(evaluationFormDTO.getItemId()); - if (itemEntityResult.getUserId().equals(evaluationFormDTO.getUserId()) && itemEntityResult.getEvaluationScore() == null) { + if (itemEntityResult.getUserId().equals(evaluationFormDTO.getUserId())) { //内容审核 Boolean isConReview = evaluationFormDTO.getIsConReview(); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index e47ff5b85..d792d41ec 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -277,6 +277,8 @@ + + @@ -311,6 +313,8 @@ (ua.attitude_flag = 1) userDislike, item.ID, + item.EVALUATION_SCORE, + item.EVALUATION_CONTENT, item.EVENT_ID, item.ISSUE_ID, item.ITEM_CONTENT, @@ -336,7 +340,7 @@ true ELSE false END AS isSatisfactionEvaluation, CASE - WHEN item.USER_ID = #{userId} AND item.EVALUATION_SCORE IS NULL THEN + WHEN item.USER_ID = #{userId} THEN true ELSE false END AS isShowSatisfactionEvaluation, img.IMG_URL