From a13ac790840f34b7a8132f611cb25d791fa8b385 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Wed, 16 Jun 2021 14:22:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E5=B1=85=E6=B0=91=E7=AB=AF?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F-=E6=BB=A1=E6=84=8F=E5=BA=A6?= =?UTF-8?q?=E8=AF=84=E4=BB=B7=E6=94=B9=E4=B8=BA=E4=B8=80=E7=9B=B4=E8=83=BD?= =?UTF-8?q?=E8=AF=84=E4=BB=B7=E3=80=91-=E7=8E=8B=E5=85=AC=E5=B3=B0-2021-06?= =?UTF-8?q?-16?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/modules/item/service/impl/ItemServiceImpl.java | 2 +- .../src/main/resources/mapper/item/ItemDao.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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..af0f8e9f1 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 @@ -336,7 +336,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 From 0123879eccb0961f4e92c2f65529dd5f287a2868 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Wed, 16 Jun 2021 15:11:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E5=B1=85=E6=B0=91=E7=AB=AF?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F-=E6=BB=A1=E6=84=8F=E5=BA=A6?= =?UTF-8?q?=E8=AF=84=E4=BB=B7=E7=AC=AC=E4=BA=8C=E6=AC=A1=E8=AF=84=E4=BB=B7?= =?UTF-8?q?=E5=A4=8D=E6=98=BE=E6=95=B0=E6=8D=AE=E3=80=91-=E7=8E=8B?= =?UTF-8?q?=E5=85=AC=E5=B3=B0-2021-06-16?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/dto/item/result/ItemDetailResultDTO.java | 10 ++++++++++ .../src/main/resources/mapper/item/ItemDao.xml | 4 ++++ 2 files changed, 14 insertions(+) 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/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index af0f8e9f1..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,