添加字段

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

@@ -189,6 +189,7 @@ public class EvaluateDTO implements Serializable {
     private Date updateTime;
 
     private List<EvaluateReplyDTO> replyList;
+    private boolean hasTopHot;
 
     public Integer getEvaluateId() {
         return evaluateId;
@@ -477,4 +478,12 @@ public class EvaluateDTO implements Serializable {
     public void setReplyList(List<EvaluateReplyDTO> replyList) {
         this.replyList = replyList;
     }
+
+    public void setHasTopHot(boolean hasTopHot) {
+        this.hasTopHot = hasTopHot;
+    }
+
+    public boolean getHasTopHot() {
+        return hasTopHot;
+    }
 }

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

@@ -101,18 +101,6 @@ public interface EvaluateManageApiService {
     ServiceResponse<Void> delReply(Integer evaluateReplyId);
 
     /**
-     * 查询门店下是否有热评
-     * @Title: getStoreTopHot
-     * @Description:
-     * @author zhiwj
-     * @param enterpriseId
-     * @param storeId
-     * @return com.gic.api.base.commons.ServiceResponse<java.lang.Integer>
-     * @throws
-     */
-    ServiceResponse<Integer> getStoreTopHot(Integer enterpriseId, Integer storeId);
-
-    /**
      * 快捷标签表
      * @Title: listEvaluateQuickReply
      * @Description:

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

 package com.gic.evaluate.dao.mapper;
 
 import com.gic.evaluate.entity.TabEvaluate;
-import com.gic.evaluate.entity.TabEvaluateQuick;
 import com.gic.evaluate.qo.EvaluateQO;
 import com.gic.evaluate.qo.StoreScoreQO;
 import com.gic.evaluate.qo.StoreTrendQO;
@@ -12,6 +11,7 @@ import org.apache.ibatis.annotations.Param;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 public interface TabEvaluateMapper {
     /**
@@ -100,4 +100,8 @@ public interface TabEvaluateMapper {
     Map<String, Map<String, Object>> listEvaluateTrendByDay(@Param("enterpriseId") Integer enterpriseId, @Param("replyType") Integer replyType, @Param("firstDate") Date firstDate);
 
     Integer getStoreTopHot(@Param("enterpriseId") Integer enterpriseId, @Param("storeId") Integer storeId);
+
+    List<Integer> listAllEvaluateId(@Param("enterpriseId") Integer enterpriseId);
+
+    Set<Integer> getStoreHasTopHot(@Param("enterpriseId") Integer enterpriseId, @Param("ids") List<Integer> storeIdList);
 }
\ No newline at end of file

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

@@ -9,6 +9,7 @@ import com.github.pagehelper.Page;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  *
@@ -62,4 +63,8 @@ public interface EvaluateService {
     List<Map<String, Object>> listEvaluateTrendByDay(Integer enterpriseId, Integer replyType);
 
     Integer getStoreTopHot(Integer enterpriseId, Integer storeId);
+
+    List<Integer> listAllEvaluateId(Integer enterpriseId);
+
+    Set<Integer> getStoreIdHasTopHot(Integer enterpriseId, List<Integer> storeIdList);
 }

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

@@ -8,7 +8,6 @@ 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;
-import com.gic.evaluate.entity.TabEvaluateQuick;
 import com.gic.evaluate.qo.EvaluateQO;
 import com.gic.evaluate.qo.StoreScoreQO;
 import com.gic.evaluate.qo.StoreTrendQO;
@@ -227,6 +226,16 @@ public class EvaluateServiceImpl implements EvaluateService {
         return tabEvaluateMapper.getStoreTopHot(enterpriseId, storeId);
     }
 
+    @Override
+    public List<Integer> listAllEvaluateId(Integer enterpriseId) {
+        return tabEvaluateMapper.listAllEvaluateId(enterpriseId);
+    }
+
+    @Override
+    public Set<Integer> getStoreIdHasTopHot(Integer enterpriseId, List<Integer> storeIdList) {
+        return tabEvaluateMapper.getStoreHasTopHot(enterpriseId, storeIdList);
+    }
+
     private List<String> getYear() {
         List<String> list = new ArrayList<>();
         int year = DateUtil.getYear(new Date());

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

@@ -19,12 +19,13 @@ import com.gic.evaluate.service.EvaluateManageApiService;
 import com.gic.evaluate.service.EvaluateQuickService;
 import com.gic.evaluate.service.EvaluateReplyService;
 import com.gic.evaluate.service.EvaluateService;
+import org.apache.commons.collections.CollectionUtils;
 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.*;
+import java.util.stream.Collectors;
 
 /**
  *
@@ -46,6 +47,14 @@ public class EvaluateManageApiServiceImpl implements EvaluateManageApiService {
     public ServiceResponse<Page<EvaluateDTO>> listEvaluateForManage(EvaluateQO evaluateQO) {
         com.github.pagehelper.Page<TabEvaluate> evaluateList = evaluateService.listEvaluate(evaluateQO);
         Page<EvaluateDTO> page = PageHelperUtils.changePageHelperToCurrentPage(evaluateList, EvaluateDTO.class);
+        List<EvaluateDTO> result = page.getResult();
+        if (CollectionUtils.isNotEmpty(result)) {
+            List<Integer> storeIdList = result.stream().map(EvaluateDTO::getStoreId).collect(Collectors.toList());
+            Set<Integer> storeIdHasTopHot = this.getStoreIdHasTopHot(evaluateQO.getEnterpriseId(), storeIdList);
+            for (EvaluateDTO evaluateDTO : result) {
+                evaluateDTO.setHasTopHot(storeIdHasTopHot.contains(evaluateDTO.getStoreId()));
+            }
+        }
         return EnterpriseServiceResponse.success(page);
     }
 
@@ -64,7 +73,13 @@ public class EvaluateManageApiServiceImpl implements EvaluateManageApiService {
 
     @Override
     public ServiceResponse<Void> updateShowStatus(Integer enterpriseId, List<Integer> evaluateId, Integer showStatus) {
-        this.evaluateService.updateShowStatus(enterpriseId, evaluateId, showStatus);
+        if (CollectionUtils.isNotEmpty(evaluateId)) {
+            if (evaluateId.size() == 1 && evaluateId.get(0) == -1) {
+                // 如果传了-1  就是修改全部
+                evaluateId = Collections.emptyList();
+            }
+            this.evaluateService.updateShowStatus(enterpriseId, evaluateId, showStatus);
+        }
         return EnterpriseServiceResponse.success();
     }
 
@@ -93,13 +108,22 @@ public class EvaluateManageApiServiceImpl implements EvaluateManageApiService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ServiceResponse<Void> replyEvaluate(UserReplyDTO userReplyDTO) {
-        for(Integer evaluateId : userReplyDTO.getEvaluateIds()) {
-            userReplyDTO.setEvaluateId(evaluateId);
-            this.evaluateReplyService.saveUserReplyEvaluate(userReplyDTO);
-            EvaluateDTO evaluateDTO = new EvaluateDTO();
-            evaluateDTO.setEvaluateId(evaluateId);
-            evaluateDTO.setReplyStatus(Constants.CLOSE);
-            this.evaluateService.updateEvaluate(evaluateDTO);
+        if (userReplyDTO.getEvaluateIds() != null) {
+            List<Integer> evaluateIdList;
+            if (userReplyDTO.getEvaluateIds().length == 1 && userReplyDTO.getEvaluateIds()[0] == -1) {
+                // 如果传了-1  就是修改全部
+                evaluateIdList = evaluateService.listAllEvaluateId(userReplyDTO.getEnterpriseId());
+            } else {
+                evaluateIdList = Arrays.asList(userReplyDTO.getEvaluateIds());
+            }
+            for (Integer evaluateId : evaluateIdList) {
+                userReplyDTO.setEvaluateId(evaluateId);
+                this.evaluateReplyService.saveUserReplyEvaluate(userReplyDTO);
+                EvaluateDTO evaluateDTO = new EvaluateDTO();
+                evaluateDTO.setEvaluateId(evaluateId);
+                evaluateDTO.setReplyStatus(Constants.CLOSE);
+                this.evaluateService.updateEvaluate(evaluateDTO);
+            }
         }
         return EnterpriseServiceResponse.success();
     }
@@ -110,10 +134,8 @@ public class EvaluateManageApiServiceImpl implements EvaluateManageApiService {
         return EnterpriseServiceResponse.success();
     }
 
-    @Override
-    public ServiceResponse<Integer> getStoreTopHot(Integer enterpriseId, Integer storeId) {
-        Integer evaluateId = this.evaluateService.getStoreTopHot(enterpriseId, storeId);
-        return EnterpriseServiceResponse.success(evaluateId);
+    private Set<Integer> getStoreIdHasTopHot(Integer enterpriseId, List<Integer> storeIdList) {
+        return this.evaluateService.getStoreIdHasTopHot(enterpriseId, storeIdList);
     }
 
     @Override

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

@@ -820,4 +820,20 @@
     and status = 1
     and top_hot_status = 1
   </select>
+  <select id="listAllEvaluateId" resultType="int">
+    select
+    evaluate_id
+    from tab_evaluate where enterprise_id = #{enterpriseId} and status = 1
+  </select>
+  <select id="getStoreHasTopHot" resultType="int">
+    select
+    store_id
+    from tab_evaluate where enterprise_id = #{enterpriseId} and top_hot_status = 1
+    <if test="null != ids and ids.size > 0">
+      and store_id in
+      <foreach collection="ids" index="index" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
+  </select>
 </mapper>
\ No newline at end of file

gic-evaluate-web/src/main/java/com/gic/evaluate/web/controller/EvaluateExportController.java

+package com.gic.evaluate.web.controller;
+
+import com.gic.download.utils.DownloadUtils;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author zhiwj
+ * @Description:
+ * @date 2020-01-14 16:47
+ */
+@RestController
+public class EvaluateExportController extends DownloadUtils {
+
+
+
+    private enum EvaluateFieldEnum{
+        evaluateTime("evaluateTime", "首次评价时间", 0),
+        memberName("memberName", "会员姓名", 0),
+        memberPhone("memberPhone", "会员手机号", 0),
+        goodsScore("goodsScore", "商品质量评分", 0),
+        storeScore("storeScore", "门店环境评分", 0),
+        serviceScore("serviceScore", "服务能力评分", 0),
+        evaluateContent("evaluateContent", "评语", 0),
+
+        evaluateId("evaluateId", "费用", 0),
+        storeId("storeId", "费用", 0),
+        clerkName("clerkName", "费用", 0),
+        memberId("memberId", "费用", 0),
+        orderId("orderId", "费用", 0),
+        memberImgUrl("memberImgUrl", "费用", 0),
+        goodsId("goodsId", "费用", 0),
+        goodsInfo("goodsInfo", "费用", 0),
+        storeName("storeName", "费用", 0),
+        storeCode("storeCode", "费用", 0),
+        storePhone("storePhone", "费用", 0),
+        storeGroupId("storeGroupId", "费用", 0),
+        storeGroupName("storeGroupName", "费用", 0),
+        orderNumber("orderNumber", "费用", 0),
+        receiptsDate("receiptsDate", "费用", 0),
+        clerkId("clerkId", "费用", 0),
+        badEvaluateStatus("badEvaluateStatus", "费用", 0),
+        goodEvaluateStatus("goodEvaluateStatus", "费用", 0),
+        reviewStatus("reviewStatus", "费用", 0),
+        topHotStatus("topHotStatus", "费用", 0),
+        maliciousStatus("maliciousStatus", "费用", 0),
+        showStatus("showStatus", "费用", 0),
+        visitStatus("visitStatus", "费用", 0),
+        replyStatus("replyStatus", "费用", 0),
+        ;
+        private String fieldCode;
+        private String fieldName;
+        private Integer needEncrypt;
+
+        EvaluateFieldEnum(String fieldCode, String fieldName, Integer needEncrypt) {
+            this.fieldCode = fieldCode;
+            this.fieldName = fieldName;
+            this.needEncrypt = needEncrypt;
+        }
+
+        public String getFieldCode() {
+            return fieldCode;
+        }
+
+        public String getFieldName() {
+            return fieldName;
+        }
+
+        public Integer getNeedEncrypt() {
+            return needEncrypt;
+        }
+    }
+
+}
\ No newline at end of file

gic-evaluate-web/src/main/java/com/gic/evaluate/web/controller/EvaluateManagerController.java

@@ -57,12 +57,6 @@ public class EvaluateManagerController {
         return ResultControllerUtils.commonResult(serviceResponse);
     }
 
-    @RequestMapping("/get-store-top-hot")
-    public RestResponse getStoreTopHot(Integer storeId) {
-        ServiceResponse<Integer> serviceResponse = evaluateManageApiService.getStoreTopHot(UserDetailUtils.getUserDetail().getEnterpriseId(), storeId);
-        return ResultControllerUtils.commonResult(serviceResponse);
-    }
-
     @RequestMapping("/update-top-hot-status")
     public RestResponse updateTopHotStatus(Integer evaluateId, Integer topHotStatus) {
         ServiceResponse<Void> serviceResponse = evaluateManageApiService.updateTopHotStatus(UserDetailUtils.getUserDetail().getEnterpriseId(), evaluateId, topHotStatus);