添加快捷评价

gic-evaluate-api/src/main/java/com/gic/evaluate/dto/EvaluateDTO.java

@@ -202,6 +202,8 @@ public class EvaluateDTO implements Serializable {
      */
     private Date updateTime;
 
+    private String quickIds;
+
     private List<EvaluateReplyDTO> replyList;
     private boolean hasTopHot;
     private String replyTime;
@@ -582,5 +584,13 @@ public class EvaluateDTO implements Serializable {
     public double getAvgScore() {
         return avgScore;
     }
+
+    public String getQuickIds() {
+        return quickIds;
+    }
+
+    public void setQuickIds(String quickIds) {
+        this.quickIds = quickIds;
+    }
 }
 

gic-evaluate-api/src/main/java/com/gic/evaluate/dto/EvaluateOrderConfigDTO.java

@@ -139,6 +139,9 @@ public class EvaluateOrderConfigDTO implements Serializable {
      * 后台快捷评语
      */
     private List<String> replyQuick;
+    private List<EvaluateQuickDTO> badEvaluateQuickDTOList;
+    private List<EvaluateQuickDTO> goodEvaluateQuickDTOList;
+    private List<EvaluateQuickDTO> replyQuickDTOList;
 
     public Integer getEvaluateOrderConfigId() {
         return evaluateOrderConfigId;
@@ -356,4 +359,27 @@ public class EvaluateOrderConfigDTO implements Serializable {
         this.badSuggestionTagType = badSuggestionTagType;
     }
 
+    public void setBadEvaluateQuickDTOList(List<EvaluateQuickDTO> badEvaluateQuickDTOList) {
+        this.badEvaluateQuickDTOList = badEvaluateQuickDTOList;
+    }
+
+    public List<EvaluateQuickDTO> getBadEvaluateQuickDTOList() {
+        return badEvaluateQuickDTOList;
+    }
+
+    public void setGoodEvaluateQuickDTOList(List<EvaluateQuickDTO> goodEvaluateQuickDTOList) {
+        this.goodEvaluateQuickDTOList = goodEvaluateQuickDTOList;
+    }
+
+    public List<EvaluateQuickDTO> getGoodEvaluateQuickDTOList() {
+        return goodEvaluateQuickDTOList;
+    }
+
+    public void setReplyQuickDTOList(List<EvaluateQuickDTO> replyQuickDTOList) {
+        this.replyQuickDTOList = replyQuickDTOList;
+    }
+
+    public List<EvaluateQuickDTO> getReplyQuickDTOList() {
+        return replyQuickDTOList;
+    }
 }

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

@@ -90,7 +90,7 @@ public interface TabEvaluateMapper {
 
     TabEvaluate getEvaluateByOrderId(@Param("enterpriseId") Integer enterpriseId, @Param("orderId") Long orderId);
 
-    List<Map<String, Object>> evaluateQuickChart(@Param("enterpriseId") Integer enterpriseId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("tagType") Integer tagType, @Param("ids") List<Integer> storeIdList);
+//    List<Map<String, Object>> evaluateQuickChart(@Param("enterpriseId") Integer enterpriseId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("tagType") Integer tagType, @Param("ids") List<Integer> storeIdList);
 
     @MapKey("statisticsDate")
     Map<String, Map<String, Object>> listEvaluateTrendByYear(@Param("enterpriseId") Integer enterpriseId, @Param("replyType") Integer replyType);

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

@@ -4,6 +4,7 @@ import com.gic.evaluate.entity.TabEvaluateQuick;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 public interface TabEvaluateQuickMapper {
     /**
@@ -36,7 +37,7 @@ public interface TabEvaluateQuickMapper {
      * @param evaluateQuickId 主键
      * @return 实体对象
      */
-    TabEvaluateQuick selectByPrimaryKey(String evaluateQuickId);
+    TabEvaluateQuick selectByPrimaryKey(Integer evaluateQuickId);
 
     /**
      * 根据主键动态更新记录
@@ -61,4 +62,6 @@ public interface TabEvaluateQuickMapper {
     void updateStatusByEvaluateQuicks(@Param("enterpriseId") Integer enterpriseId, @Param("evaluateQuick") List<String> evaluateQuick, @Param("quickReplyType") Integer quickReplyType);
 
     List<TabEvaluateQuick> listEvaluateQuick(@Param("enterpriseId") Integer enterpriseId, @Param("quickReplyType") Integer quickReplyType);
+
+    List<Map<String, Object>> evaluateQuickChart(@Param("enterpriseId") Integer enterpriseId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("tagType") Integer tagType, @Param("ids") List<Integer> storeIdList);
 }
\ No newline at end of file

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

+package com.gic.evaluate.dao.mapper;
+
+import com.gic.evaluate.entity.TabEvaluateTags;
+
+public interface TabEvaluateTagsMapper {
+    /**
+     * 根据主键删除
+     *
+     * @param evaluateTagsId 主键
+     * @return 更新条目数
+     */
+    int deleteByPrimaryKey(Integer evaluateTagsId);
+
+    /**
+     * 插入一条记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int insert(TabEvaluateTags record);
+
+    /**
+     * 动态插入一条记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int insertSelective(TabEvaluateTags record);
+
+    /**
+     * 根据主键查询
+     *
+     * @param evaluateTagsId 主键
+     * @return 实体对象
+     */
+    TabEvaluateTags selectByPrimaryKey(Integer evaluateTagsId);
+
+    /**
+     * 根据主键动态更新记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int updateByPrimaryKeySelective(TabEvaluateTags record);
+
+    /**
+     * 根据主键更新记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int updateByPrimaryKey(TabEvaluateTags record);
+}
\ No newline at end of file

gic-evaluate-service/src/main/java/com/gic/evaluate/entity/TabEvaluateTags.java

+package com.gic.evaluate.entity;
+
+import java.util.Date;
+
+/**
+ * tab_evaluate_tags
+ */
+public class TabEvaluateTags {
+    /**
+     * 评价快捷标签统计表ID
+     */
+    private Integer evaluateTagsId;
+
+    /**
+     * 评价ID
+     */
+    private Integer evaluateId;
+
+    /**
+     * 会员ID
+     */
+    private Long memberId;
+
+    /**
+     * 标签类型 1:负面评价  2：正面评价  3：后台回复
+     */
+    private Integer tagType;
+
+    /**
+     * 评价快捷标签
+     */
+    private String tagName;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 企业ID
+     */
+    private Integer enterpriseId;
+
+    /**
+     * 状态（0：无效，1：有效）
+     */
+    private Integer status;
+
+    public Integer getEvaluateTagsId() {
+        return evaluateTagsId;
+    }
+
+    public void setEvaluateTagsId(Integer evaluateTagsId) {
+        this.evaluateTagsId = evaluateTagsId;
+    }
+
+    public Integer getEvaluateId() {
+        return evaluateId;
+    }
+
+    public void setEvaluateId(Integer evaluateId) {
+        this.evaluateId = evaluateId;
+    }
+
+    public Long getMemberId() {
+        return memberId;
+    }
+
+    public void setMemberId(Long memberId) {
+        this.memberId = memberId;
+    }
+
+    public Integer getTagType() {
+        return tagType;
+    }
+
+    public void setTagType(Integer tagType) {
+        this.tagType = tagType;
+    }
+
+    public String getTagName() {
+        return tagName;
+    }
+
+    public void setTagName(String tagName) {
+        this.tagName = tagName;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+}
\ No newline at end of file

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

@@ -3,6 +3,7 @@ package com.gic.evaluate.service;
 import com.gic.evaluate.entity.TabEvaluateQuick;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  *
@@ -15,4 +16,10 @@ public interface EvaluateQuickService {
     void saveEvaluateQuick(Integer enterpriseId, List<String> evaluateQuick, Integer quickReplyType);
 
     List<TabEvaluateQuick> listEvaluateQuick(Integer enterpriseId, Integer quickReplyType);
+
+    TabEvaluateQuick getById(Integer quickTagsId);
+
+    List<Map<String, Object>> evaluateGoodQuickChart(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
+
+    List<Map<String, Object>> evaluateBadQuickChart(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
 }

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

@@ -57,9 +57,9 @@ public interface EvaluateService {
 
     void updateEvaluate(EvaluateDTO evaluateDTO);
 
-    List<Map<String, Object>> evaluateGoodQuickChart(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
+//    List<Map<String, Object>> evaluateGoodQuickChart(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
 
-    List<Map<String, Object>> evaluateBadQuickChart(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
+//    List<Map<String, Object>> evaluateBadQuickChart(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
 
     List<Map<String, Object>> listEvaluateTrendByYear(Integer enterpriseId, Integer replyType);
 

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

+package com.gic.evaluate.service;
+
+/**
+ * @author zhiwj
+ * @Description:
+ * @date 2020-02-28 13:52
+ */
+public interface EvaluateTagsService {
+    void saveQuick(Integer quickTagsId, Integer enterpriseId, Integer evaluateId, Long memberId);
+}

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

 package com.gic.evaluate.service.impl;
 
 import com.gic.enterprise.constants.Constants;
+import com.gic.evaluate.constant.QuickReplyTypeEnum;
 import com.gic.evaluate.dao.mapper.TabEvaluateQuickMapper;
 import com.gic.evaluate.entity.TabEvaluateQuick;
 import com.gic.evaluate.service.EvaluateQuickService;
@@ -10,6 +11,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  *
@@ -48,4 +50,19 @@ public class EvaluateQuickServiceImpl implements EvaluateQuickService {
     public List<TabEvaluateQuick> listEvaluateQuick(Integer enterpriseId, Integer quickReplyType) {
         return tabEvaluateQuickMapper.listEvaluateQuick(enterpriseId, quickReplyType);
     }
+
+    @Override
+    public TabEvaluateQuick getById(Integer quickTagsId) {
+        return tabEvaluateQuickMapper.selectByPrimaryKey(quickTagsId);
+    }
+
+    @Override
+    public List<Map<String, Object>> evaluateGoodQuickChart(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList) {
+        return tabEvaluateQuickMapper.evaluateQuickChart(enterpriseId, startTime, endTime, QuickReplyTypeEnum.GOOD.getCode(), storeIdList);
+    }
+
+    @Override
+    public List<Map<String, Object>> evaluateBadQuickChart(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList) {
+        return tabEvaluateQuickMapper.evaluateQuickChart(enterpriseId, startTime, endTime, QuickReplyTypeEnum.BAD.getCode(), storeIdList);
+    }
 }

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

@@ -4,7 +4,6 @@ import com.gic.commons.util.DateUtil;
 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;
@@ -171,15 +170,15 @@ public class EvaluateServiceImpl implements EvaluateService {
         tabEvaluateMapper.updateByPrimaryKeySelective(evaluate);
     }
 
-    @Override
-    public List<Map<String, Object>> evaluateGoodQuickChart(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList) {
-        return tabEvaluateMapper.evaluateQuickChart(enterpriseId, startTime, endTime, QuickReplyTypeEnum.GOOD.getCode(), storeIdList);
-    }
-
-    @Override
-    public List<Map<String, Object>> evaluateBadQuickChart(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList) {
-        return tabEvaluateMapper.evaluateQuickChart(enterpriseId, startTime, endTime, QuickReplyTypeEnum.BAD.getCode(), storeIdList);
-    }
+//    @Override
+//    public List<Map<String, Object>> evaluateGoodQuickChart(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList) {
+//        return tabEvaluateMapper.evaluateQuickChart(enterpriseId, startTime, endTime, QuickReplyTypeEnum.GOOD.getCode(), storeIdList);
+//    }
+//
+//    @Override
+//    public List<Map<String, Object>> evaluateBadQuickChart(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList) {
+//        return tabEvaluateMapper.evaluateQuickChart(enterpriseId, startTime, endTime, QuickReplyTypeEnum.BAD.getCode(), storeIdList);
+//    }
 
     @Override
     public List<Map<String, Object>> listEvaluateTrendByYear(Integer enterpriseId, Integer replyType) {

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

+package com.gic.evaluate.service.impl;
+
+import com.gic.evaluate.constant.Constants;
+import com.gic.evaluate.dao.mapper.TabEvaluateTagsMapper;
+import com.gic.evaluate.entity.TabEvaluateQuick;
+import com.gic.evaluate.entity.TabEvaluateTags;
+import com.gic.evaluate.service.EvaluateQuickService;
+import com.gic.evaluate.service.EvaluateTagsService;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+/**
+ * @author zhiwj
+ * @Description:
+ * @date 2020-02-28 17:35
+ */
+@Service
+public class EvaluateTagsServiceImpl implements EvaluateTagsService {
+
+    private Logger logger = LogManager.getLogger(EvaluateTagsServiceImpl.class);
+
+    @Autowired
+    private TabEvaluateTagsMapper tabEvaluateTagsMapper;
+    @Autowired
+    private EvaluateQuickService evaluateQuickService;
+
+    @Override
+    public void saveQuick(Integer quickTagsId, Integer enterpriseId, Integer evaluateId, Long memberId) {
+        TabEvaluateQuick evaluateQuick = evaluateQuickService.getById(quickTagsId);
+        if (evaluateQuick != null) {
+            TabEvaluateTags tabEvaluateTags = new TabEvaluateTags();
+            tabEvaluateTags.setEvaluateId(evaluateId);
+            tabEvaluateTags.setMemberId(memberId);
+            tabEvaluateTags.setTagType(evaluateQuick.getTagType());
+            tabEvaluateTags.setTagName(evaluateQuick.getTagName());
+            tabEvaluateTags.setCreateTime(new Date());
+            tabEvaluateTags.setUpdateTime(new Date());
+            tabEvaluateTags.setEnterpriseId(enterpriseId);
+            tabEvaluateTags.setStatus(Constants.OPEN);
+            tabEvaluateTagsMapper.insertSelective(tabEvaluateTags);
+        } else {
+            logger.info("该快评不存在:{}, evaluateId:{}", quickTagsId, evaluateId);
+        }
+    }
+}

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

@@ -6,6 +6,7 @@ import com.gic.enterprise.response.EnterpriseServiceResponse;
 import com.gic.evaluate.constant.QuickReplyTypeEnum;
 import com.gic.evaluate.dto.BadEvaluateConfigDTO;
 import com.gic.evaluate.dto.EvaluateOrderConfigDTO;
+import com.gic.evaluate.dto.EvaluateQuickDTO;
 import com.gic.evaluate.entity.TabBadEvaluateConfig;
 import com.gic.evaluate.entity.TabEvaluateOrderConfig;
 import com.gic.evaluate.entity.TabEvaluateQuick;
@@ -18,10 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Collections;
 import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
 
 /**
  *
@@ -84,13 +82,13 @@ public class EvaluateConfigApiServiceImpl implements EvaluateConfigApiService {
         List<TabEvaluateQuick> goodEvaluateQuickList = evaluateQuickService.listEvaluateQuick(enterpriseId, QuickReplyTypeEnum.GOOD.getCode());
         List<TabEvaluateQuick> manageEvaluateQuickList = evaluateQuickService.listEvaluateQuick(enterpriseId, QuickReplyTypeEnum.MANAGE.getCode());
 
-        List<String> badEvaluateQuick = Optional.ofNullable(badEvaluateQuickList).orElse(Collections.emptyList()).stream().map(TabEvaluateQuick::getTagName).collect(Collectors.toList());
-        List<String> goodEvaluateQuick = Optional.ofNullable(goodEvaluateQuickList).orElse(Collections.emptyList()).stream().map(TabEvaluateQuick::getTagName).collect(Collectors.toList());
-        List<String> manageEvaluateQuick = Optional.ofNullable(manageEvaluateQuickList).orElse(Collections.emptyList()).stream().map(TabEvaluateQuick::getTagName).collect(Collectors.toList());
+//        List<String> badEvaluateQuick = Optional.ofNullable(badEvaluateQuickList).orElse(Collections.emptyList()).stream().map(TabEvaluateQuick::getTagName).collect(Collectors.toList());
+//        List<String> goodEvaluateQuick = Optional.ofNullable(goodEvaluateQuickList).orElse(Collections.emptyList()).stream().map(TabEvaluateQuick::getTagName).collect(Collectors.toList());
+//        List<String> manageEvaluateQuick = Optional.ofNullable(manageEvaluateQuickList).orElse(Collections.emptyList()).stream().map(TabEvaluateQuick::getTagName).collect(Collectors.toList());
 
-        evaluateOrderConfigDTO.setBadEvaluateQuick(badEvaluateQuick);
-        evaluateOrderConfigDTO.setGoodEvaluateQuick(goodEvaluateQuick);
-        evaluateOrderConfigDTO.setReplyQuick(manageEvaluateQuick);
+        evaluateOrderConfigDTO.setBadEvaluateQuickDTOList(EntityUtil.changeEntityListByJSON(EvaluateQuickDTO.class, badEvaluateQuickList));
+        evaluateOrderConfigDTO.setGoodEvaluateQuickDTOList(EntityUtil.changeEntityListByJSON(EvaluateQuickDTO.class, goodEvaluateQuickList));
+        evaluateOrderConfigDTO.setReplyQuickDTOList(EntityUtil.changeEntityListByJSON(EvaluateQuickDTO.class, manageEvaluateQuickList));
 
         return EnterpriseServiceResponse.success(evaluateOrderConfigDTO);
     }
@@ -100,4 +98,4 @@ public class EvaluateConfigApiServiceImpl implements EvaluateConfigApiService {
         TabBadEvaluateConfig badEvaluateConfig = badEvaluateConfigService.getBadEvaluateConfig(enterpriseId);
         return EnterpriseServiceResponse.success(EntityUtil.changeEntityByJSON(BadEvaluateConfigDTO.class, badEvaluateConfig));
     }
-}
+}
\ No newline at end of file

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

@@ -5,6 +5,7 @@ import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.util.DateUtil;
 import com.gic.commons.util.EntityUtil;
+import com.gic.commons.util.GlobalInfo;
 import com.gic.commons.util.PageHelperUtils;
 import com.gic.enterprise.error.ErrorCode;
 import com.gic.enterprise.response.EnterpriseServiceResponse;
@@ -29,6 +30,7 @@ import com.gic.order.api.service.OrderApiService;
 import com.gic.store.dto.StoreDTO;
 import com.gic.store.service.StoreApiService;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -69,6 +71,8 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
     private StoreApiService storeApiService;
     @Autowired
     private EvaluateMsgLogService evaluateMsgLogService;
+    @Autowired
+    private EvaluateTagsService evaluateTagsService;
 //    @Autowired
 //    private NoticeRouterApiService noticeRouterApiService;
 
@@ -165,10 +169,21 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
 
         }
 
+        // 记录快评
+        saveQuick(evaluateDTO.getQuickIds(), evaluateDTO.getEnterpriseId(), evaluateId, evaluateDTO.getMemberId());
 
         return EnterpriseServiceResponse.success();
     }
 
+    private void saveQuick(String tagIds, Integer enterpriseId, Integer evaluateId, Long memberId) {
+        if (StringUtils.isNotBlank(tagIds)) {
+            String[] tagIdArr = tagIds.split(GlobalInfo.FLAG_COMMA);
+            for (String tagId : tagIdArr) {
+                evaluateTagsService.saveQuick(Integer.valueOf(tagId), enterpriseId, evaluateId, memberId);
+            }
+        }
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ServiceResponse<Void> saveReply(MemberReplyDTO memberReplyDTO) {
@@ -226,6 +241,8 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
         //        void saveList(Integer enterpriseId, Integer evaluateId, Integer evaluateReplyId, List<String> imgUrlList);
         evaluateImgService.saveList(memberReplyDTO.getEnterpriseId(), memberReplyDTO.getEvaluateId(), evaluateRelayId, memberReplyDTO.getImgList());
 
+        saveQuick(evaluateDTO.getQuickIds(), evaluateDTO.getEnterpriseId(), evaluateDTO.getEvaluateId(), evaluateDTO.getMemberId());
+
         return EnterpriseServiceResponse.success();
     }
 

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

@@ -11,6 +11,7 @@ import com.gic.evaluate.qo.StoreScoreQO;
 import com.gic.evaluate.qo.StoreTrendQO;
 import com.gic.evaluate.service.EvaluateMsgLogService;
 import com.gic.evaluate.service.EvaluateOverviewApiService;
+import com.gic.evaluate.service.EvaluateQuickService;
 import com.gic.evaluate.service.EvaluateService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.logging.log4j.LogManager;
@@ -38,6 +39,8 @@ public class EvaluateOverviewApiServiceImpl implements EvaluateOverviewApiServic
     private EvaluateService evaluateService;
     @Autowired
     private EvaluateMsgLogService evaluateMsgLogService;
+    @Autowired
+    private EvaluateQuickService evaluateQuickService;
 
     @Override
     public ServiceResponse<Map<String, Long>> chart1(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList) {
@@ -83,8 +86,10 @@ public class EvaluateOverviewApiServiceImpl implements EvaluateOverviewApiServic
 
     @Override
     public ServiceResponse<Map<String, List<Map<String, Object>>>> chart4(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList) {
-        List<Map<String, Object>> goodChart = this.evaluateService.evaluateGoodQuickChart(enterpriseId, startTime, endTime, storeIdList);
-        List<Map<String, Object>> badChart = this.evaluateService.evaluateBadQuickChart(enterpriseId, startTime, endTime, storeIdList);
+        List<Map<String, Object>> goodChart = this.evaluateQuickService.evaluateGoodQuickChart(enterpriseId, startTime, endTime, storeIdList);
+        List<Map<String, Object>> badChart = this.evaluateQuickService.evaluateBadQuickChart(enterpriseId, startTime, endTime, storeIdList);
+//        List<Map<String, Object>> goodChart = this.evaluateService.evaluateGoodQuickChart(enterpriseId, startTime, endTime, storeIdList);
+//        List<Map<String, Object>> badChart = this.evaluateService.evaluateBadQuickChart(enterpriseId, startTime, endTime, storeIdList);
 
         Map<String, List<Map<String, Object>>> map = new HashMap<>(4);
         map.put("goodChart", goodChart);

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

@@ -854,32 +854,32 @@
   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="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}
-    <if test="tagType != null ">
-      and tag_type = #{tagType}
-    </if>
-    <if test="null != ids and ids.size &gt; 0">
-      and store_id in
-      <foreach close=")" collection="ids" index="index" item="item" open="(" separator=",">
-        #{item}
-      </foreach>
-    </if>
-  </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="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}-->
+<!--    <if test="tagType != null ">-->
+<!--      and tag_type = #{tagType}-->
+<!--    </if>-->
+<!--    <if test="null != ids and ids.size &gt; 0">-->
+<!--      and store_id in-->
+<!--      <foreach close=")" collection="ids" index="index" item="item" open="(" separator=",">-->
+<!--        #{item}-->
+<!--      </foreach>-->
+<!--    </if>-->
+<!--  </select>-->
   <select id="listEvaluateTrendByYear" resultType="map">
     select
     DATE_FORMAT(evaluate_time,'%Y') statisticsDate,

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

@@ -163,4 +163,31 @@
     and status = 1
   </select>
 
+<select id="evaluateQuickChart" resultType="map">
+    SELECT
+    t1.tag_name tagName,
+      (
+      SELECT count( * ) FROM tab_evaluate_tags t2 WHERE t2.tag_name = t1.tag_name
+        <if test="startTime != null ">
+            and create_time &gt;= #{startTime}
+        </if>
+        <if test="endTime != null ">
+            and create_time &lt;= #{endTime}
+        </if>
+       ) tagCount
+  FROM
+      tab_evaluate_quick t1
+  WHERE
+      enterprise_id = #{enterpriseId}
+    <if test="tagType != null ">
+      and tag_type = #{tagType}
+    </if>
+    <if test="null != ids and ids.size &gt; 0">
+      and store_id in
+      <foreach close=")" collection="ids" index="index" item="item" open="(" separator=",">
+        #{item}
+      </foreach>
+    </if>
+</select>
+
 </mapper>
\ No newline at end of file

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gic.evaluate.dao.mapper.TabEvaluateTagsMapper">
+  <resultMap id="BaseResultMap" type="com.gic.evaluate.entity.TabEvaluateTags">
+    <id column="evaluate_tags_id" jdbcType="INTEGER" property="evaluateTagsId" />
+    <result column="evaluate_id" jdbcType="INTEGER" property="evaluateId" />
+    <result column="member_id" jdbcType="BIGINT" property="memberId" />
+    <result column="tag_type" jdbcType="INTEGER" property="tagType" />
+    <result column="tag_name" jdbcType="VARCHAR" property="tagName" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    evaluate_tags_id, evaluate_id, member_id, tag_type, tag_name, create_time, update_time, 
+    enterprise_id, status
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from tab_evaluate_tags
+    where evaluate_tags_id = #{evaluateTagsId,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from tab_evaluate_tags
+    where evaluate_tags_id = #{evaluateTagsId,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.gic.evaluate.entity.TabEvaluateTags">
+    insert into tab_evaluate_tags (evaluate_tags_id, evaluate_id, member_id, 
+      tag_type, tag_name, create_time, 
+      update_time, enterprise_id, status
+      )
+    values (#{evaluateTagsId,jdbcType=INTEGER}, #{evaluateId,jdbcType=INTEGER}, #{memberId,jdbcType=BIGINT}, 
+      #{tagType,jdbcType=INTEGER}, #{tagName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateTime,jdbcType=TIMESTAMP}, #{enterpriseId,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.gic.evaluate.entity.TabEvaluateTags">
+    insert into tab_evaluate_tags
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="evaluateTagsId != null">
+        evaluate_tags_id,
+      </if>
+      <if test="evaluateId != null">
+        evaluate_id,
+      </if>
+      <if test="memberId != null">
+        member_id,
+      </if>
+      <if test="tagType != null">
+        tag_type,
+      </if>
+      <if test="tagName != null">
+        tag_name,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="enterpriseId != null">
+        enterprise_id,
+      </if>
+      <if test="status != null">
+        status,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="evaluateTagsId != null">
+        #{evaluateTagsId,jdbcType=INTEGER},
+      </if>
+      <if test="evaluateId != null">
+        #{evaluateId,jdbcType=INTEGER},
+      </if>
+      <if test="memberId != null">
+        #{memberId,jdbcType=BIGINT},
+      </if>
+      <if test="tagType != null">
+        #{tagType,jdbcType=INTEGER},
+      </if>
+      <if test="tagName != null">
+        #{tagName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="enterpriseId != null">
+        #{enterpriseId,jdbcType=INTEGER},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gic.evaluate.entity.TabEvaluateTags">
+    update tab_evaluate_tags
+    <set>
+      <if test="evaluateId != null">
+        evaluate_id = #{evaluateId,jdbcType=INTEGER},
+      </if>
+      <if test="memberId != null">
+        member_id = #{memberId,jdbcType=BIGINT},
+      </if>
+      <if test="tagType != null">
+        tag_type = #{tagType,jdbcType=INTEGER},
+      </if>
+      <if test="tagName != null">
+        tag_name = #{tagName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="enterpriseId != null">
+        enterprise_id = #{enterpriseId,jdbcType=INTEGER},
+      </if>
+      <if test="status != null">
+        status = #{status,jdbcType=INTEGER},
+      </if>
+    </set>
+    where evaluate_tags_id = #{evaluateTagsId,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gic.evaluate.entity.TabEvaluateTags">
+    update tab_evaluate_tags
+    set evaluate_id = #{evaluateId,jdbcType=INTEGER},
+      member_id = #{memberId,jdbcType=BIGINT},
+      tag_type = #{tagType,jdbcType=INTEGER},
+      tag_name = #{tagName,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      enterprise_id = #{enterpriseId,jdbcType=INTEGER},
+      status = #{status,jdbcType=INTEGER}
+    where evaluate_tags_id = #{evaluateTagsId,jdbcType=INTEGER}
+  </update>
+</mapper>
\ No newline at end of file