咨询建议列表

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

@@ -109,6 +109,10 @@ public class EvaluateDTO implements Serializable {
     private String storeGroupName;
 
     /**
+     * 地区名
+     */
+    private String areaName;
+    /**
      *
      */
     private String storePhone;
@@ -513,4 +517,16 @@ public class EvaluateDTO implements Serializable {
     public String getReplyUserContent() {
         return replyUserContent;
     }
+
+    public String getAreaName() {
+        return areaName;
+    }
+
+    public void setAreaName(String areaName) {
+        this.areaName = areaName;
+    }
+
+    public boolean isHasTopHot() {
+        return hasTopHot;
+    }
 }

gic-evaluate-api/src/main/java/com/gic/evaluate/qo/StoreScoreQO.java

@@ -17,6 +17,7 @@ public class StoreScoreQO extends PageQO {
     private Integer sortColumn;
     private Integer sortType;
     private Integer storeGroupId;
+    private String search;
     private List<Integer> storeIdList;
 
     public Integer getEnterpriseId() {
@@ -59,6 +60,14 @@ public class StoreScoreQO extends PageQO {
         this.storeIdList = storeIdList;
     }
 
+    public String getSearch() {
+        return search;
+    }
+
+    public void setSearch(String search) {
+        this.search = search;
+    }
+
     public Integer getPageNum() {
         return this.getCurrentPage();
     }

gic-evaluate-api/src/main/java/com/gic/evaluate/qo/StoreTrendQO.java

@@ -17,6 +17,7 @@ public class StoreTrendQO extends PageQO {
     private Integer sortColumn;
     private Integer sortType;
     private Integer storeGroupId;
+    private String search;
     private List<Integer> storeIdList;
 
     public Integer getEnterpriseId() {
@@ -58,4 +59,12 @@ public class StoreTrendQO extends PageQO {
     public void setStoreIdList(List<Integer> storeIdList) {
         this.storeIdList = storeIdList;
     }
+
+    public String getSearch() {
+        return search;
+    }
+
+    public void setSearch(String search) {
+        this.search = search;
+    }
 }

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

@@ -107,6 +107,11 @@ public class TabEvaluate {
     private String storeGroupName;
 
     /**
+     * 
+     */
+    private String areaName;
+
+    /**
      * 订单号
      */
     private String orderNumber;
@@ -117,6 +122,11 @@ public class TabEvaluate {
     private Date receiptsDate;
 
     /**
+     * 订单金额
+     */
+    private Double orderMount;
+
+    /**
      * 导购id
      */
     private Integer clerkId;
@@ -341,6 +351,14 @@ public class TabEvaluate {
         this.storeGroupName = storeGroupName;
     }
 
+    public String getAreaName() {
+        return areaName;
+    }
+
+    public void setAreaName(String areaName) {
+        this.areaName = areaName;
+    }
+
     public String getOrderNumber() {
         return orderNumber;
     }
@@ -357,6 +375,14 @@ public class TabEvaluate {
         this.receiptsDate = receiptsDate;
     }
 
+    public Double getOrderMount() {
+        return orderMount;
+    }
+
+    public void setOrderMount(Double orderMount) {
+        this.orderMount = orderMount;
+    }
+
     public Integer getClerkId() {
         return clerkId;
     }

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

@@ -118,6 +118,7 @@ public class EvaluateOverviewApiServiceImpl implements EvaluateOverviewApiServic
         if (CollectionUtils.isNotEmpty(trendList)) {
             List<Integer> storeIdList = trendList.stream().map(
                     e -> {
+                        e.put("evaluateRate", 0);
                         Object storeId = e.get("storeId");
                         return storeId == null ? null : Integer.valueOf(storeId.toString());
                     }

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

@@ -79,7 +79,7 @@ public class EvaluateOverviewController {
         ServiceResponse<Map<String, Object>> totalStoreScore = evaluateOverviewApiService.getTotalStoreScore(storeScoreQO);
         List<Map<String, Object>> result = serviceResponse.getResult().getResult();
         result.add(0, totalStoreScore.getResult());
-        return RestResponse.success(result);
+        return RestResponse.success(serviceResponse);
     }
 
     @RequestMapping("/evaluate-list-trend")