Merge remote-tracking branch 'origin/feature/hotfix_shangbao' into feature/hotfix_shangbao

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java

@@ -141,6 +141,11 @@ public class ItemDetailResultDTO implements Serializable {
      */
     private String firstCategoryCode;
 
+    /**
+     * 满意度评价状态(0-不可评价，1-可评价)
+     */
+    private String evaluationState;
+
     /**
      * 满意度评价得分(0-不满意，1-基本满意，2-非常满意)
      */

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -859,6 +859,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 return new Result().error(CheckDataUtils.violations_code, CheckDataUtils.violations_message);
             }
 
+            // 诉求评价
             ItemEntity itemEntity = new ItemEntity();
             itemEntity.setId(evaluationFormDTO.getItemId());
             itemEntity.setEvaluationScore(evaluationFormDTO.getEvaluationScore());
@@ -866,7 +867,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             itemEntity.setEvaluationTime(new Date());
             baseDao.updateById(itemEntity);
 
-            //接口异常，保存至待审核信息
+            //内容审核接口异常，保存至待审核信息
             if (contentResult == null && !isConReview) {
                 SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(),
                         evaluationFormDTO.getUserName(), CheckDataUtils.cate_two, null, ModuleName.ITEM_SATISFACTION.getCode(), textList,
@@ -876,7 +877,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
 
             //判断是否为待审核
             if (contentResult != null) {
-                CheckResultMessageDTO twoTypes = null;
+                CheckResultMessageDTO twoTypes;
                 if (isConReview) {
                     twoTypes = CheckDataUtils.saveTwoTypes(contentResult, null);
                 } else {
@@ -890,7 +891,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                     contentSecurityFeign.insertRecords(record);
                 }
             }
-            //诉求评价
+            //诉求评价推送市中心
             pushToCityGridService.evaluation(evaluationFormDTO.getItemId());
             return new Result();
         } else {

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

@@ -422,6 +422,7 @@
             IFNULL(item.item_voice,iii.IMG_URL) as VOICE,
             IF(item.DURATION=0,iii.DURATION,item.DURATION) as DURATION,
             item.ITEM_STATE,
+            item.EVALUATION_STATE,
             item.CREATED_TIME,
             item.IS_PARTY_MEMBER,
             item.NICK_NAME,