最新评价

gic-evaluate-api/src/main/java/com/gic/evaluate/constant/ComputeEnum.java

@@ -43,4 +43,4 @@ public enum ComputeEnum {
         }
         return null;
     }
-}
+}
\ No newline at end of file

gic-evaluate-api/src/main/java/com/gic/evaluate/constant/QuickReplyTypeEnum.java

+package com.gic.evaluate.constant;
+
+/**
+ * @author zhiwj
+ * @Description:
+ * @date 2019-12-31 17:20
+ */
+public enum QuickReplyTypeEnum {
+    // 差评
+    BAD(1),
+    // 好评
+    GOOD(2),
+    // 后台管理
+    MANAGE(3)
+    ;
+    private Integer code;
+
+    QuickReplyTypeEnum(Integer code) {
+        this.code = code;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+}

gic-evaluate-api/src/main/java/com/gic/evaluate/service/EvaluateOverviewApiService.java

@@ -57,7 +57,7 @@ public interface EvaluateOverviewApiService {
      * @param endTime
      * @return
      */
-    ServiceResponse<Void> chart4(Integer enterpriseId, String startTime, String endTime);
+    ServiceResponse<Map<String, List<Map<String, Object>>>> chart4(Integer enterpriseId, String startTime, String endTime);
 
     /**
      * 查询门店评分

gic-evaluate-service/src/main/java/com/gic/evaluate/dao/mapper/TabEvaluateMapper.java

@@ -84,4 +84,6 @@ public interface TabEvaluateMapper {
     List<Map<String, Object>> listTrend(StoreTrendQO storeTrendQO);
 
     TabEvaluate getEvaluateByOrderNumber(@Param("enterpriseId") Integer enterpriseId, @Param("orderNumber") String orderNumber);
+
+    List<Map<String, Object>> evaluateQuickChart(@Param("enterpriseId") Integer enterpriseId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("tagType") Integer tagType);
 }
\ No newline at end of file

gic-evaluate-service/src/main/java/com/gic/evaluate/service/EvaluateService.java

@@ -50,4 +50,8 @@ public interface EvaluateService {
     TabEvaluate getEvaluateByOrderNumber(Integer enterpriseId, String orderNumber);
 
     void updateEvaluate(EvaluateDTO evaluateDTO);
+
+    List<Map<String, Object>> evaluateGoodQuickChart(Integer enterpriseId, String startTime, String endTime);
+
+    List<Map<String, Object>> evaluateBadQuickChart(Integer enterpriseId, String startTime, String endTime);
 }

gic-evaluate-service/src/main/java/com/gic/evaluate/service/impl/EvaluateServiceImpl.java

@@ -3,6 +3,7 @@ package com.gic.evaluate.service.impl;
 import com.gic.commons.util.EntityUtil;
 import com.gic.enterprise.constants.Constants;
 import com.gic.evaluate.constant.ComputeEnum;
+import com.gic.evaluate.constant.QuickReplyTypeEnum;
 import com.gic.evaluate.dao.mapper.TabEvaluateMapper;
 import com.gic.evaluate.dto.EvaluateDTO;
 import com.gic.evaluate.entity.TabEvaluate;
@@ -135,4 +136,14 @@ public class EvaluateServiceImpl implements EvaluateService {
         TabEvaluate evaluate = EntityUtil.changeEntityByJSON(TabEvaluate.class, evaluateDTO);
         tabEvaluateMapper.updateByPrimaryKeySelective(evaluate);
     }
+
+    @Override
+    public List<Map<String, Object>> evaluateGoodQuickChart(Integer enterpriseId, String startTime, String endTime) {
+        return tabEvaluateMapper.evaluateQuickChart(enterpriseId, startTime, endTime, QuickReplyTypeEnum.GOOD.getCode());
+    }
+
+    @Override
+    public List<Map<String, Object>> evaluateBadQuickChart(Integer enterpriseId, String startTime, String endTime) {
+        return tabEvaluateMapper.evaluateQuickChart(enterpriseId, startTime, endTime, QuickReplyTypeEnum.BAD.getCode());
+    }
 }

gic-evaluate-service/src/main/java/com/gic/evaluate/service/outer/impl/EvaluateOverviewApiServiceImpl.java

@@ -58,12 +58,13 @@ public class EvaluateOverviewApiServiceImpl implements EvaluateOverviewApiServic
     }
 
     @Override
-    public ServiceResponse<Void> chart4(Integer enterpriseId, String startTime, String endTime) {
-//        List<Map<String, Object>> goodChart = this.evaluateService.evaluateGoodQuickChart(enterpriseId, startTime, endTime);
-//        List<Map<String, Object>> badChart = this.evaluateService.evaluateBadQuickChart(enterpriseId, startTime, endTime);
-//        List<Map<String, Object>> goodChart = this.evaluateService.evaluateGoodQuickChart(enterpriseId, startTime, endTime);
-//
-        return null;
+    public ServiceResponse<Map<String, List<Map<String, Object>>>> chart4(Integer enterpriseId, String startTime, String endTime) {
+        List<Map<String, Object>> goodChart = this.evaluateService.evaluateGoodQuickChart(enterpriseId, startTime, endTime);
+        List<Map<String, Object>> badChart = this.evaluateService.evaluateBadQuickChart(enterpriseId, startTime, endTime);
+        Map<String, List<Map<String, Object>>> map = new HashMap<>();
+        map.put("goodChart", goodChart);
+        map.put("badChart", badChart);
+        return EnterpriseServiceResponse.success(map);
     }
 
     @Override

gic-evaluate-service/src/main/resources/mapper/TabEvaluateMapper.xml

@@ -714,4 +714,24 @@
   and status = 1
   limit 1
   </select>
+  <select id="evaluateQuickChart" resultType="map">
+    SELECT
+	t1.tag_name tagName,
+      (
+      SELECT count( * ) FROM tab_evaluate t2 WHERE t2.evaluate_content = t1.tag_name
+        <if test="tagType != null ">
+            and tag_type = #{tagType}
+        </if>
+        <if test="startTime != null ">
+            and evaluate_time &gt;= #{startTime}
+        </if>
+        <if test="endTime != null ">
+            and evaluate_time &lt;= #{endTime}
+        </if>
+       ) tagCount
+  FROM
+      tab_evaluate_quick t1
+  WHERE
+      enterprise_id = #{enterpriseId}
+  </select>
 </mapper>
\ No newline at end of file

gic-evaluate-web/src/main/java/com/gic/evaluate/web/vo/BadTagConfigVO.java

@@ -15,6 +15,10 @@ public class BadTagConfigVO implements Serializable {
 
     public interface BadTagConfigValid{}
     /**
+     *
+     */
+    private Integer evaluateOrderConfigId;
+    /**
      * 恶意评价标记功能
      */
     @Min(value = 0, message = "参数错误", groups = BadTagConfigValid.class)
@@ -30,6 +34,14 @@ public class BadTagConfigVO implements Serializable {
 
     private Integer enterpriseId;
 
+    public Integer getEvaluateOrderConfigId() {
+        return evaluateOrderConfigId;
+    }
+
+    public void setEvaluateOrderConfigId(Integer evaluateOrderConfigId) {
+        this.evaluateOrderConfigId = evaluateOrderConfigId;
+    }
+
     public Integer getBadEvaluateTag() {
         return badEvaluateTag;
     }