Merge branch 'developer' into 'master'

Developer

See merge request !10

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

@@ -7,10 +7,25 @@ package com.gic.evaluate.constant;
  * @date 2019-12-27 10:33
  */
 public enum ComputeEnum {
+    /**
+     * 小于
+     */
     LT("<", 1, "小于"),
+    /**
+     * 小于等于
+     */
     LTE("<=", 2, "小于等于"),
+    /**
+     * 等于
+     */
     EQ("=", 3, "等于"),
+    /**
+     * 大于等于
+     */
     GTE(">=",4,  "大于等于"),
+    /**
+     * 大于
+     */
     GT(">",5, "大于"),
     ;
     private String compute;

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

@@ -7,8 +7,17 @@ package com.gic.evaluate.constant;
  * @date 2019-12-25 18:14
  */
 public enum GreaterEnum {
+    /**
+     * 等于
+     */
     EQ("=",3,  "等于"),
+    /**
+     * 大于等于
+     */
     GTE(">=",4,  "大于等于"),
+    /**
+     * 大于
+     */
     GT(">",5, "大于");
 
     private String compute;

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

@@ -7,8 +7,17 @@ package com.gic.evaluate.constant;
  * @date 2019-12-25 18:14
  */
 public enum LessEnum {
+    /**
+     * 小于
+     */
     LT("<", 1, "小于"),
+    /**
+     * 小于等于
+     */
     LTE("<=", 2, "小于等于"),
+    /**
+     * 等于
+     */
     EQ("=", 3, "等于");
 
     private String compute;

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

@@ -6,8 +6,17 @@ package com.gic.evaluate.constant;
  * @date 2020-01-03 14:45
  */
 public enum TrendDateUnitEnum {
+    /**
+     * 年
+     */
     YEAR(1, "%Y"),
+    /**
+     * 年月
+     */
     MONTH(2, "%Y-%m"),
+    /**
+     * 年月日
+     */
     DAY(3, "%y-%m-%d"),
     ;
     private Integer code;

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

@@ -257,4 +257,29 @@ public class BadEvaluateConfigDTO implements Serializable {
     public void setTaskAssign(Integer taskAssign) {
         this.taskAssign = taskAssign;
     }
+
+    @Override
+    public String toString() {
+        return "BadEvaluateConfigDTO{" +
+                "badEvaluateConfigId=" + badEvaluateConfigId +
+                ", enterpriseId=" + enterpriseId +
+                ", badOnceStatus=" + badOnceStatus +
+                ", badGoodsType=" + badGoodsType +
+                ", badGoodsScore=" + badGoodsScore +
+                ", badStoreType=" + badStoreType +
+                ", badStoreScore=" + badStoreScore +
+                ", badServiceType=" + badServiceType +
+                ", badServiceScore=" + badServiceScore +
+                ", badTotalStatus=" + badTotalStatus +
+                ", badTotalType=" + badTotalType +
+                ", badTotalScore=" + badTotalScore +
+                ", taskAssign=" + taskAssign +
+                ", goodStatus=" + goodStatus +
+                ", goodOnceType=" + goodOnceType +
+                ", goodOnceScore=" + goodOnceScore +
+                ", goodTotalType=" + goodTotalType +
+                ", goodTotalScore=" + goodTotalScore +
+                ", goodNoReturn=" + goodNoReturn +
+                '}';
+    }
 }

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

@@ -205,13 +205,13 @@ public class EvaluateDTO implements Serializable {
     private String quickIds;
 
     private List<EvaluateReplyDTO> replyList;
-    private boolean hasTopHot;
+    private Boolean hasTopHot = false;
     private String replyTime;
     private String replyMemberContent;
     private String replyUserContent;
     private List<String> imgList;
     private Double orderMount;
-    private double avgScore;
+    private Double avgScore = 0.0d;
     private List<EvaluateTagsDTO> quickReplyTagList;
     private List<String> quickReplyTagNameList;
     private Integer storeInfoId;
@@ -256,6 +256,14 @@ public class EvaluateDTO implements Serializable {
         this.acuId = acuId;
     }
 
+    public Long getEcuId() {
+        return ecuId;
+    }
+
+    public void setEcuId(Long ecuId) {
+        this.ecuId = ecuId;
+    }
+
     public Long getOrderId() {
         return orderId;
     }
@@ -376,6 +384,22 @@ public class EvaluateDTO implements Serializable {
         this.storeGroupName = storeGroupName;
     }
 
+    public String getAreaName() {
+        return areaName;
+    }
+
+    public void setAreaName(String areaName) {
+        this.areaName = areaName;
+    }
+
+    public String getStorePhone() {
+        return storePhone;
+    }
+
+    public void setStorePhone(String storePhone) {
+        this.storePhone = storePhone;
+    }
+
     public String getOrderNumber() {
         return orderNumber;
     }
@@ -496,12 +520,12 @@ public class EvaluateDTO implements Serializable {
         this.updateTime = updateTime;
     }
 
-    public String getStorePhone() {
-        return storePhone;
+    public String getQuickIds() {
+        return quickIds;
     }
 
-    public void setStorePhone(String storePhone) {
-        this.storePhone = storePhone;
+    public void setQuickIds(String quickIds) {
+        this.quickIds = quickIds;
     }
 
     public List<EvaluateReplyDTO> getReplyList() {
@@ -512,98 +536,70 @@ public class EvaluateDTO implements Serializable {
         this.replyList = replyList;
     }
 
-    public void setHasTopHot(boolean hasTopHot) {
-        this.hasTopHot = hasTopHot;
-    }
-
-    public boolean getHasTopHot() {
+    public Boolean getHasTopHot() {
         return hasTopHot;
     }
 
-    public void setReplyTime(String replyTime) {
-        this.replyTime = replyTime;
+    public void setHasTopHot(Boolean hasTopHot) {
+        this.hasTopHot = hasTopHot;
     }
 
     public String getReplyTime() {
         return replyTime;
     }
 
-    public void setReplyMemberContent(String replyMemberContent) {
-        this.replyMemberContent = replyMemberContent;
+    public void setReplyTime(String replyTime) {
+        this.replyTime = replyTime;
     }
 
     public String getReplyMemberContent() {
         return replyMemberContent;
     }
 
-    public void setReplyUserContent(String replyUserContent) {
-        this.replyUserContent = replyUserContent;
+    public void setReplyMemberContent(String replyMemberContent) {
+        this.replyMemberContent = replyMemberContent;
     }
 
     public String getReplyUserContent() {
         return replyUserContent;
     }
 
-    public String getAreaName() {
-        return areaName;
-    }
-
-    public void setAreaName(String areaName) {
-        this.areaName = areaName;
-    }
-
-    public boolean isHasTopHot() {
-        return hasTopHot;
-    }
-
-    public void setImgList(List<String> imgList) {
-        this.imgList = imgList;
+    public void setReplyUserContent(String replyUserContent) {
+        this.replyUserContent = replyUserContent;
     }
 
     public List<String> getImgList() {
         return imgList;
     }
 
-    public Long getEcuId() {
-        return ecuId;
-    }
-
-    public void setEcuId(Long ecuId) {
-        this.ecuId = ecuId;
-    }
-
-    public void setOrderMount(Double orderMount) {
-        this.orderMount = orderMount;
+    public void setImgList(List<String> imgList) {
+        this.imgList = imgList;
     }
 
     public Double getOrderMount() {
         return orderMount;
     }
 
-    public void setAvgScore(double avgScore) {
-        this.avgScore = avgScore;
+    public void setOrderMount(Double orderMount) {
+        this.orderMount = orderMount;
     }
 
-    public double getAvgScore() {
+    public Double getAvgScore() {
         return avgScore;
     }
 
-    public String getQuickIds() {
-        return quickIds;
+    public void setAvgScore(Double avgScore) {
+        this.avgScore = avgScore;
     }
 
-    public void setQuickIds(String quickIds) {
-        this.quickIds = quickIds;
+    public List<EvaluateTagsDTO> getQuickReplyTagList() {
+        return quickReplyTagList;
     }
 
     public void setQuickReplyTagList(List<EvaluateTagsDTO> quickReplyTagList) {
         this.quickReplyTagList = quickReplyTagList;
     }
 
-    public List<EvaluateTagsDTO> getQuickReplyTagList() {
-        return quickReplyTagList;
-    }
-
     public List<String> getQuickReplyTagNameList() {
         return quickReplyTagNameList;
     }
@@ -612,12 +608,68 @@ public class EvaluateDTO implements Serializable {
         this.quickReplyTagNameList = quickReplyTagNameList;
     }
 
+    public Integer getStoreInfoId() {
+        return storeInfoId;
+    }
+
     public void setStoreInfoId(Integer storeInfoId) {
         this.storeInfoId = storeInfoId;
     }
 
-    public Integer getStoreInfoId() {
-        return storeInfoId;
+    @Override
+    public String toString() {
+        return "EvaluateDTO{" +
+                "evaluateId=" + evaluateId +
+                ", enterpriseId=" + enterpriseId +
+                ", storeId=" + storeId +
+                ", memberId=" + memberId +
+                ", acuId=" + acuId +
+                ", ecuId=" + ecuId +
+                ", orderId=" + orderId +
+                ", evaluateContent='" + evaluateContent + '\'' +
+                ", goodsScore=" + goodsScore +
+                ", storeScore=" + storeScore +
+                ", serviceScore=" + serviceScore +
+                ", evaluateTime=" + evaluateTime +
+                ", memberName='" + memberName + '\'' +
+                ", memberPhone='" + memberPhone + '\'' +
+                ", memberImgUrl='" + memberImgUrl + '\'' +
+                ", goodsId=" + goodsId +
+                ", goodsInfo='" + goodsInfo + '\'' +
+                ", storeName='" + storeName + '\'' +
+                ", storeCode='" + storeCode + '\'' +
+                ", storeGroupId=" + storeGroupId +
+                ", storeGroupName='" + storeGroupName + '\'' +
+                ", areaName='" + areaName + '\'' +
+                ", storePhone='" + storePhone + '\'' +
+                ", orderNumber='" + orderNumber + '\'' +
+                ", receiptsDate=" + receiptsDate +
+                ", clerkId=" + clerkId +
+                ", clerkName='" + clerkName + '\'' +
+                ", badEvaluateStatus=" + badEvaluateStatus +
+                ", goodEvaluateStatus=" + goodEvaluateStatus +
+                ", reviewStatus=" + reviewStatus +
+                ", topHotStatus=" + topHotStatus +
+                ", maliciousStatus=" + maliciousStatus +
+                ", showStatus=" + showStatus +
+                ", visitStatus=" + visitStatus +
+                ", replyStatus=" + replyStatus +
+                ", status=" + status +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                ", quickIds='" + quickIds + '\'' +
+                ", replyList=" + replyList +
+                ", hasTopHot=" + hasTopHot +
+                ", replyTime='" + replyTime + '\'' +
+                ", replyMemberContent='" + replyMemberContent + '\'' +
+                ", replyUserContent='" + replyUserContent + '\'' +
+                ", imgList=" + imgList +
+                ", orderMount=" + orderMount +
+                ", avgScore=" + avgScore +
+                ", quickReplyTagList=" + quickReplyTagList +
+                ", quickReplyTagNameList=" + quickReplyTagNameList +
+                ", storeInfoId=" + storeInfoId +
+                '}';
     }
 }
 

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

@@ -140,4 +140,20 @@ public class EvaluateMsgLogDTO implements Serializable {
     public void setReceiptsDate(Date receiptsDate) {
         this.receiptsDate = receiptsDate;
     }
+
+    @Override
+    public String toString() {
+        return "EvaluateMsgLogDTO{" +
+                "evaluateMsgLogId=" + evaluateMsgLogId +
+                ", enterpriseId=" + enterpriseId +
+                ", orderId=" + orderId +
+                ", orderNumber='" + orderNumber + '\'' +
+                ", storeId=" + storeId +
+                ", saleAmount=" + saleAmount +
+                ", memberAreaId=" + memberAreaId +
+                ", mcuId=" + mcuId +
+                ", goodsInfo='" + goodsInfo + '\'' +
+                ", receiptsDate=" + receiptsDate +
+                '}';
+    }
 }

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

@@ -79,16 +79,6 @@ public class EvaluateOrderConfigDTO implements Serializable {
     private Integer review;
 
     /**
-     * 追评提醒 X天
-     */
-//    private Integer reviewRemind;
-
-    /**
-     * 追评期限
-     */
-//    private Integer reviewLimitday;
-
-    /**
      * 是否支持用户隐藏追评
      */
     private Integer reviewUserHidden;
@@ -366,4 +356,38 @@ public class EvaluateOrderConfigDTO implements Serializable {
     public List<EvaluateQuickDTO> getReplyQuickDTOList() {
         return replyQuickDTOList;
     }
+
+    @Override
+    public String toString() {
+        return "EvaluateOrderConfigDTO{" +
+                "evaluateOrderConfigId=" + evaluateOrderConfigId +
+                ", enterpriseId=" + enterpriseId +
+                ", goods=" + goods +
+                ", store=" + store +
+                ", service=" + service +
+                ", goodsRequired=" + goodsRequired +
+                ", storeRequired=" + storeRequired +
+                ", serviceRequired=" + serviceRequired +
+                ", mindHour=" + mindHour +
+                ", remindDay=" + remindDay +
+                ", evaluateLimitday=" + evaluateLimitday +
+                ", defaultContent='" + defaultContent + '\'' +
+                ", review=" + review +
+                ", reviewUserHidden=" + reviewUserHidden +
+                ", reviewTimes=" + reviewTimes +
+                ", commentModule=" + commentModule +
+                ", showType=" + showType +
+                ", orderType=" + orderType +
+                ", badEvaluateTag=" + badEvaluateTag +
+                ", badEvaluateTagType=" + badEvaluateTagType +
+                ", badSuggestionTag=" + badSuggestionTag +
+                ", badSuggestionTagType=" + badSuggestionTagType +
+                ", goodEvaluateQuick=" + goodEvaluateQuick +
+                ", badEvaluateQuick=" + badEvaluateQuick +
+                ", replyQuick=" + replyQuick +
+                ", badEvaluateQuickDTOList=" + badEvaluateQuickDTOList +
+                ", goodEvaluateQuickDTOList=" + goodEvaluateQuickDTOList +
+                ", replyQuickDTOList=" + replyQuickDTOList +
+                '}';
+    }
 }

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

@@ -101,4 +101,17 @@ public class EvaluateQuickDTO implements Serializable {
     public void setStatus(Integer status) {
         this.status = status;
     }
+
+    @Override
+    public String toString() {
+        return "EvaluateQuickDTO{" +
+                "evaluateQuickId=" + evaluateQuickId +
+                ", tagType=" + tagType +
+                ", tagName='" + tagName + '\'' +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                ", enterpriseId=" + enterpriseId +
+                ", status=" + status +
+                '}';
+    }
 }

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

@@ -190,4 +190,25 @@ public class EvaluateReplyDTO implements Serializable {
     public void setQuickReplyTagNameList(List<String> quickReplyTagNameList) {
         this.quickReplyTagNameList = quickReplyTagNameList;
     }
+
+    @Override
+    public String toString() {
+        return "EvaluateReplyDTO{" +
+                "evaluateReplyId=" + evaluateReplyId +
+                ", enterpriseId=" + enterpriseId +
+                ", evaluateId=" + evaluateId +
+                ", replyDate=" + replyDate +
+                ", replyerType=" + replyerType +
+                ", replyContent='" + replyContent + '\'' +
+                ", memberId=" + memberId +
+                ", memberName='" + memberName + '\'' +
+                ", memberImgUrl='" + memberImgUrl + '\'' +
+                ", showStatus=" + showStatus +
+                ", userId=" + userId +
+                ", userName='" + userName + '\'' +
+                ", imgList=" + imgList +
+                ", quickReplyTagList=" + quickReplyTagList +
+                ", quickReplyTagNameList=" + quickReplyTagNameList +
+                '}';
+    }
 }

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

@@ -100,4 +100,17 @@ public class EvaluateTagsDTO implements Serializable {
     public void setEnterpriseId(Integer enterpriseId) {
         this.enterpriseId = enterpriseId;
     }
+
+    @Override
+    public String toString() {
+        return "EvaluateTagsDTO{" +
+                "evaluateTagsId=" + evaluateTagsId +
+                ", evaluateId=" + evaluateId +
+                ", evaluateReplyId=" + evaluateReplyId +
+                ", memberId=" + memberId +
+                ", tagType=" + tagType +
+                ", tagName='" + tagName + '\'' +
+                ", enterpriseId=" + enterpriseId +
+                '}';
+    }
 }

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

@@ -112,4 +112,19 @@ public class MemberReplyDTO implements Serializable {
     public void setEcuId(Long ecuId) {
         this.ecuId = ecuId;
     }
+
+    @Override
+    public String toString() {
+        return "MemberReplyDTO{" +
+                "enterpriseId=" + enterpriseId +
+                ", evaluateId=" + evaluateId +
+                ", replyContent='" + replyContent + '\'' +
+                ", memberId=" + memberId +
+                ", memberName='" + memberName + '\'' +
+                ", imgList=" + imgList +
+                ", memberImgUrl='" + memberImgUrl + '\'' +
+                ", acuId=" + acuId +
+                ", ecuId=" + ecuId +
+                '}';
+    }
 }

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

@@ -83,4 +83,16 @@ public class OrderGoodsDTO implements Serializable {
     public void setSkuInfo(List<OrderItemAttrViewDTO> skuInfo) {
         this.skuInfo = skuInfo;
     }
+
+    @Override
+    public String toString() {
+        return "OrderGoodsDTO{" +
+                "imageUrl='" + imageUrl + '\'' +
+                ", goodsName='" + goodsName + '\'' +
+                ", skuCode='" + skuCode + '\'' +
+                ", payPrice=" + payPrice +
+                ", goodsNum=" + goodsNum +
+                ", skuInfo=" + skuInfo +
+                '}';
+    }
 }

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

@@ -31,4 +31,12 @@ public class OrderItemAttrViewDTO implements Serializable {
     public void setValue(String value) {
         this.value = value;
     }
+
+    @Override
+    public String toString() {
+        return "OrderItemAttrViewDTO{" +
+                "key='" + key + '\'' +
+                ", value='" + value + '\'' +
+                '}';
+    }
 }

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

@@ -113,14 +113,22 @@ public class ProblemDTO implements Serializable {
      */
     private Date updateTime;
 
-    // 管理员第一次回复内容
+    /**
+     * 管理员第一次回复内容
+      */
     private String replyContent;
-    // 回复数量
+    /**
+     * 回复数量
+     */
     private Integer problemCount;
-    // 图片
+    /**
+     * 图片
+     */
     private List<String> imgList;
 
-    // 回复列表
+    /**
+     * 回复列表
+     */
     private List<ProblemReplyDTO> replyList;
     private String replyUserContent;
 
@@ -339,4 +347,37 @@ public class ProblemDTO implements Serializable {
     public void setUnionId(String unionId) {
         this.unionId = unionId;
     }
+
+    @Override
+    public String toString() {
+        return "ProblemDTO{" +
+                "problemId=" + problemId +
+                ", enterpriseId=" + enterpriseId +
+                ", storeId=" + storeId +
+                ", storeName='" + storeName + '\'' +
+                ", memberId=" + memberId +
+                ", acuId=" + acuId +
+                ", ecuId=" + ecuId +
+                ", areaId=" + areaId +
+                ", unionId='" + unionId + '\'' +
+                ", memberName='" + memberName + '\'' +
+                ", memberPhone='" + memberPhone + '\'' +
+                ", memberImgUrl='" + memberImgUrl + '\'' +
+                ", problemContent='" + problemContent + '\'' +
+                ", imageUrl='" + imageUrl + '\'' +
+                ", hasOtherImage=" + hasOtherImage +
+                ", problemStatus=" + problemStatus +
+                ", maliciousStatus=" + maliciousStatus +
+                ", maliciousStatusTime=" + maliciousStatusTime +
+                ", showStatus=" + showStatus +
+                ", status=" + status +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                ", replyContent='" + replyContent + '\'' +
+                ", problemCount=" + problemCount +
+                ", imgList=" + imgList +
+                ", replyList=" + replyList +
+                ", replyUserContent='" + replyUserContent + '\'' +
+                '}';
+    }
 }
\ No newline at end of file

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

-package com.gic.evaluate.dto;
-
-import java.io.Serializable;
-
-/**
- * @author zhiwj
- * @Description:
- * @date 2020-01-02 10:48
- */
-public class ProblemImgDTO implements Serializable {
-    private static final long serialVersionUID = 8641519372108017377L;
-
-
-
-}

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

@@ -132,4 +132,20 @@ public class ProblemMemberReplyDTO implements Serializable {
     public void setMemberImgUrl(String memberImgUrl) {
         this.memberImgUrl = memberImgUrl;
     }
+
+    @Override
+    public String toString() {
+        return "ProblemMemberReplyDTO{" +
+                "evaluateReplyId=" + evaluateReplyId +
+                ", enterpriseId=" + enterpriseId +
+                ", problemId=" + problemId +
+                ", replyContent='" + replyContent + '\'' +
+                ", memberId=" + memberId +
+                ", memberName='" + memberName + '\'' +
+                ", acuId=" + acuId +
+                ", ecuId=" + ecuId +
+                ", imgList=" + imgList +
+                ", memberImgUrl='" + memberImgUrl + '\'' +
+                '}';
+    }
 }

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

@@ -191,4 +191,24 @@ public class ProblemReplyDTO implements Serializable {
     public void setMemberImgUrl(String memberImgUrl) {
         this.memberImgUrl = memberImgUrl;
     }
+
+    @Override
+    public String toString() {
+        return "ProblemReplyDTO{" +
+                "problemReplyId=" + problemReplyId +
+                ", enterpriseId=" + enterpriseId +
+                ", problemId=" + problemId +
+                ", replyerType=" + replyerType +
+                ", replyContent='" + replyContent + '\'' +
+                ", memberId=" + memberId +
+                ", memberName='" + memberName + '\'' +
+                ", memberImgUrl='" + memberImgUrl + '\'' +
+                ", userId=" + userId +
+                ", userName='" + userName + '\'' +
+                ", status=" + status +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                ", imgList=" + imgList +
+                '}';
+    }
 }

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

@@ -87,4 +87,16 @@ public class ProblemUserReplyDTO implements Serializable {
     public void setUserName(String userName) {
         this.userName = userName;
     }
+
+    @Override
+    public String toString() {
+        return "ProblemUserReplyDTO{" +
+                "problemReplyId=" + problemReplyId +
+                ", enterpriseId=" + enterpriseId +
+                ", problemId=" + problemId +
+                ", replyContent='" + replyContent + '\'' +
+                ", userId=" + userId +
+                ", userName='" + userName + '\'' +
+                '}';
+    }
 }

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

 package com.gic.evaluate.dto;
 
 import java.io.Serializable;
+import java.util.Arrays;
 
 /**
  * 管理员回复
@@ -96,4 +97,17 @@ public class UserReplyDTO implements Serializable {
     public void setEvaluateId(Integer evaluateId) {
         this.evaluateId = evaluateId;
     }
+
+    @Override
+    public String toString() {
+        return "UserReplyDTO{" +
+                "evaluateReplyId=" + evaluateReplyId +
+                ", enterpriseId=" + enterpriseId +
+                ", evaluateId=" + evaluateId +
+                ", evaluateIds=" + Arrays.toString(evaluateIds) +
+                ", replyContent='" + replyContent + '\'' +
+                ", userId=" + userId +
+                ", userName='" + userName + '\'' +
+                '}';
+    }
 }

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

 package com.gic.evaluate.qo;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  *
@@ -19,6 +20,9 @@ public class EvaluateOutQO implements Serializable {
 
     private Long orderId;
 
+    private String orderNumber;
+    private List<String> orderNumberList;
+
     public Integer getEnterpriseId() {
         return enterpriseId;
     }
@@ -50,4 +54,20 @@ public class EvaluateOutQO implements Serializable {
     public void setStoreId(Integer storeId) {
         this.storeId = storeId;
     }
+
+    public String getOrderNumber() {
+        return orderNumber;
+    }
+
+    public void setOrderNumber(String orderNumber) {
+        this.orderNumber = orderNumber;
+    }
+
+    public List<String> getOrderNumberList() {
+        return orderNumberList;
+    }
+
+    public void setOrderNumberList(List<String> orderNumberList) {
+        this.orderNumberList = orderNumberList;
+    }
 }

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

@@ -69,16 +69,19 @@ public interface EvaluateConfigApiService {
 
 
     /**
+     * 保存
      * @Title: updateEvaluateMind
      * @Description: 保存
      * @author zhiwj
      * @param enterpriseId
+     * @param mind
      * @return com.gic.api.base.commons.ServiceResponse<java.lang.Integer>
      * @throws
      */
     ServiceResponse<Void> updateEvaluateMind(Integer enterpriseId, Integer mind);
 
     /**
+     * 查询评价
      * @Title: getEvaluateMind
      * @Description: 查询评价
      * @author zhiwj

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

@@ -34,6 +34,7 @@ public interface EvaluateManageApiService {
      * @Description:
      * @author zhiwj
      * @param evaluateId
+     * @param enterpriseId
      * @return com.gic.api.base.commons.ServiceResponse<com.gic.evaluate.dto.EvaluateDTO>
      * @throws
      */
@@ -53,6 +54,7 @@ public interface EvaluateManageApiService {
     ServiceResponse<Void> updateShowStatus(Integer enterpriseId, List<Integer> evaluateId, Integer showStatus);
     
     /**
+     * 编辑回复是否展示状态
      * @Title: updateReplyShowStatus
      * @Description: 
      * @author zhiwj 
@@ -147,9 +149,11 @@ public interface EvaluateManageApiService {
     ServiceResponse<Integer> countEvaluate(EvaluateQO evaluateQO);
 
     /**
+     * 计算门店分数
      * @Title: computeStoreScore
      * @Description: 
-     * @author zhiwj 
+     * @author zhiwj
+     * @param msg
      * @return com.gic.api.base.commons.ServiceResponse<java.lang.Integer>
      * @throws 
      */

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

@@ -12,6 +12,7 @@ public interface EvaluateMsgLogApiService {
 
 
     /**
+     * 接收数据组的订单数据 发送数据
      * @Title: sendNotice
      * @Description: 接收数据组的订单数据 发送数据
      * @author zhiwj

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

@@ -42,11 +42,11 @@ public interface EvaluateOutApiService {
 
     /**
      * 查询门店下的所有评价（仅包含展示的）
-     * @Title: listEvaluateByStore
-     * @Description:
-     * @author zhiwj
-     * @return com.gic.api.base.commons.ServiceResponse<com.gic.api.base.commons.Page<com.gic.evaluate.dto.EvaluateDTO>>
-     * @throws
+     * @param enterpriseId
+     * @param storeId
+     * @param currentPage
+     * @param pageSize
+     * @return
      */
     ServiceResponse<Page<EvaluateDTO>> listEvaluateByStore(Integer enterpriseId, Integer storeId, Integer currentPage, Integer pageSize);
 
@@ -83,6 +83,17 @@ public interface EvaluateOutApiService {
      * @throws
      */
     ServiceResponse<EvaluateDTO> listEvaluateByOrderId(EvaluateOutQO evaluateOutQO);
+    
+    /**
+     * listEvaluateByOrderId 
+     * @Title: listEvaluateByOrderId
+     * @Description: 
+     * @author zhiwj 
+     * @param evaluateOutQO
+     * @return com.gic.api.base.commons.ServiceResponse<com.gic.evaluate.dto.EvaluateDTO>
+     * @throws 
+     */
+    ServiceResponse<List<EvaluateDTO>> listEvaluateByOrderNumberList(EvaluateOutQO evaluateOutQO);
 
     /**
      * 查询订单号对应的回复状态 key是订单号， value是状态（-1:未评价  0管理员没有回复过  1管理员回复了   2有新的追评管理员没回复  3逾期并且没有评价过    4不支持追评    6超过最大追评次数  7逾期并且评价过）

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

@@ -25,41 +25,49 @@ public interface EvaluateOverviewApiService {
      * @param enterpriseId
      * @param startTime
      * @param endTime
-     * @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
+     * @param storeIdList
+     * @return com.gic.api.base.commons.ServiceResponse<java.util.Map<java.lang.String,java.lang.Long>>
      * @throws
      */
-    ServiceResponse<Map<String, Long>> chart1(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
+    ServiceResponse<Map<String, Long>> chartOne(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
 
     /**
      * 图表2 各项评分概况
-     * @Title: chart2
-     * @Description:
-     * @author zhiwj
      * @param enterpriseId
      * @param startTime
      * @param endTime
-     * @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
-     * @throws
+     * @param storeIdList
+     * @return
      */
-    ServiceResponse<HashMap<String, Map<String, Long>>> chart2(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
+    ServiceResponse<HashMap<String, Map<String, Long>>> chartTwo(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
 
     /**
      * 图表3 评价趋势
+     * @Title: chart3
+     * @Description:
+     * @author zhiwj
      * @param enterpriseId
      * @param startTime
      * @param endTime
-     * @return
+     * @param storeIdList
+     * @return com.gic.api.base.commons.ServiceResponse<java.util.Map<java.lang.String,java.util.List<java.util.Map<java.lang.String,java.lang.Object>>>>
+     * @throws
      */
-    ServiceResponse<Map<String, List<Map<String, Object>>>> chart3(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
+    ServiceResponse<Map<String, List<Map<String, Object>>>> chartThree(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
 
     /**
      * 图表4 正面/负面快评使用统计 变化趋势
+     * @Title: chart4
+     * @Description:
+     * @author zhiwj
      * @param enterpriseId
      * @param startTime
      * @param endTime
-     * @return
+     * @param storeIdList
+     * @return com.gic.api.base.commons.ServiceResponse<java.util.Map<java.lang.String,java.util.List<java.util.Map<java.lang.String,java.lang.Object>>>>
+     * @throws
      */
-    ServiceResponse<Map<String, List<Map<String, Object>>>> chart4(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
+    ServiceResponse<Map<String, List<Map<String, Object>>>> chartFour(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
 
     /**
      * 查询门店评分
@@ -96,10 +104,14 @@ public interface EvaluateOverviewApiService {
 
     /**
      * 查看各个时间段好评的变化趋势
-     * @Title: listEvaluateTrendByDate
+     * @Title: listGoodEvaluateTrendByDate
      * @Description:
      * @author zhiwj
-     * @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
+     * @param enterpriseId
+     * @param startTime
+     * @param endTime
+     * @param storeIdList
+     * @return com.gic.api.base.commons.ServiceResponse<java.util.List<java.util.Map<java.lang.String,java.lang.Integer>>>
      * @throws
      */
     ServiceResponse<List<Map<String, Integer>>> listGoodEvaluateTrendByDate(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
@@ -109,7 +121,11 @@ public interface EvaluateOverviewApiService {
      * @Title: listBadEvaluateTrendByDate
      * @Description:
      * @author zhiwj
-     * @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
+     * @param enterpriseId
+     * @param startTime
+     * @param endTime
+     * @param storeIdList
+     * @return com.gic.api.base.commons.ServiceResponse<java.util.List<java.util.Map<java.lang.String,java.lang.Integer>>>
      * @throws
      */
     ServiceResponse<List<Map<String, Integer>>> listBadEvaluateTrendByDate(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);

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

@@ -60,6 +60,7 @@ public interface ProblemManageApiService {
     ServiceResponse<Void> replyProblem(ProblemUserReplyDTO problemUserReplyDTO);
 
     /**
+     * 回复
      * @Title: replyProblem
      * @Description:
      * @author zhiwj

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

@@ -25,7 +25,7 @@ public interface ProblemOutApiService {
     ServiceResponse<Void> saveProblem(ProblemDTO problemDTO);
 
     /**
-     *
+     * 保存回复
      * @Title: saveProblem
      * @Description:
      * @author zhiwj
@@ -58,7 +58,7 @@ public interface ProblemOutApiService {
     ServiceResponse<ProblemDTO> getProblem(Integer problemId);
 
     /**
-     *
+     * 结束回复
      * @Title: endProblem
      * @Description:
      * @author zhiwj
@@ -74,6 +74,7 @@ public interface ProblemOutApiService {
      * @Description:
      * @author zhiwj
      * @param enterpriseId
+     * @param acuId
      * @return com.gic.api.base.commons.ServiceResponse<java.lang.Boolean>
      * @throws
      */

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

@@ -2,6 +2,13 @@ package com.gic.evaluate.dao.mapper;
 
 import com.gic.evaluate.entity.TabBadEvaluateConfig;
 
+/**
+ * 
+ * @ClassName: TabBadEvaluateConfigMapper
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-08 18:50
+ */
 public interface TabBadEvaluateConfigMapper {
     /**
      * 根据主键删除
@@ -51,5 +58,14 @@ public interface TabBadEvaluateConfigMapper {
      */
     int updateByPrimaryKey(TabBadEvaluateConfig record);
 
+    /**
+     * 查询配置
+     * @Title: getBadEvaluateConfig
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @return com.gic.evaluate.entity.TabBadEvaluateConfig
+     * @throws
+     */
     TabBadEvaluateConfig getBadEvaluateConfig(Integer enterpriseId);
 }
\ No newline at end of file

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

@@ -5,6 +5,13 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
+/**
+ * 
+ * @ClassName: TabEvaluateImgMapper
+ * @Description:
+ * @author zhiwj
+ * @date 2020-09-08 18:50
+ */
 public interface TabEvaluateImgMapper {
     /**
      * 根据主键删除
@@ -54,8 +61,26 @@ public interface TabEvaluateImgMapper {
      */
     int updateByPrimaryKey(TabEvaluateImg record);
 
+    /**
+     * listImageByEvaluateId
+     * @Title: listImageByEvaluateId
+     * @Description:
+     * @author zhiwj
+     * @param evaluateId
+     * @return java.util.List<com.gic.evaluate.entity.TabEvaluateImg>
+     * @throws
+     */
     List<TabEvaluateImg> listImageByEvaluateId(@Param("evaluateId") Integer evaluateId);
 
+    /**
+     * listImageByEvaluateReplyId
+     * @Title: listImageByEvaluateReplyId
+     * @Description:
+     * @author zhiwj
+     * @param evaluateReplyId
+     * @return java.util.List<com.gic.evaluate.entity.TabEvaluateImg>
+     * @throws
+     */
     List<TabEvaluateImg> listImageByEvaluateReplyId(@Param("evaluateReplyId") Integer evaluateReplyId);
 
 }
\ No newline at end of file

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

@@ -13,6 +13,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+/**
+ * 
+ * @ClassName: TabEvaluateMapper
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-08 18:50
+ */
 public interface TabEvaluateMapper {
     /**
      * 根据主键删除
@@ -62,53 +69,296 @@ public interface TabEvaluateMapper {
      */
     int updateByPrimaryKey(TabEvaluate record);
 
+    /**
+     * listEvaluate
+     * @Title: listEvaluate
+     * @Description:
+     * @author zhiwj
+     * @param evaluateQO
+     * @return com.github.pagehelper.Page<com.gic.evaluate.entity.TabEvaluate>
+     * @throws
+     */
     Page<TabEvaluate> listEvaluate(EvaluateQO evaluateQO);
 
+    /**
+     * countEvaluate
+     * @Title: countEvaluate
+     * @Description:
+     * @author zhiwj
+     * @param evaluateQO
+     * @return java.lang.Integer
+     * @throws
+     */
     Integer countEvaluate(EvaluateQO evaluateQO);
 
+    /**
+     * updateShowStatus
+     * @Title: updateShowStatus
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param evaluateId
+     * @param showStatus
+     * @return void
+     * @throws
+     */
     void updateShowStatus(@Param("enterpriseId") Integer enterpriseId, @Param("evaluateId") List<Integer> evaluateId, @Param("showStatus") Integer showStatus);
 
+    /**
+     * updateTopHotStatus
+     * @Title: updateTopHotStatus
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param evaluateId
+     * @param topHotStatus
+     * @return void
+     * @throws
+     */
     void updateTopHotStatus(@Param("enterpriseId") Integer enterpriseId, @Param("evaluateId") Integer evaluateId, @Param("topHotStatus") Integer topHotStatus);
 
+    /**
+     * updateMaliciousStatus
+     * @Title: updateMaliciousStatus
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param evaluateId
+     * @param maliciousStatus
+     * @return void
+     * @throws
+     */
     void updateMaliciousStatus(@Param("enterpriseId") Integer enterpriseId, @Param("evaluateId") Integer evaluateId, @Param("maliciousStatus") Integer maliciousStatus);
 
+    /**
+     * getTotalChart
+     * @Title: getTotalChart
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param startTime
+     * @param endTime
+     * @param storeIdList
+     * @return java.util.Map<java.lang.String,java.lang.Long>
+     * @throws
+     */
     Map<String, Long> getTotalChart(@Param("enterpriseId") Integer enterpriseId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("ids") List<Integer> storeIdList);
 
+    /**
+     * getGoodsCountChart
+     * @Title: getGoodsCountChart
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param startTime
+     * @param endTime
+     * @param storeIdList
+     * @return java.util.Map<java.lang.String,java.lang.Long>
+     * @throws
+     */
     Map<String, Long> getGoodsCountChart(@Param("enterpriseId") Integer enterpriseId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("ids") List<Integer> storeIdList);
 
+    /**
+     * getStoreCountChart
+     * @Title: getStoreCountChart
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param startTime
+     * @param endTime
+     * @param storeIdList
+     * @return java.util.Map<java.lang.String,java.lang.Long>
+     * @throws
+     */
     Map<String, Long> getStoreCountChart(@Param("enterpriseId") Integer enterpriseId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("ids") List<Integer> storeIdList);
 
+    /**
+     * getServiceCountChart
+     * @Title: getServiceCountChart
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param startTime
+     * @param endTime
+     * @param storeIdList
+     * @return java.util.Map<java.lang.String,java.lang.Long>
+     * @throws
+     */
     Map<String, Long> getServiceCountChart(@Param("enterpriseId") Integer enterpriseId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("ids") List<Integer> storeIdList);
 
+    /**
+     * listTrendEvaluate
+     * @Title: listTrendEvaluate
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param startTime
+     * @param endTime
+     * @param goodEvaluateStatus
+     * @param storeIdList
+     * @return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+     * @throws
+     */
     List<Map<String, Object>> listTrendEvaluate(@Param("enterpriseId") Integer enterpriseId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("goodEvaluateStatus") Integer goodEvaluateStatus, @Param("ids") List<Integer> storeIdList);
 
+    /**
+     * listStoreScore
+     * @Title: listStoreScore
+     * @Description:
+     * @author zhiwj
+     * @param storeScoreQO
+     * @return com.github.pagehelper.Page<java.util.Map<java.lang.String,java.lang.Object>>
+     * @throws
+     */
     Page<Map<String, Object>> listStoreScore(StoreScoreQO storeScoreQO);
 
+    /**
+     * getTotalStoreScore
+     * @Title: getTotalStoreScore
+     * @Description:
+     * @author zhiwj
+     * @param storeScoreQO
+     * @return java.util.Map<java.lang.String,java.lang.Object>
+     * @throws
+     */
     Map<String, Object> getTotalStoreScore(StoreScoreQO storeScoreQO);
 
+    /**
+     * listTrend
+     * @Title: listTrend
+     * @Description:
+     * @author zhiwj
+     * @param storeTrendQO
+     * @return com.github.pagehelper.Page<java.util.Map<java.lang.String,java.lang.Object>>
+     * @throws
+     */
     Page<Map<String, Object>> listTrend(StoreTrendQO storeTrendQO);
 
+    /**
+     * getEvaluateByOrderId
+     * @Title: getEvaluateByOrderId
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param orderId
+     * @return com.gic.evaluate.entity.TabEvaluate
+     * @throws
+     */
     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);
-
+    /**
+     * listEvaluateTrendByYear
+     * @Title: listEvaluateTrendByYear
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param replyType
+     * @return java.util.Map<java.lang.String,java.util.Map<java.lang.String,java.lang.Object>>
+     * @throws
+     */
     @MapKey("statisticsDate")
     Map<String, Map<String, Object>> listEvaluateTrendByYear(@Param("enterpriseId") Integer enterpriseId, @Param("replyType") Integer replyType);
 
+    /**
+     * listEvaluateTrendByMonth
+     * @Title: listEvaluateTrendByMonth
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param replyType
+     * @param firstDate
+     * @return java.util.Map<java.lang.String,java.util.Map<java.lang.String,java.lang.Object>>
+     * @throws
+     */
     @MapKey("statisticsDate")
     Map<String, Map<String, Object>> listEvaluateTrendByMonth(@Param("enterpriseId") Integer enterpriseId, @Param("replyType") Integer replyType, @Param("firstDate") Date firstDate);
 
+    /**
+     * listEvaluateTrendByDay
+     * @Title: listEvaluateTrendByDay
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param replyType
+     * @param firstDate
+     * @return java.util.Map<java.lang.String,java.util.Map<java.lang.String,java.lang.Object>>
+     * @throws
+     */
     @MapKey("statisticsDate")
     Map<String, Map<String, Object>> listEvaluateTrendByDay(@Param("enterpriseId") Integer enterpriseId, @Param("replyType") Integer replyType, @Param("firstDate") Date firstDate);
 
+    /**
+     * getStoreTopHot
+     * @Title: getStoreTopHot
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param storeId
+     * @return java.lang.Integer
+     * @throws
+     */
     Integer getStoreTopHot(@Param("enterpriseId") Integer enterpriseId, @Param("storeId") Integer storeId);
 
+    /**
+     * listAllEvaluateId
+     * @Title: listAllEvaluateId
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @return java.util.List<java.lang.Integer>
+     * @throws
+     */
     List<Integer> listAllEvaluateId(@Param("enterpriseId") Integer enterpriseId);
 
+    /**
+     * getStoreHasTopHot
+     * @Title: getStoreHasTopHot
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param storeIdList
+     * @return java.util.Set<java.lang.Integer>
+     * @throws
+     */
     Set<Integer> getStoreHasTopHot(@Param("enterpriseId") Integer enterpriseId, @Param("ids") List<Integer> storeIdList);
 
+    /**
+     * countEvaluateTrend
+     * @Title: countEvaluateTrend
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param startTime
+     * @param endTime
+     * @param storeIdList
+     * @param quickReplyType
+     * @return java.lang.Integer
+     * @throws
+     */
     Integer countEvaluateTrend(@Param("enterpriseId") Integer enterpriseId, @Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("ids") List<Integer> storeIdList, @Param("quickReplyType") Integer quickReplyType);
 
+    /**
+     * queryEvaluateCountByStoreId
+     * @Title: queryEvaluateCountByStoreId
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param storeIdList
+     * @return java.util.Map<java.lang.Integer,java.util.Map<java.lang.String,java.lang.Object>>
+     * @throws
+     */
     @MapKey("storeId")
     Map<Integer,Map<String,Object>> queryEvaluateCountByStoreId(@Param("enterpriseId") Integer enterpriseId, @Param("ids") List<Integer> storeIdList);
+
+    /**
+     * getEvaluateByOrderNumber
+     * @Title: getEvaluateByOrderNumber
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param orderNumberList
+     * @return com.gic.evaluate.entity.TabEvaluate
+     * @throws
+     */
+    List<TabEvaluate> listEvaluateByOrderNumber(@Param("enterpriseId") Integer enterpriseId, @Param("ids") List<String> orderNumberList);
 }
\ No newline at end of file

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

@@ -8,6 +8,13 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
+/**
+ * 
+ * @ClassName: TabEvaluateMsgLogMapper
+ * @Description:
+ * @author zhiwj
+ * @date 2020-09-08 18:50
+ */
 public interface TabEvaluateMsgLogMapper {
     /**
      * 根据主键删除
@@ -57,16 +64,80 @@ public interface TabEvaluateMsgLogMapper {
      */
     int updateByPrimaryKey(TabEvaluateMsgLog record);
 
+    /**
+     * getByOrderId
+     * @Title: getByOrderId
+     * @Description:
+     * @author zhiwj
+     * @param orderId
+     * @return com.gic.evaluate.entity.TabEvaluateMsgLog
+     * @throws
+     */
     TabEvaluateMsgLog getByOrderId(Long orderId);
 
+    /**
+     * listFirstMsgLogs
+     * @Title: listFirstMsgLogs
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param startTimeOfDay
+     * @param endTimeOfDay
+     * @return java.util.List<com.gic.evaluate.entity.TabEvaluateMsgLog>
+     * @throws
+     */
     List<TabEvaluateMsgLog> listFirstMsgLogs(@Param("enterpriseId") Integer enterpriseId, @Param("startTimeOfDay") Date startTimeOfDay, @Param("endTimeOfDay") Date endTimeOfDay);
 
+    /**
+     * listSecondMsgLogs
+     * @Title: listSecondMsgLogs
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param startTimeOfDay
+     * @param endTimeOfDay
+     * @return java.util.List<com.gic.evaluate.entity.TabEvaluateMsgLog>
+     * @throws
+     */
     List<TabEvaluateMsgLog> listSecondMsgLogs(@Param("enterpriseId") Integer enterpriseId, @Param("startTimeOfDay") Date startTimeOfDay, @Param("endTimeOfDay") Date endTimeOfDay);
 
+    /**
+     * listReviewMsgLogs
+     * @Title: listReviewMsgLogs
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param startTimeOfDay
+     * @param endTimeOfDay
+     * @return java.util.List<com.gic.evaluate.entity.TabEvaluateMsgLog>
+     * @throws
+     */
     List<TabEvaluateMsgLog> listReviewMsgLogs(@Param("enterpriseId") Integer enterpriseId, @Param("startTimeOfDay") Date startTimeOfDay, @Param("endTimeOfDay") Date endTimeOfDay);
 
+    /**
+     * orderCountByStoreId
+     * @Title: orderCountByStoreId
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param storeIdList
+     * @return java.util.Map<java.lang.Integer,java.util.Map<java.lang.String,java.lang.Object>>
+     * @throws
+     */
     @MapKey("storeId")
     Map<Integer,Map<String,Object>> orderCountByStoreId(@Param("enterpriseId") Integer enterpriseId, @Param("ids") List<Integer> storeIdList);
 
+    /**
+     * listTrendOrderCount
+     * @Title: listTrendOrderCount
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param startTime
+     * @param endTime
+     * @param storeIdList
+     * @return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+     * @throws
+     */
     List<Map<String, Object>> listTrendOrderCount(@Param("enterpriseId") Integer enterpriseId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("ids") List<Integer> storeIdList);
 }
\ No newline at end of file

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

@@ -2,6 +2,13 @@ package com.gic.evaluate.dao.mapper;
 
 import com.gic.evaluate.entity.TabEvaluateOrderConfig;
 
+/**
+ * 
+ * @ClassName: TabEvaluateOrderConfigMapper
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-08 18:50
+ */
 public interface TabEvaluateOrderConfigMapper {
     /**
      * 根据主键删除
@@ -51,5 +58,14 @@ public interface TabEvaluateOrderConfigMapper {
      */
     int updateByPrimaryKey(TabEvaluateOrderConfig record);
 
+    /**
+     * getOrderConfig
+     * @Title: getOrderConfig
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @return com.gic.evaluate.entity.TabEvaluateOrderConfig
+     * @throws
+     */
     TabEvaluateOrderConfig getOrderConfig(Integer enterpriseId);
 }
\ No newline at end of file

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

@@ -6,6 +6,13 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 import java.util.Map;
 
+/**
+ * 
+ * @ClassName: TabEvaluateQuickMapper
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-09 9:22
+ */
 public interface TabEvaluateQuickMapper {
     /**
      * 根据主键删除
@@ -55,13 +62,66 @@ public interface TabEvaluateQuickMapper {
      */
     int updateByPrimaryKey(TabEvaluateQuick record);
 
+    /**
+     * delByEnterpriseId
+     * @Title: delByEnterpriseId
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param quickReplyType
+     * @return void
+     * @throws
+     */
     void delByEnterpriseId(@Param("enterpriseId") Integer enterpriseId, @Param("quickReplyType") Integer quickReplyType);
 
+    /**
+     * insertSelectiveByNotExist
+     * @Title: insertSelectiveByNotExist
+     * @Description:
+     * @author zhiwj
+     * @param tabEvaluateQuick
+     * @return void
+     * @throws
+     */
     void insertSelectiveByNotExist(TabEvaluateQuick tabEvaluateQuick);
 
+    /**
+     * updateStatusByEvaluateQuicks
+     * @Title: updateStatusByEvaluateQuicks
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param evaluateQuick
+     * @param quickReplyType
+     * @return void
+     * @throws
+     */
     void updateStatusByEvaluateQuicks(@Param("enterpriseId") Integer enterpriseId, @Param("evaluateQuick") List<String> evaluateQuick, @Param("quickReplyType") Integer quickReplyType);
 
+    /**
+     * listEvaluateQuick
+     * @Title: listEvaluateQuick
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param quickReplyType
+     * @return java.util.List<com.gic.evaluate.entity.TabEvaluateQuick>
+     * @throws
+     */
     List<TabEvaluateQuick> listEvaluateQuick(@Param("enterpriseId") Integer enterpriseId, @Param("quickReplyType") Integer quickReplyType);
 
+    /**
+     * evaluateQuickChart
+     * @Title: evaluateQuickChart
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param startTime
+     * @param endTime
+     * @param tagType
+     * @param storeIdList
+     * @return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+     * @throws
+     */
     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/TabEvaluateReplyMapper.java

@@ -5,6 +5,13 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
+/**
+ * 
+ * @ClassName: TabEvaluateReplyMapper
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-08 18:58
+ */
 public interface TabEvaluateReplyMapper {
     /**
      * 根据主键删除
@@ -54,9 +61,41 @@ public interface TabEvaluateReplyMapper {
      */
     int updateByPrimaryKey(TabEvaluateReply record);
 
-    List<TabEvaluateReply> listEvaluateReply(@Param("enterpriseId") Integer enterpriseId, @Param("evaluateId") Integer evaluateId, @Param("showStatus") Integer showStatus);
+    /**
+     * listEvaluateReply
+     * @Title: listEvaluateReply
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param evaluateIdList
+     * @param showStatus
+     * @return java.util.List<com.gic.evaluate.entity.TabEvaluateReply>
+     * @throws
+     */
+    List<TabEvaluateReply> listEvaluateReply(@Param("enterpriseId") Integer enterpriseId, @Param("ids") List<Integer> evaluateIdList, @Param("showStatus") Integer showStatus);
 
+    /**
+     * updateReplyShowStatus
+     * @Title: updateReplyShowStatus
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param evaluateReplyId
+     * @param showStatus
+     * @return void
+     * @throws
+     */
     void updateReplyShowStatus(@Param("enterpriseId") Integer enterpriseId, @Param("evaluateReplyId") Integer evaluateReplyId, @Param("showStatus") Integer showStatus);
 
+    /**
+     * countReviewReplyByMember
+     * @Title: countReviewReplyByMember
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param evaluateId
+     * @return java.lang.Integer
+     * @throws
+     */
     Integer countReviewReplyByMember(@Param("enterpriseId") Integer enterpriseId, @Param("evaluateId") Integer evaluateId);
 }
\ No newline at end of file

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

@@ -5,6 +5,13 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
+/**
+ * 
+ * @ClassName: TabEvaluateTagsMapper
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-08 19:01
+ */
 public interface TabEvaluateTagsMapper {
     /**
      * 根据主键删除
@@ -54,5 +61,16 @@ public interface TabEvaluateTagsMapper {
      */
     int updateByPrimaryKey(TabEvaluateTags record);
 
-    List<TabEvaluateTags> listEvaluateTags(@Param("enterpriseId") Integer enterpriseId, @Param("evaluateId") Integer evaluateId, @Param("evaluateReplyId") Integer evaluateReplyId);
+    /**
+     * listEvaluateTags
+     * @Title: listEvaluateTags
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param evaluateIdList
+     * @param evaluateReplyIdList
+     * @return java.util.List<com.gic.evaluate.entity.TabEvaluateTags>
+     * @throws
+     */
+    List<TabEvaluateTags> listEvaluateTags(@Param("enterpriseId") Integer enterpriseId, @Param("evaluateIdList") List<Integer> evaluateIdList, @Param("evaluateReplyIdList") List<Integer> evaluateReplyIdList);
 }
\ No newline at end of file

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

@@ -4,6 +4,13 @@ import com.gic.evaluate.entity.TabProblemImg;
 
 import java.util.List;
 
+/**
+ * 
+ * @ClassName: TabProblemImgMapper
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-08 19:16
+ */
 public interface TabProblemImgMapper {
     /**
      * 根据主键删除
@@ -53,7 +60,25 @@ public interface TabProblemImgMapper {
      */
     int updateByPrimaryKey(TabProblemImg record);
 
+    /**
+     * listImageByProblemId
+     * @Title: listImageByProblemId
+     * @Description:
+     * @author zhiwj
+     * @param problemId
+     * @return java.util.List<com.gic.evaluate.entity.TabProblemImg>
+     * @throws
+     */
     List<TabProblemImg> listImageByProblemId(Integer problemId);
 
+    /**
+     * listImageByProblemReplyId
+     * @Title: listImageByProblemReplyId
+     * @Description:
+     * @author zhiwj
+     * @param problemReplyId
+     * @return java.util.List<com.gic.evaluate.entity.TabProblemImg>
+     * @throws
+     */
     List<TabProblemImg> listImageByProblemReplyId(Integer problemReplyId);
 }
\ No newline at end of file

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

@@ -9,6 +9,13 @@ import org.apache.ibatis.annotations.Param;
 import java.util.Date;
 import java.util.List;
 
+/**
+ * 
+ * @ClassName: TabProblemMapper
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-08 19:05
+ */
 public interface TabProblemMapper {
     /**
      * 根据主键删除
@@ -58,10 +65,37 @@ public interface TabProblemMapper {
      */
     int updateByPrimaryKey(TabProblem record);
 
+    /**
+     * listProblem
+     * @Title: listProblem
+     * @Description:
+     * @author zhiwj
+     * @param problemQO
+     * @return com.github.pagehelper.Page<com.gic.evaluate.entity.TabProblem>
+     * @throws
+     */
     Page<TabProblem> listProblem(ProblemQO problemQO);
 
+    /**
+     * countProblem
+     * @Title: countProblem
+     * @Description:
+     * @author zhiwj
+     * @param problemQO
+     * @return java.lang.Integer
+     * @throws
+     */
     Integer countProblem(ProblemQO problemQO);
 
+    /**
+     * listProblemByAcuId
+     * @Title: listProblemByAcuId
+     * @Description:
+     * @author zhiwj
+     * @param acuId
+     * @return java.util.List<com.gic.evaluate.dto.ProblemDTO>
+     * @throws
+     */
     List<ProblemDTO> listProblemByAcuId(@Param("acuId") Long acuId);
 
     /**

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

@@ -5,6 +5,13 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
+/**
+ * 
+ * @ClassName: TabProblemReplyMapper
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-08 18:50
+ */
 public interface TabProblemReplyMapper {
     /**
      * 根据主键删除
@@ -54,7 +61,25 @@ public interface TabProblemReplyMapper {
      */
     int updateByPrimaryKey(TabProblemReply record);
 
+    /**
+     * listReply
+     * @Title: listReply
+     * @Description:
+     * @author zhiwj
+     * @param problemId
+     * @return java.util.List<com.gic.evaluate.entity.TabProblemReply>
+     * @throws
+     */
     List<TabProblemReply> listReply(Integer problemId);
 
+    /**
+     * firstReplyByProblemId
+     * @Title: firstReplyByProblemId
+     * @Description:
+     * @author zhiwj
+     * @param problemIdList
+     * @return java.util.List<com.gic.evaluate.entity.TabProblemReply>
+     * @throws
+     */
     List<TabProblemReply> firstReplyByProblemId(@Param("ids") List<Integer> problemIdList);
 }
\ No newline at end of file

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

@@ -5,6 +5,13 @@ import java.util.Date;
 /**
  * tab_bad_evaluate_config
  */
+/**
+ * 
+ * @ClassName: TabBadEvaluateConfig
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-08 18:50
+ */
 public class TabBadEvaluateConfig {
     /**
      * 

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

@@ -5,6 +5,13 @@ import java.util.Date;
 /**
  * tab_evaluate
  */
+/**
+ * 
+ * @ClassName: TabEvaluate
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-08 18:50
+ */
 public class TabEvaluate {
     /**
      * 

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

@@ -5,6 +5,13 @@ import java.util.Date;
 /**
  * tab_evaluate_img
  */
+/**
+ * 
+ * @ClassName: TabEvaluateImg
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-08 18:50
+ */
 public class TabEvaluateImg {
     /**
      * 

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

@@ -7,6 +7,13 @@ import java.util.Date;
 /**
  * tab_evaluate_msg_log
  */
+/**
+ * 
+ * @ClassName: TabEvaluateMsgLog
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-08 18:50
+ */
 public class TabEvaluateMsgLog {
     /**
      * 订单消息发送日志ID

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

@@ -5,6 +5,13 @@ import java.util.Date;
 /**
  * tab_evaluate_order_config
  */
+/**
+ * 
+ * @ClassName: TabEvaluateOrderConfig
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-08 18:50
+ */
 public class TabEvaluateOrderConfig {
     /**
      * 

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

@@ -5,6 +5,13 @@ import java.util.Date;
 /**
  * tab_evaluate_quick
  */
+/**
+ * 
+ * @ClassName: TabEvaluateQuick
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-08 18:58
+ */
 public class TabEvaluateQuick {
     /**
      * 快捷标签id

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

@@ -5,6 +5,13 @@ import java.util.Date;
 /**
  * tab_evaluate_reply
  */
+/**
+ * 
+ * @ClassName: TabEvaluateReply
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-08 18:58
+ */
 public class TabEvaluateReply {
     /**
      * 

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

@@ -5,6 +5,13 @@ import java.util.Date;
 /**
  * tab_evaluate_tags
  */
+/**
+ * 
+ * @ClassName: TabEvaluateTags
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-08 18:59
+ */
 public class TabEvaluateTags {
     /**
      * 评价快捷标签统计表ID

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

@@ -5,6 +5,13 @@ import java.util.Date;
 /**
  * tab_problem
  */
+/**
+ * 
+ * @ClassName: TabProblem
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-08 19:01
+ */
 public class TabProblem {
     /**
      * 投诉与建议

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

@@ -4,7 +4,13 @@ import java.util.Date;
 
 /**
  * tab_problem_img
- */
+ *//**
+  * 
+  * @ClassName: TabProblemImg
+  * @Description:
+  * @author zhiwj
+  * @date 2020-09-08 18:50
+  */
 public class TabProblemImg {
     /**
      * 

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

@@ -5,6 +5,13 @@ import java.util.Date;
 /**
  * tab_problem_reply
  */
+/**
+ * 
+ * @ClassName: TabProblemReply
+ * @Description:  
+ * @author zhiwj
+ * @date 2020-09-08 19:06
+ */
 public class TabProblemReply {
     /**
      * 

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

@@ -10,9 +10,39 @@ import com.gic.evaluate.entity.TabBadEvaluateConfig;
  * @date 2019-12-25 17:47
  */
 public interface BadEvaluateConfigService {
+
+    /**
+     * init
+     * @Title: init
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @return void
+     * @throws
+     */
     void init(Integer enterpriseId);
 
+
+    /**
+     * updateBadEvaluateConfig
+     * @Title: updateBadEvaluateConfig
+     * @Description:
+     * @author zhiwj
+     * @param badEvaluateConfigDTO
+     * @return void
+     * @throws
+     */
     void updateBadEvaluateConfig(BadEvaluateConfigDTO badEvaluateConfigDTO);
 
+
+    /**
+     * getBadEvaluateConfig
+     * @Title: getBadEvaluateConfig
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @return com.gic.evaluate.entity.TabBadEvaluateConfig
+     * @throws
+     */
     TabBadEvaluateConfig getBadEvaluateConfig(Integer enterpriseId);
 }

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

@@ -10,11 +10,52 @@ import java.util.List;
  * @date 2020-01-02 11:10
  */
 public interface EvaluateImgService {
+    /**
+     * listImageByEvaluateId
+     * @Title: listImageByEvaluateId
+     * @Description:
+     * @author zhiwj
+     * @param evaluateId
+     * @return java.util.List<com.gic.evaluate.entity.TabEvaluateImg>
+     * @throws
+     */
     List<TabEvaluateImg> listImageByEvaluateId(Integer evaluateId);
 
+    /**
+     * listImageByEvaluateReplyId
+     * @Title: listImageByEvaluateReplyId
+     * @Description:
+     * @author zhiwj
+     * @param evaluateReplyId
+     * @return java.util.List<com.gic.evaluate.entity.TabEvaluateImg>
+     * @throws
+     */
     List<TabEvaluateImg> listImageByEvaluateReplyId(Integer evaluateReplyId);
 
+    /**
+     * saveList
+     * @Title: saveList
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param evaluateId
+     * @param imgUrlList
+     * @return void
+     * @throws
+     */
     void saveList(Integer enterpriseId, Integer evaluateId, List<String> imgUrlList);
 
+    /**
+     * saveList
+     * @Title: saveList
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param evaluateId
+     * @param evaluateReplyId
+     * @param imgUrlList
+     * @return void
+     * @throws
+     */
     void saveList(Integer enterpriseId, Integer evaluateId, Integer evaluateReplyId, List<String> imgUrlList);
 }

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

@@ -12,19 +12,95 @@ import java.util.Map;
  * @date 2020/2/6 13:41
  */
 public interface EvaluateMsgLogService {
+    /**
+     * save
+     * @Title: save
+     * @Description:
+     * @author zhiwj
+     * @param evaluateMsgLog
+     * @return void
+     * @throws
+     */
     void save(TabEvaluateMsgLog evaluateMsgLog);
 
+    /**
+     * getByOrderId
+     * @Title: getByOrderId
+     * @Description:
+     * @author zhiwj
+     * @param orderId
+     * @return com.gic.evaluate.entity.TabEvaluateMsgLog
+     * @throws
+     */
     TabEvaluateMsgLog getByOrderId(Long orderId);
 
+    /**
+     * listFirstMsgLogs
+     * @Title: listFirstMsgLogs
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @return java.util.List<com.gic.evaluate.entity.TabEvaluateMsgLog>
+     * @throws
+     */
     List<TabEvaluateMsgLog> listFirstMsgLogs(Integer enterpriseId);
 
+    /**
+     * listSecondMsgLogs
+     * @Title: listSecondMsgLogs
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @return java.util.List<com.gic.evaluate.entity.TabEvaluateMsgLog>
+     * @throws
+     */
     List<TabEvaluateMsgLog> listSecondMsgLogs(Integer enterpriseId);
 
+    /**
+     * listReviewMsgLogs
+     * @Title: listReviewMsgLogs
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @return java.util.List<com.gic.evaluate.entity.TabEvaluateMsgLog>
+     * @throws
+     */
     List<TabEvaluateMsgLog> listReviewMsgLogs(Integer enterpriseId);
 
+    /**
+     * update
+     * @Title: update
+     * @Description:
+     * @author zhiwj
+     * @param log
+     * @return void
+     * @throws
+     */
     void update(TabEvaluateMsgLog log);
 
+    /**
+     * orderCountByStoreId
+     * @Title: orderCountByStoreId
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param storeIdList
+     * @return java.util.Map<java.lang.Integer,java.util.Map<java.lang.String,java.lang.Object>>
+     * @throws
+     */
     Map<Integer,Map<String,Object>> orderCountByStoreId(Integer enterpriseId, List<Integer> storeIdList);
 
+    /**
+     * listTrendOrderCount
+     * @Title: listTrendOrderCount
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param startTime
+     * @param endTime
+     * @param storeIdList
+     * @return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+     * @throws
+     */
     List<Map<String, Object>> listTrendOrderCount(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
 }

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

@@ -10,9 +10,36 @@ import com.gic.evaluate.entity.TabEvaluateOrderConfig;
  * @date 2019-12-25 17:45
  */
 public interface EvaluateOrderConfigService {
+    /**
+     * init
+     * @Title: init
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @return void
+     * @throws
+     */
     void init(Integer enterpriseId);
 
+    /**
+     * updateOrderConfig
+     * @Title: updateOrderConfig
+     * @Description:
+     * @author zhiwj
+     * @param evaluateOrderConfigDTO
+     * @return void
+     * @throws
+     */
     void updateOrderConfig(EvaluateOrderConfigDTO evaluateOrderConfigDTO);
 
+    /**
+     * getEvaluateOrderConfig
+     * @Title: getEvaluateOrderConfig
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @return com.gic.evaluate.entity.TabEvaluateOrderConfig
+     * @throws
+     */
     TabEvaluateOrderConfig getEvaluateOrderConfig(Integer enterpriseId);
 }

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

@@ -13,13 +13,67 @@ import java.util.Map;
  */
 public interface EvaluateQuickService {
 
+    /**
+     * saveEvaluateQuick
+     * @Title: saveEvaluateQuick
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param evaluateQuick
+     * @param quickReplyType
+     * @return void
+     * @throws
+     */
     void saveEvaluateQuick(Integer enterpriseId, List<String> evaluateQuick, Integer quickReplyType);
 
+    /**
+     * listEvaluateQuick
+     * @Title: listEvaluateQuick
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param quickReplyType
+     * @return java.util.List<com.gic.evaluate.entity.TabEvaluateQuick>
+     * @throws
+     */
     List<TabEvaluateQuick> listEvaluateQuick(Integer enterpriseId, Integer quickReplyType);
 
+    /**
+     * getById
+     * @Title: getById
+     * @Description:
+     * @author zhiwj
+     * @param quickTagsId
+     * @return com.gic.evaluate.entity.TabEvaluateQuick
+     * @throws
+     */
     TabEvaluateQuick getById(Integer quickTagsId);
 
+    /**
+     * evaluateGoodQuickChart
+     * @Title: evaluateGoodQuickChart
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param startTime
+     * @param endTime
+     * @param storeIdList
+     * @return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+     * @throws
+     */
     List<Map<String, Object>> evaluateGoodQuickChart(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
 
+    /**
+     * evaluateBadQuickChart
+     * @Title: evaluateBadQuickChart
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param startTime
+     * @param endTime
+     * @param storeIdList
+     * @return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+     * @throws
+     */
     List<Map<String, Object>> evaluateBadQuickChart(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
 }

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

@@ -14,17 +14,98 @@ import java.util.List;
  */
 public interface EvaluateReplyService {
 
+    /**
+     * listEvaluateReply
+     * @Title: listEvaluateReply
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param evaluateId
+     * @param showStatus
+     * @return java.util.List<com.gic.evaluate.entity.TabEvaluateReply>
+     * @throws
+     */
     List<TabEvaluateReply> listEvaluateReply(Integer enterpriseId, Integer evaluateId, Integer showStatus);
+    
+    /**
+     * listEvaluateReply 
+     * @Title: listEvaluateReply
+     * @Description: 
+     * @author zhiwj 
+     * @param enterpriseId
+     * @param evaluateIdList
+     * @param showStatus
+     * @return java.util.List<com.gic.evaluate.entity.TabEvaluateReply>
+     * @throws 
+     */
+    List<TabEvaluateReply> listEvaluateReply(Integer enterpriseId, List<Integer> evaluateIdList, Integer showStatus);
 
+    /**
+     * countReviewReplyByMember
+     * @Title: countReviewReplyByMember
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param evaluateId
+     * @return java.lang.Integer
+     * @throws
+     */
     Integer countReviewReplyByMember(Integer enterpriseId, Integer evaluateId);
 
+    /**
+     * saveUserReplyEvaluate
+     * @Title: saveUserReplyEvaluate
+     * @Description:
+     * @author zhiwj
+     * @param userReplyDTO
+     * @return java.lang.Integer
+     * @throws
+     */
     Integer saveUserReplyEvaluate(UserReplyDTO userReplyDTO);
 
+    /**
+     * saveMemberReplyEvaluate
+     * @Title: saveMemberReplyEvaluate
+     * @Description:
+     * @author zhiwj
+     * @param memberReplyDTO
+     * @return java.lang.Integer
+     * @throws
+     */
     Integer saveMemberReplyEvaluate(MemberReplyDTO memberReplyDTO);
 
+    /**
+     * delReply
+     * @Title: delReply
+     * @Description:
+     * @author zhiwj
+     * @param evaluateReplyId
+     * @return void
+     * @throws
+     */
     void delReply(Integer evaluateReplyId);
 
+    /**
+     * updateReplyShowStatus
+     * @Title: updateReplyShowStatus
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param evaluateReplyId
+     * @param showStatus
+     * @return void
+     * @throws
+     */
     void updateReplyShowStatus(Integer enterpriseId, Integer evaluateReplyId, Integer showStatus);
 
+    /**
+     * update
+     * @Title: update
+     * @Description:
+     * @author zhiwj
+     * @param userReplyDTO
+     * @return void
+     * @throws
+     */
     void update(UserReplyDTO userReplyDTO);
 }

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

@@ -19,63 +19,360 @@ import java.util.Set;
  * @date 2019-12-27 9:51
  */
 public interface EvaluateService {
+    /**
+     * listEvaluate
+     * @Title: listEvaluate
+     * @Description:
+     * @author zhiwj
+     * @param evaluateQO
+     * @return com.github.pagehelper.Page<com.gic.evaluate.entity.TabEvaluate>
+     * @throws
+     */
     Page<TabEvaluate> listEvaluate(EvaluateQO evaluateQO);
 
+    /**
+     * listEvaluateNearByStore
+     * @Title: listEvaluateNearByStore
+     * @Description:
+     * @author zhiwj
+     * @param evaluateQO
+     * @return com.github.pagehelper.Page<com.gic.evaluate.entity.TabEvaluate>
+     * @throws
+     */
     Page<TabEvaluate> listEvaluateNearByStore(EvaluateQO evaluateQO);
 
+    /**
+     * countEvaluate
+     * @Title: countEvaluate
+     * @Description:
+     * @author zhiwj
+     * @param evaluateQO
+     * @return java.lang.Integer
+     * @throws
+     */
     Integer countEvaluate(EvaluateQO evaluateQO);
 
+    /**
+     * getEvaluate
+     * @Title: getEvaluate
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param evaluateId
+     * @return com.gic.evaluate.entity.TabEvaluate
+     * @throws
+     */
     TabEvaluate getEvaluate(Integer enterpriseId, Integer evaluateId);
 
+    /**
+     * saveEvaluate
+     * @Title: saveEvaluate
+     * @Description:
+     * @author zhiwj
+     * @param evaluateDTO
+     * @return java.lang.Integer
+     * @throws
+     */
     Integer saveEvaluate(EvaluateDTO evaluateDTO);
 
+    /**
+     * updateShowStatus
+     * @Title: updateShowStatus
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param evaluateId
+     * @param showStatus
+     * @return void
+     * @throws
+     */
     void updateShowStatus(Integer enterpriseId, List<Integer> evaluateId, Integer showStatus);
 
+    /**
+     * updateTopHotStatus
+     * @Title: updateTopHotStatus
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param evaluateId
+     * @param topHotStatus
+     * @return void
+     * @throws
+     */
     void updateTopHotStatus(Integer enterpriseId, Integer evaluateId, Integer topHotStatus);
 
+    /**
+     * updateMaliciousStatus
+     * @Title: updateMaliciousStatus
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param evaluateId
+     * @param maliciousStatus
+     * @return void
+     * @throws
+     */
     void updateMaliciousStatus(Integer enterpriseId, Integer evaluateId, Integer maliciousStatus);
 
+    /**
+     * getTotalCountChart
+     * @Title: getTotalCountChart
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param startTime
+     * @param endTime
+     * @param storeIdList
+     * @return java.util.Map<java.lang.String,java.lang.Long>
+     * @throws
+     */
     Map<String, Long> getTotalCountChart(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
 
+    /**
+     * getGoodsCountChart
+     * @Title: getGoodsCountChart
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param startTime
+     * @param endTime
+     * @param storeIdList
+     * @return java.util.Map<java.lang.String,java.lang.Long>
+     * @throws
+     */
     Map<String, Long> getGoodsCountChart(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
 
+    /**
+     * getStoreCountChart
+     * @Title: getStoreCountChart
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param startTime
+     * @param endTime
+     * @param storeIdList
+     * @return java.util.Map<java.lang.String,java.lang.Long>
+     * @throws
+     */
     Map<String, Long> getStoreCountChart(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
 
+    /**
+     * getServiceCountChart
+     * @Title: getServiceCountChart
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param startTime
+     * @param endTime
+     * @param storeIdList
+     * @return java.util.Map<java.lang.String,java.lang.Long>
+     * @throws
+     */
     Map<String, Long> getServiceCountChart(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
 
+    /**
+     * listTrendTotalEvaluate
+     * @Title: listTrendTotalEvaluate
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param startTime
+     * @param endTime
+     * @param storeIdList
+     * @return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+     * @throws
+     */
     List<Map<String, Object>> listTrendTotalEvaluate(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
 
+    /**
+     * listTrendGoodEvaluate
+     * @Title: listTrendGoodEvaluate
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param startTime
+     * @param endTime
+     * @param storeIdList
+     * @return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+     * @throws
+     */
     List<Map<String, Object>> listTrendGoodEvaluate(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList);
 
+    /**
+     * listStoreScore
+     * @Title: listStoreScore
+     * @Description:
+     * @author zhiwj
+     * @param storeScoreQO
+     * @return com.github.pagehelper.Page<java.util.Map<java.lang.String,java.lang.Object>>
+     * @throws
+     */
     Page<Map<String, Object>> listStoreScore(StoreScoreQO storeScoreQO);
 
+    /**
+     * getTotalStoreScore
+     * @Title: getTotalStoreScore
+     * @Description:
+     * @author zhiwj
+     * @param storeScoreQO
+     * @return java.util.Map<java.lang.String,java.lang.Object>
+     * @throws
+     */
     Map<String, Object> getTotalStoreScore(StoreScoreQO storeScoreQO);
 
+    /**
+     * listTrend
+     * @Title: listTrend
+     * @Description:
+     * @author zhiwj
+     * @param storeTrendQO
+     * @return com.github.pagehelper.Page<java.util.Map<java.lang.String,java.lang.Object>>
+     * @throws
+     */
     Page<Map<String, Object>> listTrend(StoreTrendQO storeTrendQO);
 
+    /**
+     * getEvaluateByOrderId
+     * @Title: getEvaluateByOrderId
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param orderId
+     * @return com.gic.evaluate.entity.TabEvaluate
+     * @throws
+     */
     TabEvaluate getEvaluateByOrderId(Integer enterpriseId, Long orderId);
 
+    /**
+     * updateEvaluate
+     * @Title: updateEvaluate
+     * @Description:
+     * @author zhiwj
+     * @param evaluateDTO
+     * @return void
+     * @throws
+     */
     void updateEvaluate(EvaluateDTO evaluateDTO);
 
-//    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);
-
+    /**
+     * listEvaluateTrendByYear
+     * @Title: listEvaluateTrendByYear
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param replyType
+     * @return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+     * @throws
+     */
     List<Map<String, Object>> listEvaluateTrendByYear(Integer enterpriseId, Integer replyType);
 
+    /**
+     * listEvaluateTrendByMonth
+     * @Title: listEvaluateTrendByMonth
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param replyType
+     * @return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+     * @throws
+     */
     List<Map<String, Object>> listEvaluateTrendByMonth(Integer enterpriseId, Integer replyType);
 
+    /**
+     * listEvaluateTrendByDay
+     * @Title: listEvaluateTrendByDay
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param replyType
+     * @return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+     * @throws
+     */
     List<Map<String, Object>> listEvaluateTrendByDay(Integer enterpriseId, Integer replyType);
 
+    /**
+     * getStoreTopHot
+     * @Title: getStoreTopHot
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param storeId
+     * @return java.lang.Integer
+     * @throws
+     */
     Integer getStoreTopHot(Integer enterpriseId, Integer storeId);
 
+    /**
+     * listAllEvaluateId
+     * @Title: listAllEvaluateId
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @return java.util.List<java.lang.Integer>
+     * @throws
+     */
     List<Integer> listAllEvaluateId(Integer enterpriseId);
 
+    /**
+     * getStoreIdHasTopHot
+     * @Title: getStoreIdHasTopHot
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param storeIdList
+     * @return java.util.Set<java.lang.Integer>
+     * @throws
+     */
     Set<Integer> getStoreIdHasTopHot(Integer enterpriseId, List<Integer> storeIdList);
 
+    /**
+     * countEvaluateTrend
+     * @Title: countEvaluateTrend
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param startTime
+     * @param endTime
+     * @param storeIdList
+     * @param quickReplyTypeEnumCode
+     * @return java.lang.Integer
+     * @throws
+     */
     Integer countEvaluateTrend(Integer enterpriseId, Date startTime, Date endTime , List<Integer> storeIdList, Integer quickReplyTypeEnumCode);
 
+    /**
+     * hasMaliciousStatusBeforeHours
+     * @Title: hasMaliciousStatusBeforeHours
+     * @Description:
+     * @author zhiwj
+     * @param evaluateId
+     * @param badEvaluateTagType
+     * @return boolean
+     * @throws
+     */
     boolean hasMaliciousStatusBeforeHours(Integer evaluateId, Integer badEvaluateTagType);
 
+    /**
+     * queryEvaluateCountByStoreId
+     * @Title: queryEvaluateCountByStoreId
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param storeIdList
+     * @return java.util.Map<java.lang.Integer,java.util.Map<java.lang.String,java.lang.Object>>
+     * @throws
+     */
     Map<Integer,Map<String,Object>> queryEvaluateCountByStoreId(Integer enterpriseId, List<Integer> storeIdList);
+
+    /**
+     * getEvaluateByOrderNumberList 按订单号list批量查评价
+     * @Title: getEvaluateByOrderNumberList
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param orderNumberList
+     * @return java.util.List<com.gic.evaluate.dto.EvaluateDTO>
+     * @throws
+     */
+    List<TabEvaluate> listEvaluateByOrderNumber(Integer enterpriseId, List<String> orderNumberList);
 }

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

@@ -10,12 +10,83 @@ import java.util.List;
  * @date 2020-02-28 13:52
  */
 public interface EvaluateTagsService {
+    /**
+     * 保存快评
+     * @Title: saveQuick
+     * @Description:
+     * @author zhiwj
+     * @param quickTagsId
+     * @param enterpriseId
+     * @param evaluateId
+     * @param memberId
+     * @return void
+     * @throws
+     */
     void saveQuick(Integer quickTagsId, Integer enterpriseId, Integer evaluateId, Long memberId);
 
+    /**
+     * 保存快评
+     * @Title: saveQuick
+     * @Description:
+     * @author zhiwj
+     * @param quickTagsId
+     * @param enterpriseId
+     * @param evaluateId
+     * @param evaluateReplyId
+     * @param memberId
+     * @return void
+     * @throws
+     */
     void saveQuick(Integer quickTagsId, Integer enterpriseId, Integer evaluateId, Integer evaluateReplyId, Long memberId);
 
+    /**
+     * listEvaluateTags
+     * @Title: listEvaluateTags
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param evaluateId
+     * @return java.util.List<com.gic.evaluate.entity.TabEvaluateTags>
+     * @throws
+     */
     List<TabEvaluateTags> listEvaluateTags(Integer enterpriseId, Integer evaluateId);
 
-    List<TabEvaluateTags> listEvaluateTags(Integer enterpriseId, Integer evaluateId, Integer evaluateReplyId);
+    /**
+     * listEvaluateTags
+     * @Title: listEvaluateTags
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param evaluateIdList
+     * @return java.util.List<com.gic.evaluate.entity.TabEvaluateTags>
+     * @throws
+     */
+    List<TabEvaluateTags> listEvaluateTags(Integer enterpriseId, List<Integer> evaluateIdList);
+
+    /**
+     * listEvaluateTags
+     * @Title: listEvaluateTags
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param evaluateIdList
+     * @param evaluateReplyId
+     * @return java.util.List<com.gic.evaluate.entity.TabEvaluateTags>
+     * @throws
+     */
+    List<TabEvaluateTags> listEvaluateTags(Integer enterpriseId, Integer evaluateIdList, Integer evaluateReplyId);
+    
+    /**
+     * listEvaluateTags 
+     * @Title: listEvaluateTags
+     * @Description: 
+     * @author zhiwj 
+     * @param enterpriseId
+     * @param evaluateIdList
+     * @param evaluateReplyId
+     * @return java.util.List<com.gic.evaluate.entity.TabEvaluateTags>
+     * @throws 
+     */
+    List<TabEvaluateTags> listEvaluateTags(Integer enterpriseId, List<Integer> evaluateIdList, List<Integer> evaluateReplyId);
 
 }

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

@@ -10,11 +10,52 @@ import java.util.List;
  * @date 2020-01-02 11:10
  */
 public interface ProblemImgService {
+    /**
+     * listImageByProblemId
+     * @Title: listImageByProblemId
+     * @Description:
+     * @author zhiwj
+     * @param problemId
+     * @return java.util.List<com.gic.evaluate.entity.TabProblemImg>
+     * @throws
+     */
     List<TabProblemImg> listImageByProblemId(Integer problemId);
 
+    /**
+     * listImageByProblemReplyId
+     * @Title: listImageByProblemReplyId
+     * @Description:
+     * @author zhiwj
+     * @param problemReplyId
+     * @return java.util.List<com.gic.evaluate.entity.TabProblemImg>
+     * @throws
+     */
     List<TabProblemImg> listImageByProblemReplyId(Integer problemReplyId);
 
+    /**
+     * saveList
+     * @Title: saveList
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param problemId
+     * @param imgUrlList
+     * @return void
+     * @throws
+     */
     void saveList(Integer enterpriseId, Integer problemId, List<String> imgUrlList);
 
+    /**
+     * saveList
+     * @Title: saveList
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param problemId
+     * @param problemReplyId
+     * @param imgUrlList
+     * @return void
+     * @throws
+     */
     void saveList(Integer enterpriseId, Integer problemId, Integer problemReplyId, List<String> imgUrlList);
 }

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

@@ -13,13 +13,58 @@ import java.util.Map;
  * @date 2020-01-02 11:10
  */
 public interface ProblemReplyService {
+    /**
+     * listReply
+     * @Title: listReply
+     * @Description:
+     * @author zhiwj
+     * @param problemId
+     * @return java.util.List<com.gic.evaluate.dto.ProblemReplyDTO>
+     * @throws
+     */
     List<ProblemReplyDTO> listReply(Integer problemId);
 
+    /**
+     * save
+     * @Title: save
+     * @Description:
+     * @author zhiwj
+     * @param problemUserReplyDTO
+     * @return void
+     * @throws
+     */
     void save(ProblemUserReplyDTO problemUserReplyDTO);
 
+    /**
+     * save
+     * @Title: save
+     * @Description:
+     * @author zhiwj
+     * @param problemMemberReplyDTO
+     * @return int
+     * @throws
+     */
     int save(ProblemMemberReplyDTO problemMemberReplyDTO);
 
+    /**
+     * update
+     * @Title: update
+     * @Description:
+     * @author zhiwj
+     * @param problemReplyDTO
+     * @return void
+     * @throws
+     */
     void update(ProblemReplyDTO problemReplyDTO);
 
+    /**
+     * firstReplyByProblemId
+     * @Title: firstReplyByProblemId
+     * @Description:
+     * @author zhiwj
+     * @param problemIdList
+     * @return java.util.Map<java.lang.Integer,java.lang.String>
+     * @throws
+     */
     Map<Integer, String> firstReplyByProblemId(List<Integer> problemIdList);
 }

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

@@ -13,19 +13,92 @@ import java.util.List;
  * @date 2020-01-02 11:10
  */
 public interface ProblemService {
+    /**
+     * listProblem
+     * @Title: listProblem
+     * @Description:
+     * @author zhiwj
+     * @param problemQO
+     * @return com.github.pagehelper.Page<com.gic.evaluate.entity.TabProblem>
+     * @throws
+     */
     Page<TabProblem> listProblem(ProblemQO problemQO);
 
+    /**
+     * getProblem
+     * @Title: getProblem
+     * @Description:
+     * @author zhiwj
+     * @param problemId
+     * @return com.gic.evaluate.entity.TabProblem
+     * @throws
+     */
     TabProblem getProblem(Integer problemId);
 
+    /**
+     * updateProblem
+     * @Title: updateProblem
+     * @Description:
+     * @author zhiwj
+     * @param problemDTO
+     * @return void
+     * @throws
+     */
     void updateProblem(ProblemDTO problemDTO);
 
+    /**
+     * save
+     * @Title: save
+     * @Description:
+     * @author zhiwj
+     * @param problemDTO
+     * @return java.lang.Integer
+     * @throws
+     */
     Integer save(ProblemDTO problemDTO);
 
+    /**
+     * listProblem
+     * @Title: listProblem
+     * @Description:
+     * @author zhiwj
+     * @param acuId
+     * @return java.util.List<com.gic.evaluate.dto.ProblemDTO>
+     * @throws
+     */
     List<ProblemDTO> listProblem(Long acuId);
 
+    /**
+     * endProblem
+     * @Title: endProblem
+     * @Description:
+     * @author zhiwj
+     * @param problemId
+     * @return void
+     * @throws
+     */
     void endProblem(Integer problemId);
 
+    /**
+     * countProblem
+     * @Title: countProblem
+     * @Description:
+     * @author zhiwj
+     * @param problemQO
+     * @return java.lang.Integer
+     * @throws
+     */
     Integer countProblem(ProblemQO problemQO);
 
+    /**
+     * hasMaliciousStatusByAcuIdBeforeHours
+     * @Title: hasMaliciousStatusByAcuIdBeforeHours
+     * @Description:
+     * @author zhiwj
+     * @param acuId
+     * @param badSuggestionTagType
+     * @return boolean
+     * @throws
+     */
     boolean hasMaliciousStatusByAcuIdBeforeHours(Long acuId, Integer badSuggestionTagType);
 }

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

@@ -35,8 +35,6 @@ public class EvaluateOrderConfigServiceImpl implements EvaluateOrderConfigServic
         evaluateOrderConfig.setEvaluateLimitday(30);
         evaluateOrderConfig.setDefaultContent("默认好评！");
         evaluateOrderConfig.setReview(Constants.OPEN);
-//        evaluateOrderConfig.setReviewRemind(10);
-//        evaluateOrderConfig.setReviewLimitday(90);
         evaluateOrderConfig.setReviewUserHidden(Constants.OPEN);
         evaluateOrderConfig.setReviewTimes(1);
         evaluateOrderConfig.setCommentModule(1);

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

@@ -10,6 +10,7 @@ import com.gic.evaluate.service.EvaluateReplyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -27,7 +28,12 @@ public class EvaluateReplyServiceImpl implements EvaluateReplyService {
 
     @Override
     public List<TabEvaluateReply> listEvaluateReply(Integer enterpriseId, Integer evaluateId, Integer showStatus) {
-        return tabEvaluateReplyMapper.listEvaluateReply(enterpriseId, evaluateId, showStatus);
+        return tabEvaluateReplyMapper.listEvaluateReply(enterpriseId, Collections.singletonList(evaluateId), showStatus);
+    }
+
+    @Override
+    public List<TabEvaluateReply> listEvaluateReply(Integer enterpriseId, List<Integer> evaluateIdList, Integer showStatus) {
+        return tabEvaluateReplyMapper.listEvaluateReply(enterpriseId, evaluateIdList, showStatus);
     }
 
     @Override

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

@@ -32,6 +32,16 @@ import java.util.*;
 @Service
 public class EvaluateServiceImpl implements EvaluateService {
 
+    /**
+     * 产品要求查4年
+     */
+    static Integer YEAR_NUM = 4;
+
+    /**
+     * 月数
+     */
+    static Integer MONTH_NUM = 4;
+
     @Autowired
     private TabEvaluateMapper tabEvaluateMapper;
     private Logger logger = LogManager.getLogger(EvaluateServiceImpl.class);
@@ -162,6 +172,7 @@ public class EvaluateServiceImpl implements EvaluateService {
         return tabEvaluateMapper.listTrend(storeTrendQO);
     }
 
+    @Override
     public TabEvaluate getEvaluateByOrderId(Integer enterpriseId, Long orderId) {
         return tabEvaluateMapper.getEvaluateByOrderId(enterpriseId, orderId);
     }
@@ -297,10 +308,15 @@ public class EvaluateServiceImpl implements EvaluateService {
         return this.tabEvaluateMapper.queryEvaluateCountByStoreId(enterpriseId, storeIdList);
     }
 
+    @Override
+    public List<TabEvaluate> listEvaluateByOrderNumber(Integer enterpriseId, List<String> orderNumberList) {
+        return this.tabEvaluateMapper.listEvaluateByOrderNumber(enterpriseId, orderNumberList);
+    }
+
     private List<String> getYear() {
         List<String> list = new ArrayList<>();
         int year = DateUtil.getYear(new Date());
-        for (int i = 0; i <= 4; i++) {
+        for (int i = 0; i <= YEAR_NUM; i++) {
             list.add((year - i) + "");
         }
         return list;
@@ -310,7 +326,7 @@ public class EvaluateServiceImpl implements EvaluateService {
         List<String> list = new ArrayList<>();
         int year = DateUtil.getYear(new Date());
         DecimalFormat decimalFormat = new DecimalFormat("00");
-        for (int i = 1; i <= 12; i++) {
+        for (int i = 1; i <= MONTH_NUM; i++) {
             String month = year + "-" + decimalFormat.format(i);
             list.add(month);
         }

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

@@ -11,6 +11,7 @@ import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -56,11 +57,21 @@ public class EvaluateTagsServiceImpl implements EvaluateTagsService {
 
     @Override
     public List<TabEvaluateTags> listEvaluateTags(Integer enterpriseId, Integer evaluateId) {
-        return this.listEvaluateTags(enterpriseId, evaluateId, null);
+        return this.listEvaluateTags(enterpriseId, Collections.singletonList(evaluateId), null);
     }
 
     @Override
-    public List<TabEvaluateTags> listEvaluateTags(Integer enterpriseId, Integer evaluateId, Integer evaluateReplyId) {
-        return tabEvaluateTagsMapper.listEvaluateTags(enterpriseId, evaluateId, evaluateReplyId);
+    public List<TabEvaluateTags> listEvaluateTags(Integer enterpriseId, List<Integer> evaluateIdList) {
+        return this.listEvaluateTags(enterpriseId, evaluateIdList, null);
+    }
+
+    @Override
+    public List<TabEvaluateTags> listEvaluateTags(Integer enterpriseId, Integer evaluateIdList, Integer evaluateReplyIdList) {
+        return tabEvaluateTagsMapper.listEvaluateTags(enterpriseId, Collections.singletonList(evaluateIdList), Collections.singletonList(evaluateReplyIdList));
+    }
+
+    @Override
+    public List<TabEvaluateTags> listEvaluateTags(Integer enterpriseId, List<Integer> evaluateIdList, List<Integer> evaluateReplyIdList) {
+        return tabEvaluateTagsMapper.listEvaluateTags(enterpriseId, evaluateIdList, evaluateReplyIdList);
     }
 }

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

@@ -82,11 +82,6 @@ public class EvaluateConfigApiServiceImpl implements EvaluateConfigApiService {
         List<TabEvaluateQuick> badEvaluateQuickList = evaluateQuickService.listEvaluateQuick(enterpriseId, QuickReplyTypeEnum.BAD.getCode());
         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());
-
         evaluateOrderConfigDTO.setBadEvaluateQuickDTOList(EntityUtil.changeEntityListByJSON(EvaluateQuickDTO.class, badEvaluateQuickList));
         evaluateOrderConfigDTO.setGoodEvaluateQuickDTOList(EntityUtil.changeEntityListByJSON(EvaluateQuickDTO.class, goodEvaluateQuickList));
         evaluateOrderConfigDTO.setReplyQuickDTOList(EntityUtil.changeEntityListByJSON(EvaluateQuickDTO.class, manageEvaluateQuickList));

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

@@ -68,9 +68,6 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
     private StoreApiService storeApiService;
     @Autowired
     private EvaluateTagsService evaluateTagsService;
-//    @Autowired
-//    private NoticeRouterApiService noticeRouterApiService;
-
     @Override
     public ServiceResponse<Void> saveEvaluate(EvaluateDTO evaluateDTO) {
         logger.info("保存订单评价:{}", JSON.toJSONString(evaluateDTO));
@@ -114,29 +111,23 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
         // 如果评价指标没开，需要对数据做处理
         if (Constants.CLOSE.equals(evaluateOrderConfig.getGoods())) {
             evaluateDTO.setGoodsScore(null);
-        }/* else if (evaluateDTO.getGoodsScore() == null) {
-            evaluateDTO.setGoodsScore(0);
-        }*/
+        }
         if (Constants.CLOSE.equals(evaluateOrderConfig.getStore())) {
             evaluateDTO.setStoreScore(null);
-        } /*else if (evaluateDTO.getStoreScore() == null) {
-            evaluateDTO.setStoreScore(0);
-        }*/
+        }
         if (Constants.CLOSE.equals(evaluateOrderConfig.getService())) {
             evaluateDTO.setServiceScore(null);
-        } /*else if (evaluateDTO.getServiceScore() == null) {
-            evaluateDTO.setServiceScore(0);
-        }*/
+        }
         TabBadEvaluateConfig badEvaluateConfig = badEvaluateConfigService.getBadEvaluateConfig(evaluateDTO.getEnterpriseId());
         Integer badEvaluate = isBadEvaluate(evaluateOrderConfig, badEvaluateConfig, evaluateDTO.getGoodsScore(), evaluateDTO.getStoreScore(), evaluateDTO.getServiceScore());
         Integer goodEvaluate = isGoodEvaluate(evaluateOrderConfig, badEvaluateConfig, evaluateDTO.getGoodsScore(), evaluateDTO.getStoreScore(), evaluateDTO.getServiceScore());
         evaluateDTO.setBadEvaluateStatus(badEvaluate);
         evaluateDTO.setGoodEvaluateStatus(goodEvaluate);
 
-        ServiceResponse<MemberUserDTO> memberUserDTOServiceResponse = memberUserApiService.getByMcuId(evaluateDTO.getMemberId(), evaluateDTO.getEnterpriseId());
-        if (memberUserDTOServiceResponse.isSuccess()) {
+        ServiceResponse<MemberUserDTO> memberUserDtoServiceResponse = memberUserApiService.getByMcuId(evaluateDTO.getMemberId(), evaluateDTO.getEnterpriseId());
+        if (memberUserDtoServiceResponse.isSuccess()) {
 
-            MemberUserDTO memberUserDTO = memberUserDTOServiceResponse.getResult();
+            MemberUserDTO memberUserDTO = memberUserDtoServiceResponse.getResult();
             evaluateDTO.setMemberName(memberUserDTO.getName());
             evaluateDTO.setMemberPhone(memberUserDTO.getMobile());
 
@@ -179,11 +170,7 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
             }
         }
 
-        // 是否超过期限
-//        TabEvaluate evaluate = this.evaluateService.getEvaluate(memberReplyDTO.getEnterpriseId(), memberReplyDTO.getEvaluateId());
-//        if (DateUtil.compareDate(new Date(), DateUtil.addDay(evaluate.getReceiptsDate(), evaluateOrderConfig.getReviewLimitday()))) {
-//            return EnterpriseServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "已超越评价期限，无法评价");
-//        }
+
         TabEvaluate evaluate = this.evaluateService.getEvaluate(memberReplyDTO.getEnterpriseId(), memberReplyDTO.getEvaluateId());
         if (overLimitTime(evaluateOrderConfig, evaluate.getReceiptsDate())) {
             return EnterpriseServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "已超越评价期限，无法评价");
@@ -196,9 +183,9 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
             }
         }
 
-        ServiceResponse<MemberUserDTO> memberUserDTOServiceResponse = memberUserApiService.getByMcuId(memberReplyDTO.getMemberId(), memberReplyDTO.getEnterpriseId());
-        if (memberUserDTOServiceResponse.isSuccess()) {
-            memberReplyDTO.setMemberName(memberUserDTOServiceResponse.getResult().getName());
+        ServiceResponse<MemberUserDTO> memberUserDtoServiceResponse = memberUserApiService.getByMcuId(memberReplyDTO.getMemberId(), memberReplyDTO.getEnterpriseId());
+        if (memberUserDtoServiceResponse.isSuccess()) {
+            memberReplyDTO.setMemberName(memberUserDtoServiceResponse.getResult().getName());
             ServiceResponse<AcuDetailDTO> acuDetailResponse = cuDetailService.getAcuDetail(memberReplyDTO.getAcuId(), memberReplyDTO.getEnterpriseId(), memberReplyDTO.getEcuId());
             if (acuDetailResponse.isSuccess() || acuDetailResponse.getResult() != null) {
                 memberReplyDTO.setMemberImgUrl(acuDetailResponse.getResult().getHeadUrl());
@@ -229,7 +216,6 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
     public ServiceResponse<Page<EvaluateDTO>> listEvaluateByStore(Integer enterpriseId, Integer storeId, Integer currentPage, Integer pageSize) {
         EvaluateQO evaluateQO = new EvaluateQO();
         evaluateQO.setEnterpriseId(enterpriseId);
-//        evaluateQO.setMemberId(evaluateOutQO.getMemberId());
         evaluateQO.setStoreIdList(Collections.singletonList(storeId));
         evaluateQO.setShowStatus(Constants.OPEN);
         evaluateQO.setMaliciousStatus(Constants.CLOSE);
@@ -237,10 +223,6 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
         evaluateQO.setPageSize(pageSize);
         evaluateQO.setApplet(1);
 
-//        TabEvaluateOrderConfig evaluateOrderConfig = this.evaluateOrderConfigService.getEvaluateOrderConfig(enterpriseId);
-//        Integer orderType = evaluateOrderConfig.getOrderType();
-//        evaluateQO.setOrderByField(orderType);
-
         com.github.pagehelper.Page<TabEvaluate> topHotEvaluate = evaluateService.listEvaluateNearByStore(evaluateQO);
         if (CollectionUtils.isEmpty(topHotEvaluate)) {
             topHotEvaluate = new com.github.pagehelper.Page<>();
@@ -280,9 +262,6 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
         calendar.setTime(receiptsDate);
         calendar.add(Calendar.DAY_OF_MONTH, evaluateOrderConfig.getEvaluateLimitday());
 
-//        if (Constants.OPEN.equals(evaluateOrderConfig.getReview())) {
-//            calendar.add(Calendar.DAY_OF_MONTH, evaluateOrderConfig.getReviewLimitday());
-//        }
         return DateUtil.compareDate(new Date(), calendar.getTime());
     }
 
@@ -292,19 +271,14 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
         if (evaluate == null) {
             return EnterpriseServiceResponse.failure(ErrorCode.NOTEXISTS);
         }
-
         EvaluateDTO evaluateDTO = EntityUtil.changeEntityByJSON(EvaluateDTO.class, evaluate);
-
         List<TabEvaluateImg> evaluateImgList = evaluateImgService.listImageByEvaluateId(evaluateDTO.getEvaluateId());
         List<String> imgList = Optional.ofNullable(evaluateImgList).orElse(Collections.emptyList()).stream().map(TabEvaluateImg::getImgUrl).collect(Collectors.toList());
         evaluateDTO.setImgList(imgList);
         // 追评和回复
         List<TabEvaluateReply> evaluateReplyList = this.evaluateReplyService.listEvaluateReply(evaluateDTO.getEnterpriseId(), evaluateDTO.getEvaluateId(), Constants.OPEN);
         List<EvaluateReplyDTO> replyDTOList = EntityUtil.changeEntityListByJSON(EvaluateReplyDTO.class, evaluateReplyList);
-
-
         List<TabEvaluateTags> tagsList = evaluateTagsService.listEvaluateTags(evaluateDTO.getEnterpriseId(), evaluateDTO.getEvaluateId());
-
         evaluateDTO.setQuickReplyTagNameList(Optional.ofNullable(tagsList).orElse(Collections.emptyList()).stream().map(TabEvaluateTags::getTagName).collect(Collectors.toList()));
         // 追评和回复的图片
         for (EvaluateReplyDTO replyDTO : replyDTOList) {
@@ -316,13 +290,44 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
             replyDTO.setQuickReplyTagNameList(Optional.ofNullable(replyTagsList).orElse(Collections.emptyList()).stream().map(TabEvaluateTags::getTagName).collect(Collectors.toList()));
         }
         evaluateDTO.setReplyList(replyDTOList);
-
         return EnterpriseServiceResponse.success(evaluateDTO);
     }
 
     @Override
+    public ServiceResponse<List<EvaluateDTO>> listEvaluateByOrderNumberList(EvaluateOutQO evaluateOutQO) {
+        List<TabEvaluate> tabEvaluateList = this.evaluateService.listEvaluateByOrderNumber(evaluateOutQO.getEnterpriseId(), evaluateOutQO.getOrderNumberList());
+        if (CollectionUtils.isEmpty(tabEvaluateList)) {
+            return EnterpriseServiceResponse.success();
+        }
+        List<EvaluateDTO> evaluateList = EntityUtil.changeEntityListByJSON(EvaluateDTO.class, tabEvaluateList);
+        List<Integer> evaluateIdList = evaluateList.stream().map(EvaluateDTO::getEvaluateId).collect(Collectors.toList());
+        // 快评
+        List<TabEvaluateTags> tagsList = evaluateTagsService.listEvaluateTags(evaluateOutQO.getEnterpriseId(), evaluateIdList);
+        Map<Integer, List<String>> tagsMap = Optional.ofNullable(tagsList).orElse(Collections.emptyList())
+                .stream().collect(Collectors.groupingBy(TabEvaluateTags::getEvaluateId, Collectors.mapping(TabEvaluateTags::getTagName, Collectors.toList())));
+
+        // 追评和回复
+        List<TabEvaluateReply> evaluateReplyList = this.evaluateReplyService.listEvaluateReply(evaluateOutQO.getEnterpriseId(), evaluateIdList, Constants.OPEN);
+        List<EvaluateReplyDTO> replyDTOList = EntityUtil.changeEntityListByJSON(EvaluateReplyDTO.class, evaluateReplyList);
+        if (CollectionUtils.isNotEmpty(replyDTOList)) {
+            Map<Integer, List<EvaluateReplyDTO>> replyMap = replyDTOList.stream().collect(Collectors.groupingBy(EvaluateReplyDTO::getEvaluateId, Collectors.toList()));
+            for (EvaluateDTO evaluateDTO : evaluateList) {
+                evaluateDTO.setQuickReplyTagNameList(tagsMap.get(evaluateDTO.getEvaluateId()));
+                evaluateDTO.setReplyList(replyMap.get(evaluateDTO.getEvaluateId()));
+            }
+            List<Integer> replyIdList = replyDTOList.stream().map(EvaluateReplyDTO::getEvaluateReplyId).collect(Collectors.toList());
+            List<TabEvaluateTags> replyTagsList = evaluateTagsService.listEvaluateTags(evaluateOutQO.getEnterpriseId(), replyIdList);
+            Map<Integer, List<String>> replyTagsMap = Optional.ofNullable(replyTagsList).orElse(Collections.emptyList())
+                    .stream().collect(Collectors.groupingBy(TabEvaluateTags::getEvaluateId, Collectors.mapping(TabEvaluateTags::getTagName, Collectors.toList())));
+            for (EvaluateReplyDTO replyDTO : replyDTOList) {
+                replyDTO.setQuickReplyTagNameList(replyTagsMap.get(replyDTO.getEvaluateReplyId()));
+            }
+        }
+        return ServiceResponse.success(evaluateList);
+    }
+
+    @Override
     public ServiceResponse<Map<Long, Integer>> queryRelayStatusByOrderId(Integer enterpriseId, List<OrderStatusQO> orderIdList) {
-//        logger.info("查询订单状态：{}", JSON.toJSONString(orderIdList));
         Map<Long, Integer> resultMap = new HashMap<>();
         TabEvaluateOrderConfig evaluateOrderConfig = evaluateOrderConfigService.getEvaluateOrderConfig(enterpriseId);
 

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

@@ -32,6 +32,7 @@ import java.util.stream.Collectors;
  * @author zhiwj
  * @date 2019-12-27 16:52
  */
+@SuppressWarnings("ALL")
 @Service("evaluateOverviewApiService")
 public class EvaluateOverviewApiServiceImpl implements EvaluateOverviewApiService {
 
@@ -39,21 +40,19 @@ public class EvaluateOverviewApiServiceImpl implements EvaluateOverviewApiServic
 
     @Autowired
     private EvaluateService evaluateService;
-//    @Autowired
-//    private EvaluateMsgLogService evaluateMsgLogService;
     @Autowired
     private EvaluateQuickService evaluateQuickService;
     @Autowired
     StoreEvaluateApiService storeEvaluateApiService;
 
     @Override
-    public ServiceResponse<Map<String, Long>> chart1(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList) {
+    public ServiceResponse<Map<String, Long>> chartOne(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList) {
         Map<String, Long> countMap = evaluateService.getTotalCountChart(enterpriseId, startTime, endTime, storeIdList);
         return EnterpriseServiceResponse.success(countMap);
     }
 
     @Override
-    public ServiceResponse<HashMap<String, Map<String, Long>>> chart2(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList) {
+    public ServiceResponse<HashMap<String, Map<String, Long>>> chartTwo(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList) {
         Map<String, Long> goodsCountMap = evaluateService.getGoodsCountChart(enterpriseId, startTime, endTime, storeIdList);
         Map<String, Long> storeCountMap = evaluateService.getStoreCountChart(enterpriseId, startTime, endTime, storeIdList);
         Map<String, Long> serviceCountMap = evaluateService.getServiceCountChart(enterpriseId, startTime, endTime, storeIdList);
@@ -68,7 +67,7 @@ public class EvaluateOverviewApiServiceImpl implements EvaluateOverviewApiServic
     }
 
     @Override
-    public ServiceResponse<Map<String, List<Map<String, Object>>>> chart3(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList) {
+    public ServiceResponse<Map<String, List<Map<String, Object>>>> chartThree(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList) {
         List<Map<String, Object>> listTrendTotalEvaluate = this.evaluateService.listTrendTotalEvaluate(enterpriseId, startTime, endTime, storeIdList);
         List<Map<String, Object>> listTrendGoodEvaluate = this.evaluateService.listTrendGoodEvaluate(enterpriseId, startTime, endTime, storeIdList);
         List<Map<String, Object>> listTrendOrderCount = this.storeEvaluateApiService.listTrendOrderCount(enterpriseId, startTime, endTime, storeIdList).getResult();
@@ -78,9 +77,9 @@ public class EvaluateOverviewApiServiceImpl implements EvaluateOverviewApiServic
         try {
             List<String> dateList = this.getDateList(startTime, endTime);
 
-            map.put("totalEvaluateList", dealChart4(listTrendTotalEvaluate, dateList));
-            map.put("goodEvaluateList", dealChart4(listTrendGoodEvaluate, dateList));
-            map.put("orderList", dealChart4(listTrendOrderCount, dateList));
+            map.put("totalEvaluateList", dealChartFour(listTrendTotalEvaluate, dateList));
+            map.put("goodEvaluateList", dealChartFour(listTrendGoodEvaluate, dateList));
+            map.put("orderList", dealChartFour(listTrendOrderCount, dateList));
             return EnterpriseServiceResponse.success(map);
         } catch (Exception e) {
             logger.info("解析参数错误", e);
@@ -89,11 +88,9 @@ public class EvaluateOverviewApiServiceImpl implements EvaluateOverviewApiServic
     }
 
     @Override
-    public ServiceResponse<Map<String, List<Map<String, Object>>>> chart4(Integer enterpriseId, String startTime, String endTime, List<Integer> storeIdList) {
+    public ServiceResponse<Map<String, List<Map<String, Object>>>> chartFour(Integer enterpriseId, String startTime, String endTime, List<Integer> 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);
@@ -101,7 +98,7 @@ public class EvaluateOverviewApiServiceImpl implements EvaluateOverviewApiServic
         return EnterpriseServiceResponse.success(map);
     }
 
-    private List<Map<String, Object>> dealChart4(List<Map<String, Object>> chart, List<String> dateList) {
+    private List<Map<String, Object>> dealChartFour(List<Map<String, Object>> chart, List<String> dateList) {
         List<Map<String, Object>> result = new ArrayList<>();
         for (String date : dateList) {
             Map<Object, Object> collect = chart.stream().collect(Collectors.toMap(e -> e.get("statisticsDate"), e -> e.get("count")));
@@ -135,22 +132,19 @@ 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());
                     }
             ).collect(Collectors.toList());
-            // 这里要取数据组的数据
+            /*
+             这里要取数据组的数据
+             */
             Map<Integer, StoreOrderEvaluateDTO> orderCountMap = storeEvaluateApiService.getStoreOrderEvaluateByStoreId(storeTrendQO.getEnterpriseId(), storeIdList).getResult();
-//            Map<Integer, Map<String, Object>> orderCountMap = evaluateMsgLogService.orderCountByStoreId(storeTrendQO.getEnterpriseId(), storeIdList);
             for (Map<String, Object> e : trendList) {
-                // e.put("evaluateRate", 0);
                 Object storeId = e.get("storeId");
                 if (storeId != null) {
                     StoreOrderEvaluateDTO storeOrderEvaluateDTO = orderCountMap.get(Integer.valueOf(storeId.toString()));
                     if (storeOrderEvaluateDTO != null) {
-//                        Long totalCount = (Long) e.get("totalCount");
-//                        Long goodCount = (Long) e.get("goodCount");
                         BigDecimal goodRate = (BigDecimal) e.get("goodRate");
                         e.put("evaluateRate", storeOrderEvaluateDTO.getEvaluateRate());
 
@@ -183,28 +177,28 @@ public class EvaluateOverviewApiServiceImpl implements EvaluateOverviewApiServic
 
     private ServiceResponse<List<Map<String, Integer>>> getListServiceResponse(Integer enterpriseId, String startTime, String endTime, QuickReplyTypeEnum quickReplyTypeEnum, List<Integer> storeIdList) {
         Date[] time = getTime(startTime, endTime);
-        Integer count1 = this.evaluateService.countEvaluateTrend(enterpriseId, time[0], time[1], storeIdList, quickReplyTypeEnum.getCode());
-        Integer count2 = this.evaluateService.countEvaluateTrend(enterpriseId, time[1], time[2], storeIdList, quickReplyTypeEnum.getCode());
-        Integer count3 = this.evaluateService.countEvaluateTrend(enterpriseId, time[2], time[3], storeIdList, quickReplyTypeEnum.getCode());
-        Integer count4 = this.evaluateService.countEvaluateTrend(enterpriseId, time[3], time[4], storeIdList, quickReplyTypeEnum.getCode());
-        Integer count5 = this.evaluateService.countEvaluateTrend(enterpriseId, time[4], null, storeIdList, quickReplyTypeEnum.getCode());
-        Map<String, Integer> map1 = new HashMap<>(4);
-        map1.put(DateUtil.dateToStr(time[0], DateUtil.FORMAT_DATE_10), count1);
-        Map<String, Integer> map2 = new HashMap<>(4);
-        map2.put(DateUtil.dateToStr(time[1], DateUtil.FORMAT_DATE_10), count2);
-        Map<String, Integer> map3 = new HashMap<>(4);
-        map3.put(DateUtil.dateToStr(time[2], DateUtil.FORMAT_DATE_10), count3);
-        Map<String, Integer> map4 = new HashMap<>(4);
-        map4.put(DateUtil.dateToStr(time[3], DateUtil.FORMAT_DATE_10), count4);
-        Map<String, Integer> map5 = new HashMap<>(4);
-        map5.put(DateUtil.dateToStr(time[4], DateUtil.FORMAT_DATE_10), count5);
+        Integer countOne = this.evaluateService.countEvaluateTrend(enterpriseId, time[0], time[1], storeIdList, quickReplyTypeEnum.getCode());
+        Integer countTwo = this.evaluateService.countEvaluateTrend(enterpriseId, time[1], time[2], storeIdList, quickReplyTypeEnum.getCode());
+        Integer countThree = this.evaluateService.countEvaluateTrend(enterpriseId, time[2], time[3], storeIdList, quickReplyTypeEnum.getCode());
+        Integer countFour = this.evaluateService.countEvaluateTrend(enterpriseId, time[3], time[4], storeIdList, quickReplyTypeEnum.getCode());
+        Integer countFive = this.evaluateService.countEvaluateTrend(enterpriseId, time[4], null, storeIdList, quickReplyTypeEnum.getCode());
+        Map<String, Integer> mapOne = new HashMap<>(4);
+        mapOne.put(DateUtil.dateToStr(time[0], DateUtil.FORMAT_DATE_10), countOne);
+        Map<String, Integer> mapTwo = new HashMap<>(4);
+        mapTwo.put(DateUtil.dateToStr(time[1], DateUtil.FORMAT_DATE_10), countTwo);
+        Map<String, Integer> mapThree = new HashMap<>(4);
+        mapThree.put(DateUtil.dateToStr(time[2], DateUtil.FORMAT_DATE_10), countThree);
+        Map<String, Integer> mapFour = new HashMap<>(4);
+        mapFour.put(DateUtil.dateToStr(time[3], DateUtil.FORMAT_DATE_10), countFour);
+        Map<String, Integer> mapFive = new HashMap<>(4);
+        mapFive.put(DateUtil.dateToStr(time[4], DateUtil.FORMAT_DATE_10), countFive);
 
         List<Map<String, Integer>> list = new ArrayList<>();
-        list.add(map1);
-        list.add(map2);
-        list.add(map3);
-        list.add(map4);
-        list.add(map5);
+        list.add(mapOne);
+        list.add(mapTwo);
+        list.add(mapThree);
+        list.add(mapFour);
+        list.add(mapFive);
         return EnterpriseServiceResponse.success(list);
     }
 
@@ -218,36 +212,32 @@ public class EvaluateOverviewApiServiceImpl implements EvaluateOverviewApiServic
         try {
             startTimeDate = sdf.parse(startTime);
             endTimeDate = sdf.parse(endTime);
-            Calendar cal1 = Calendar.getInstance();
-            cal1.setTime(startTimeDate);
-            Date date1 = cal1.getTime();
-            long time1 = cal1.getTimeInMillis();
-            Calendar cal2 = Calendar.getInstance();
-            cal2.setTime(endTimeDate);
-            long time2 = cal2.getTimeInMillis();
-            long between_days = (time2 - time1) / 86400000L;
-            int days = Integer.parseInt(String.valueOf(between_days));
+            Calendar cal = Calendar.getInstance();
+            cal.setTime(startTimeDate);
+            Date dateOne = cal.getTime();
+            long startTimeL = cal.getTimeInMillis();
+            Calendar calTmp = Calendar.getInstance();
+            calTmp.setTime(endTimeDate);
+            long endTimeL = calTmp.getTimeInMillis();
+            long betweenDays = (endTimeL - startTimeL) / 86400000L;
+            int days = Integer.parseInt(String.valueOf(betweenDays));
             int step = days/5;
-//            System.out.println(step/5);
 
-            cal1.add(Calendar.DAY_OF_MONTH, step);
-            Date date2 = cal1.getTime();
-//            System.out.println(DateUtil.dateToStr(date1, DateUtil.FORMAT_DATE_10));
-            cal1.add(Calendar.DAY_OF_MONTH, step);
-            Date date3 = cal1.getTime();
-//            System.out.println(DateUtil.dateToStr(date2, DateUtil.FORMAT_DATE_10));
-            cal1.add(Calendar.DAY_OF_MONTH, step);
-            Date date4 = cal1.getTime();
-            cal1.add(Calendar.DAY_OF_MONTH, step);
-            Date date5 = cal1.getTime();
-//            System.out.println(DateUtil.dateToStr(date3, DateUtil.FORMAT_DATE_10));
-            arr[0] = date1;
-            arr[1] = date2;
-            arr[2] = date3;
-            arr[3] = date4;
-            arr[4] = date5;
-        } catch (ParseException var10) {
-            logger.warn("exception", var10);
+            cal.add(Calendar.DAY_OF_MONTH, step);
+            Date dateTwo = cal.getTime();
+            cal.add(Calendar.DAY_OF_MONTH, step);
+            Date dateThree = cal.getTime();
+            cal.add(Calendar.DAY_OF_MONTH, step);
+            Date dateFour = cal.getTime();
+            cal.add(Calendar.DAY_OF_MONTH, step);
+            Date dateFive = cal.getTime();
+            arr[0] = dateOne;
+            arr[1] = dateTwo;
+            arr[2] = dateThree;
+            arr[3] = dateFour;
+            arr[4] = dateFive;
+        } catch (ParseException e) {
+            logger.warn("exception", e);
         }
         return arr;
 

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

@@ -45,8 +45,8 @@ public class ProblemManageApiServiceImpl implements ProblemManageApiService {
     @Override
     public ServiceResponse<Page<ProblemDTO>> listProblem(ProblemQO problemQO) {
         com.github.pagehelper.Page<TabProblem> problemList = problemService.listProblem(problemQO);
-        Page<ProblemDTO> problemDTOPage = PageHelperUtils.changePageHelperToCurrentPage(problemList, ProblemDTO.class);
-        return EnterpriseServiceResponse.success(problemDTOPage);
+        Page<ProblemDTO> problemDtoPage = PageHelperUtils.changePageHelperToCurrentPage(problemList, ProblemDTO.class);
+        return EnterpriseServiceResponse.success(problemDtoPage);
     }
 
     @Override

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

@@ -16,12 +16,14 @@ import com.gic.evaluate.entity.TabProblemImg;
 import com.gic.evaluate.service.*;
 import com.gic.member.api.dto.AcuDetailDTO;
 import com.gic.member.api.dto.MemberUserDTO;
+import com.gic.member.api.dto.UserOwnerDTO;
+import com.gic.member.api.service.AppletsUserApiService;
 import com.gic.member.api.service.CuDetailService;
 import com.gic.member.api.service.MemberUserApiService;
 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.commons.lang.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,6 +57,8 @@ public class ProblemOutApiServiceImpl implements ProblemOutApiService {
     private CuDetailService cuDetailService;
     @Autowired
     private StoreApiService storeApiService;
+    @Autowired
+    private AppletsUserApiService appletsUserApiService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -66,23 +70,16 @@ public class ProblemOutApiServiceImpl implements ProblemOutApiService {
             problemDTO.setHasOtherImage(imgList.size() > 1 ? Constants.OPEN : Constants.CLOSE);
         }
 
-//        TabEvaluateOrderConfig evaluateOrderConfig = evaluateOrderConfigService.getEvaluateOrderConfig(problemDTO.getEnterpriseId());
-//        if (Constants.OPEN.equals(evaluateOrderConfig.getBadSuggestionTag())) {
-//            if (this.problemService.hasMaliciousStatusByEcuIdBeforeHours(problemDTO.getEcuId(), evaluateOrderConfig.getBadSuggestionTagType())) {
-//                return EnterpriseServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "不能评论");
-//            }
-//        }
-
-        ServiceResponse<MemberUserDTO> memberUserDTOServiceResponse = memberUserApiService.getByMcuId(problemDTO.getMemberId(), problemDTO.getEnterpriseId());
-        if (memberUserDTOServiceResponse.isSuccess()) {
-            MemberUserDTO memberUserDTO = memberUserDTOServiceResponse.getResult();
+        ServiceResponse<MemberUserDTO> memberUserDtoServiceResponse = memberUserApiService.getByMcuId(problemDTO.getMemberId(), problemDTO.getEnterpriseId());
+        if (memberUserDtoServiceResponse.isSuccess()) {
+            MemberUserDTO memberUserDTO = memberUserDtoServiceResponse.getResult();
             problemDTO.setMemberName(memberUserDTO.getName());
             problemDTO.setMemberPhone(memberUserDTO.getMobile());
-            // 门店
-            ServiceResponse<String> serviceStoreId = cuDetailService.getServiceStoreId(problemDTO.getAreaId(), problemDTO.getMemberId(), problemDTO.getUnionId(), problemDTO.getEnterpriseId(), problemDTO.getEcuId());
+            // 用ACU关联的MCU的主卡最高权重服务门店
+            ServiceResponse<UserOwnerDTO> resp = appletsUserApiService.getUserOwnerByAppletConfigId(problemDTO.getAreaId(), problemDTO.getEnterpriseId(), problemDTO.getEcuId());
 
-            if (serviceStoreId != null && StringUtils.isNotBlank(serviceStoreId.getResult())) {
-                StoreDTO storeDTO = storeApiService.getStoreByStoreInfoId(memberUserDTO.getEnterpriseId(), Integer.valueOf(serviceStoreId.getResult())).getResult();
+            if (resp != null && resp.getResult() != null && StringUtils.isNotBlank(resp.getResult().getOwnerId())) {
+                StoreDTO storeDTO = storeApiService.getStoreByStoreInfoId(memberUserDTO.getEnterpriseId(), Integer.valueOf(resp.getResult().getOwnerId())).getResult();
                 if (storeDTO != null) {
                     problemDTO.setStoreName(storeDTO.getStoreName());
                 }
@@ -111,11 +108,6 @@ public class ProblemOutApiServiceImpl implements ProblemOutApiService {
         if (problem == null) {
             return EnterpriseServiceResponse.failure(ErrorCode.NOTEXISTS);
         }
-//        if (Constants.OPEN.equals(evaluateOrderConfig.getBadSuggestionTag())) {
-//            if (this.problemService.hasMaliciousStatusByEcuIdBeforeHours(problemMemberReplyDTO.getEcuId(), evaluateOrderConfig.getBadSuggestionTagType())) {
-//                return EnterpriseServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "不能评论");
-//            }
-//        }
         if (Constants.OPEN.equals(evaluateOrderConfig.getBadSuggestionTag())) {
             if (Constants.OPEN.equals(problem.getMaliciousStatus())) {
                 Date date = DateUtil.addNumForHour(new Date(), -evaluateOrderConfig.getBadSuggestionTagType());
@@ -126,19 +118,18 @@ public class ProblemOutApiServiceImpl implements ProblemOutApiService {
         }
 
         List<String> imgUrlList = problemMemberReplyDTO.getImgList();
-        ServiceResponse<MemberUserDTO> memberUserDTOServiceResponse = memberUserApiService.getByMcuId(problemMemberReplyDTO.getMemberId(), problemMemberReplyDTO.getEnterpriseId());
-        if (memberUserDTOServiceResponse.isSuccess()) {
-
-            MemberUserDTO memberUserDTO = memberUserDTOServiceResponse.getResult();
-            problemMemberReplyDTO.setMemberName(memberUserDTO.getName());
-
-            if (problemMemberReplyDTO.getAcuId() != null) {
-                ServiceResponse<AcuDetailDTO> acuDetailResponse = cuDetailService.getAcuDetail(problemMemberReplyDTO.getAcuId(), problemMemberReplyDTO.getEnterpriseId(), problemMemberReplyDTO.getEcuId());
-                if (acuDetailResponse.isSuccess() || acuDetailResponse.getResult() != null) {
-                    problemMemberReplyDTO.setMemberImgUrl(acuDetailResponse.getResult().getHeadUrl());
-                }
+        if (problemMemberReplyDTO.getMemberId() != null) {
+            ServiceResponse<MemberUserDTO> memberUserDtoServiceResponse = memberUserApiService.getByMcuId(problemMemberReplyDTO.getMemberId(), problemMemberReplyDTO.getEnterpriseId());
+            if (memberUserDtoServiceResponse.isSuccess()) {
+                MemberUserDTO memberUserDTO = memberUserDtoServiceResponse.getResult();
+                problemMemberReplyDTO.setMemberName(memberUserDTO.getName());
+            }
+        }
+        if (problemMemberReplyDTO.getAcuId() != null) {
+            ServiceResponse<AcuDetailDTO> acuDetailResponse = cuDetailService.getAcuDetail(problemMemberReplyDTO.getAcuId(), problemMemberReplyDTO.getEnterpriseId(), problemMemberReplyDTO.getEcuId());
+            if (acuDetailResponse.isSuccess() || acuDetailResponse.getResult() != null) {
+                problemMemberReplyDTO.setMemberImgUrl(acuDetailResponse.getResult().getHeadUrl());
             }
-
         }
         Integer problemReplyId = problemReplyService.save(problemMemberReplyDTO);
         ProblemDTO problemDTO = new ProblemDTO();
@@ -160,8 +151,6 @@ public class ProblemOutApiServiceImpl implements ProblemOutApiService {
             List<Integer> problemIdList = problemList.stream().map(ProblemDTO::getProblemId).collect(Collectors.toList());
             Map<Integer, String> firstReply = problemReplyService.firstReplyByProblemId(problemIdList);
 
-//            ServiceResponse<Void> resp = this.ensure(problemList.get(0).getEnterpriseId(), ecuId);
-
             for (ProblemDTO problemDTO : problemList) {
                 problemDTO.setProblemCount(problemDTO.getProblemCount() == null ? 1 : (problemDTO.getProblemCount() + 1));
                 problemDTO.setReplyContent(firstReply.get(problemDTO.getProblemId()));
@@ -179,10 +168,6 @@ public class ProblemOutApiServiceImpl implements ProblemOutApiService {
                         .stream().map(TabProblemImg::getImgUrl).collect(Collectors.toList());
                 problemDTO.setImgList(imgList);
 
-//                if (!resp.isSuccess()) {
-//                     恶意评价 不能提交
-//                    problemDTO.setStatus(2);
-//                }
             }
         }
         return EnterpriseServiceResponse.success(problemList);

gic-evaluate-service/src/main/resources/dubbo-gic-evaluate-service.xml

@@ -29,6 +29,8 @@
     <!--<dubbo:reference interface="com.gic.enterprise.service.EnterpriseApiService" id="enterpriseApiService" timeout="6000" />-->
     <dubbo:reference interface="com.gic.order.api.service.OrderApiService" id="orderApiService" timeout="6000" />
     <dubbo:reference interface="com.gic.data.api.service.StoreEvaluateApiService" id="storeEvaluateApiService" timeout="6000" />
+    <dubbo:reference interface="com.gic.member.api.service.UserOwnerApiService" id="userOwnerApiService" timeout="6000" />
+    <dubbo:reference interface="com.gic.member.api.service.AppletsUserApiService" id="appletsUserApiService" timeout="6000" />
 
 <!--    <dubbo:reference interface="com.gic.log.api.service.LogApiService" id="logApiService" timeout="6000" />-->
 

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

@@ -44,7 +44,7 @@
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
   <sql id="Base_Column_List">
-    evaluate_id, enterprise_id, store_id, store_info_id, member_id, order_id, evaluate_content, 
+    evaluate_id, enterprise_id, store_id, store_info_id, member_id, order_id, evaluate_content,
     goods_score, store_score, service_score, avg_score, evaluate_time, member_name, member_phone, 
     member_img_url, goods_id, goods_info, store_name, store_code, store_phone, store_group_id, 
     store_group_name, area_name, order_number, receipts_date, order_mount, clerk_id, 
@@ -1009,4 +1009,17 @@
     </if>
     group by store_id
   </select>
+  <select id="listEvaluateByOrderNumber" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from tab_evaluate
+    where enterprise_id = #{enterpriseId}
+    <if test="null != ids and ids.size > 0">
+      and order_number in
+      <foreach collection="ids" index="index" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
+    and status = 1
+  </select>
 </mapper>
\ No newline at end of file

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

@@ -218,7 +218,12 @@
     <include refid="Base_Column_List" />
     from tab_evaluate_reply
     where enterprise_id = #{enterpriseId}
-    and evaluate_id = #{evaluateId}
+    <if test="null != ids and ids.size > 0">
+      and evaluate_id in
+      <foreach collection="ids" index="index" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
     and status = 1
     <if test="showStatus != null ">
         and show_status = #{showStatus}

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

@@ -156,11 +156,19 @@
     from tab_evaluate_tags
     where enterprise_id = #{enterpriseId}
     and status = 1
-    and evaluate_id = #{evaluateId}
-    <if test="evaluateReplyId != null ">
-        and evaluate_reply_id = #{evaluateReplyId}
+    <if test="null != evaluateIdList and evaluateIdList.size > 0">
+      and evaluate_id in
+      <foreach collection="evaluateIdList" index="index" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
     </if>
-    <if test="evaluateReplyId == null ">
+    <if test="null != evaluateReplyIdList and evaluateReplyIdList.size > 0">
+      and evaluate_reply_id in
+      <foreach collection="evaluateReplyIdList" index="index" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
+    <if test="evaluateReplyIdList == null ">
         and evaluate_reply_id is null
     </if>
   </select>

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

@@ -71,10 +71,8 @@ public class EvaluateExportController extends DownloadUtils {
             String fieldName = EvaluateFieldEnum.valueOf(fieldCode).getFieldName();
             fieldNameList.add(fieldName);
         }
-
         // 开始下载
         String dataContent = DataContentUtils.getDataContent();
-
         // 生成入参数据
         DownloadReport report = new DownloadReport();
         //申请人ID
@@ -100,7 +98,6 @@ public class EvaluateExportController extends DownloadUtils {
         }
         //调用生成方法，获取reportId
         Integer reportId = DataDownloadUtils.createDownloadReport(report);
-
         String path = request.getSession().getServletContext().getRealPath("/excel/csv/collaborator/file/");
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat(DateUtil.FORMAT_DATETIME_19);
         ExecutorPoolSingleton.getInstance().executeTask(() -> {
@@ -116,51 +113,7 @@ public class EvaluateExportController extends DownloadUtils {
                     boolean hasReplyMemberContent = fieldCodeList.contains("replyMemberContent");
                     boolean hasReplyUserContent = fieldCodeList.contains("replyUserContent");
                     if (CollectionUtils.isNotEmpty(result.getResult().getResult())) {
-                        for(EvaluateDTO resultDTO : result.getResult().getResult()) {
-                            EvaluateDTO evaluateDTO = null;
-                            if (hasReplyTime || hasReplyMemberContent || hasReplyUserContent) {
-                                evaluateDTO = evaluateManageApiService.getEvaluate(resultDTO.getEnterpriseId(), resultDTO.getEvaluateId()).getResult();
-                            }
-                            // 追评时间
-                            if (hasReplyTime) {
-                                List<EvaluateReplyDTO> replyList = evaluateDTO.getReplyList();
-                                List<String> replyDateList = Optional.ofNullable(replyList).orElse(Collections.emptyList()).stream()
-                                        .filter(e -> ReplyerTypeEnum.MEMBER.getCode().equals(e.getReplyerType()))
-                                        .map(e -> simpleDateFormat.format(e.getReplyDate()))
-                                        .collect(Collectors.toList());
-                                StringBuilder sb = new StringBuilder();
-                                for (int i = 0; i < replyDateList.size(); i++) {
-                                    sb.append("(").append(i + 1).append(")").append(replyDateList.get(i)).append("\r\n");
-                                }
-                                resultDTO.setReplyTime(sb.toString());
-                            }
-                            // 追评内容
-                            if (hasReplyMemberContent) {
-                                List<EvaluateReplyDTO> replyList = evaluateDTO.getReplyList();
-                                List<String> replyMemberContentList = Optional.ofNullable(replyList).orElse(Collections.emptyList()).stream()
-                                        .filter(e -> ReplyerTypeEnum.MEMBER.getCode().equals(e.getReplyerType()))
-                                        .map(EvaluateReplyDTO::getReplyContent)
-                                        .collect(Collectors.toList());
-                                StringBuilder sb = new StringBuilder();
-                                for (int i = 0; i < replyMemberContentList.size(); i++) {
-                                    sb.append("(").append(i + 1).append(")").append(replyMemberContentList.get(i)).append("\r\n");
-                                }
-                                resultDTO.setReplyMemberContent(sb.toString());
-                            }
-                            // 商家回复
-                            if (hasReplyUserContent) {
-                                List<EvaluateReplyDTO> replyList = evaluateDTO.getReplyList();
-                                List<String> replyUserContentList = Optional.ofNullable(replyList).orElse(Collections.emptyList()).stream()
-                                        .filter(e -> ReplyerTypeEnum.USER.getCode().equals(e.getReplyerType()))
-                                        .map(EvaluateReplyDTO::getReplyContent)
-                                        .collect(Collectors.toList());
-                                StringBuilder sb = new StringBuilder();
-                                for (int i = 0; i < replyUserContentList.size(); i++) {
-                                    sb.append("(").append(i + 1).append(")").append(replyUserContentList.get(i)).append("\r\n");
-                                }
-                                resultDTO.setReplyUserContent(sb.toString());
-                            }
-                        }
+                        parse(result, hasReplyTime, hasReplyMemberContent, hasReplyUserContent, simpleDateFormat);
                     }
 
                     return result.getResult().getResult();
@@ -176,22 +129,118 @@ public class EvaluateExportController extends DownloadUtils {
         return RestResponse.success(reportId);
     }
 
+    private void parse(ServiceResponse<Page<EvaluateDTO>> result, boolean hasReplyTime, boolean hasReplyMemberContent, boolean hasReplyUserContent, SimpleDateFormat simpleDateFormat) {
+        for(EvaluateDTO resultDTO : result.getResult().getResult()) {
+            EvaluateDTO evaluateDTO = null;
+            if (hasReplyTime || hasReplyMemberContent || hasReplyUserContent) {
+                evaluateDTO = evaluateManageApiService.getEvaluate(resultDTO.getEnterpriseId(), resultDTO.getEvaluateId()).getResult();
+            }
+            // 追评时间
+            if (hasReplyTime) {
+                List<EvaluateReplyDTO> replyList = evaluateDTO.getReplyList();
+                List<String> replyDateList = Optional.ofNullable(replyList).orElse(Collections.emptyList()).stream()
+                        .filter(e -> ReplyerTypeEnum.MEMBER.getCode().equals(e.getReplyerType()))
+                        .map(e -> simpleDateFormat.format(e.getReplyDate()))
+                        .collect(Collectors.toList());
+                StringBuilder sb = new StringBuilder();
+                for (int i = 0; i < replyDateList.size(); i++) {
+                    sb.append("(").append(i + 1).append(")").append(replyDateList.get(i)).append("\r\n");
+                }
+                resultDTO.setReplyTime(sb.toString());
+            }
+            // 追评内容
+            if (hasReplyMemberContent) {
+                List<EvaluateReplyDTO> replyList = evaluateDTO.getReplyList();
+                List<String> replyMemberContentList = Optional.ofNullable(replyList).orElse(Collections.emptyList()).stream()
+                        .filter(e -> ReplyerTypeEnum.MEMBER.getCode().equals(e.getReplyerType()))
+                        .map(EvaluateReplyDTO::getReplyContent)
+                        .collect(Collectors.toList());
+                StringBuilder sb = new StringBuilder();
+                for (int i = 0; i < replyMemberContentList.size(); i++) {
+                    sb.append("(").append(i + 1).append(")").append(replyMemberContentList.get(i)).append("\r\n");
+                }
+                resultDTO.setReplyMemberContent(sb.toString());
+            }
+            // 商家回复
+            if (hasReplyUserContent) {
+                List<EvaluateReplyDTO> replyList = evaluateDTO.getReplyList();
+                List<String> replyUserContentList = Optional.ofNullable(replyList).orElse(Collections.emptyList()).stream()
+                        .filter(e -> ReplyerTypeEnum.USER.getCode().equals(e.getReplyerType()))
+                        .map(EvaluateReplyDTO::getReplyContent)
+                        .collect(Collectors.toList());
+                StringBuilder sb = new StringBuilder();
+                for (int i = 0; i < replyUserContentList.size(); i++) {
+                    sb.append("(").append(i + 1).append(")").append(replyUserContentList.get(i)).append("\r\n");
+                }
+                resultDTO.setReplyUserContent(sb.toString());
+            }
+        }
+    }
+
     private enum EvaluateFieldEnum{
+        /**
+         * 首次评价时间
+         */
         evaluateTime("evaluateTime", "首次评价时间", 0),
+        /**
+         * 会员姓名
+         */
         memberName("memberName", "会员姓名", 0),
+        /**
+         * 会员手机号
+         */
         memberPhone("memberPhone", "会员手机号", 1),
+        /**
+         * 商品质量评分
+         */
         goodsScore("goodsScore", "商品质量评分", 0),
+        /**
+         * 门店环境评分
+         */
         storeScore("storeScore", "门店环境评分", 0),
+        /**
+         * 服务能力评分
+         */
         serviceScore("serviceScore", "服务能力评分", 0),
+        /**
+         * 评语
+         */
         evaluateContent("evaluateContent", "评语", 0),
+        /**
+         * 追评时间
+         */
         replyTime("replyTime", "追评时间", 0),
+        /**
+         * 追评内容
+         */
         replyMemberContent("replyMemberContent", "追评内容", 0),
+        /**
+         * 商家回复
+         */
         replyUserContent("replyUserContent", "商家回复", 0),
+        /**
+         * 下单时间
+         */
         receiptsDate("receiptsDate", "下单时间", 0),
+        /**
+         * 订单号
+         */
         orderNumber("orderNumber", "订单号", 0),
+        /**
+         * 订单金额
+         */
         orderMount("orderMount", "订单金额", 0),
+        /**
+         * 商品信息
+         */
         goodsInfo("goodsInfo", "商品信息", 0),
+        /**
+         * 门店名称
+         */
         storeName("storeName", "门店名称", 0),
+        /**
+         * 门店电话
+         */
         storePhone("storePhone", "门店电话", 0),
         ;
         private String fieldCode;

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

@@ -39,7 +39,7 @@ public class EvaluateOverviewController {
     private ResourceApiService resourceApiService;
 
     @RequestMapping("/evaluate-chart1")
-    public RestResponse evaluateChart1(String startTime, String endTime, Integer storeWidgetId) {
+    public RestResponse evaluateChartOne(String startTime, String endTime, Integer storeWidgetId) {
         List<Integer> storeIdList = Collections.emptyList();
         // 权限判断
         // 判断权限
@@ -62,12 +62,12 @@ public class EvaluateOverviewController {
         if (StringUtils.isNotBlank(endTime)) {
             endTime += " 23:59:59";
         }
-        ServiceResponse<Map<String, Long>> serviceResponse = evaluateOverviewApiService.chart1(UserDetailUtils.getUserDetail().getEnterpriseId(), startTime, endTime, storeIdList);
+        ServiceResponse<Map<String, Long>> serviceResponse = evaluateOverviewApiService.chartOne(UserDetailUtils.getUserDetail().getEnterpriseId(), startTime, endTime, storeIdList);
         return ResultControllerUtils.commonResult(serviceResponse);
     }
 
     @RequestMapping("/evaluate-chart2")
-    public RestResponse evaluateChart2(String startTime, String endTime, Integer storeWidgetId) {
+    public RestResponse evaluateChartTwo(String startTime, String endTime, Integer storeWidgetId) {
         List<Integer> storeIdList = Collections.emptyList();
         // 判断权限
         OrderResourceDTO orderResourceDTO = resourceApiService.getOrderResourceByUserId(UserDetailUtils.getUserDetail().getUserId()).getResult();
@@ -89,12 +89,12 @@ public class EvaluateOverviewController {
         if (StringUtils.isNotBlank(endTime)) {
             endTime += " 23:59:59";
         }
-        ServiceResponse<HashMap<String, Map<String, Long>>> serviceResponse = evaluateOverviewApiService.chart2(UserDetailUtils.getUserDetail().getEnterpriseId(), startTime, endTime, storeIdList);
+        ServiceResponse<HashMap<String, Map<String, Long>>> serviceResponse = evaluateOverviewApiService.chartTwo(UserDetailUtils.getUserDetail().getEnterpriseId(), startTime, endTime, storeIdList);
         return ResultControllerUtils.commonResult(serviceResponse);
     }
 
     @RequestMapping("/evaluate-chart3")
-    public RestResponse evaluateChart3(String startTime, String endTime, Integer storeWidgetId) {
+    public RestResponse evaluateChartThree(String startTime, String endTime, Integer storeWidgetId) {
         List<Integer> storeIdList = Collections.emptyList();
         // 权限判断
         OrderResourceDTO orderResourceDTO = resourceApiService.getOrderResourceByUserId(UserDetailUtils.getUserDetail().getUserId()).getResult();
@@ -115,12 +115,12 @@ public class EvaluateOverviewController {
         if (StringUtils.isNotBlank(endTime)) {
             endTime += " 23:59:59";
         }
-        ServiceResponse<Map<String, List<Map<String, Object>>>> serviceResponse = evaluateOverviewApiService.chart3(UserDetailUtils.getUserDetail().getEnterpriseId(), startTime, endTime, storeIdList);
+        ServiceResponse<Map<String, List<Map<String, Object>>>> serviceResponse = evaluateOverviewApiService.chartThree(UserDetailUtils.getUserDetail().getEnterpriseId(), startTime, endTime, storeIdList);
         return ResultControllerUtils.commonResult(serviceResponse);
     }
 
     @RequestMapping("/evaluate-chart4")
-    public RestResponse evaluateChart4(String startTime, String endTime, Integer storeWidgetId) {
+    public RestResponse evaluateChartFour(String startTime, String endTime, Integer storeWidgetId) {
         List<Integer> storeIdList = Collections.emptyList();
         // 权限判断
         OrderResourceDTO orderResourceDTO = resourceApiService.getOrderResourceByUserId(UserDetailUtils.getUserDetail().getUserId()).getResult();
@@ -142,7 +142,7 @@ public class EvaluateOverviewController {
         if (StringUtils.isNotBlank(endTime)) {
             endTime += " 23:59:59";
         }
-        ServiceResponse<Map<String, List<Map<String, Object>>>> serviceResponse = evaluateOverviewApiService.chart4(UserDetailUtils.getUserDetail().getEnterpriseId(), startTime, endTime, storeIdList);
+        ServiceResponse<Map<String, List<Map<String, Object>>>> serviceResponse = evaluateOverviewApiService.chartFour(UserDetailUtils.getUserDetail().getEnterpriseId(), startTime, endTime, storeIdList);
         return ResultControllerUtils.commonResult(serviceResponse);
     }
 
@@ -166,9 +166,6 @@ public class EvaluateOverviewController {
             storeScoreQO.setEndTime(storeScoreQO.getEndTime() + " 23:59:59");
         }
         ServiceResponse<Page<Map<String, Object>>> serviceResponse = evaluateOverviewApiService.listStoreScore(storeScoreQO);
-//        ServiceResponse<Map<String, Object>> totalStoreScore = evaluateOverviewApiService.getTotalStoreScore(storeScoreQO);
-//        List<Map<String, Object>> result = serviceResponse.getResult().getResult();
-//        result.add(0, totalStoreScore.getResult());
         return ResultControllerUtils.commonResult(serviceResponse);
     }
 

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

@@ -116,10 +116,6 @@ public class ProblemExportController extends DownloadUtils {
                                 ProblemDTO problemDTO = problemManageApiService.getProblem(resultDTO.getProblemId()).getResult();
 
                                 List<ProblemReplyDTO> replyList = problemDTO.getReplyList();
-//                                List<String> replyUserContentList = Optional.ofNullable(replyList).orElse(Collections.emptyList()).stream()
-//                                        .filter(e -> ReplyerTypeEnum.USER.getCode().equals(e.getReplyerType()))
-//                                        .map(ProblemReplyDTO::getReplyContent)
-//                                        .collect(Collectors.toList());
                                 int j = 0;
                                 StringBuilder sb = new StringBuilder();
                                 for (ProblemReplyDTO problemReplyDTO : replyList) {
@@ -138,8 +134,6 @@ public class ProblemExportController extends DownloadUtils {
                 }
             };
             try {
-
-                //参数说明：excelExtensionCode，Excel后缀名code ，枚举类：ExcelExtensionEnum, Arrays.asList("phone")这个phone是需要加密的字段
                 download(path, reportId, exportQO.getFileName(), exportQO.getExcelExtension(), fieldNameList, fieldCodeList, loader, Arrays.asList("memberPhone"), null);
             } catch (Exception e) {
                 logger.warn("下载错误", e);
@@ -149,11 +143,29 @@ public class ProblemExportController extends DownloadUtils {
     }
 
     private enum ProblemFieldEnum {
+        /**
+         * 首次评价时间
+         */
         createTime("createTime", "首次评价时间", 0),
+        /**
+         * 会员姓名
+         */
         memberName("memberName", "会员姓名", 0),
+        /**
+         * 会员手机号
+         */
         memberPhone("memberPhone", "会员手机号", 1),
+        /**
+         * 内容概览
+         */
         problemContent("problemContent", "内容概览", 0),
+        /**
+         * 门店名称
+         */
         storeName("storeName", "门店名称", 0),
+        /**
+         * 商家回复
+         */
         replyUserContent("replyUserContent", "商家回复", 0),
         ;
         private String fieldCode;

gic-evaluate-web/src/main/java/com/gic/evaluate/web/utils/DataContentUtils.java

@@ -21,7 +21,7 @@ public class DataContentUtils {
 
     @Autowired
     public void setMenuApiService(MenuApiService menuApiService) {
-        this.menuApiService = menuApiService;
+        DataContentUtils.menuApiService = menuApiService;
     }
 
     public static String getDataContent() {

gic-evaluate-web/src/main/java/com/gic/evaluate/web/utils/ExcelUtils.java

@@ -21,8 +21,11 @@ public class ExcelUtils {
 
     private static final short ROW_HEIGHT = 500;
     private static final int COLUMN_HEIGHT = 5000;
+    private static final String XLSX = ".xlsx";
+    private static final String XLS = ".xls";
 
-    public static XSSFWorkbook getXSSFWorkbook(String sheetName, List<List<String>> everyLines, XSSFWorkbook wb) {
+
+    public static XSSFWorkbook getXssfWorkbook(String sheetName, List<List<String>> everyLines, XSSFWorkbook wb) {
         if (CollectionUtils.isEmpty(everyLines)) {
             return null;
         }
@@ -60,9 +63,9 @@ public class ExcelUtils {
             for (int j = 0; j < everyLines.get(i).size(); j++) {
                 sheet.setColumnWidth(j, COLUMN_HEIGHT);
                 //将内容按顺序赋给对应的列对象
-                XSSFCell cell1 = row.createCell(j);
-                cell1.setCellValue(everyLines.get(i).get(j));
-                cell1.setCellStyle(style);
+                XSSFCell cellTmp = row.createCell(j);
+                cellTmp.setCellValue(everyLines.get(i).get(j));
+                cellTmp.setCellStyle(style);
             }
         }
         return wb;
@@ -76,9 +79,9 @@ public class ExcelUtils {
 
         XSSFRow row1 = sheet.createRow(0);
         row1.setZeroHeight(true);
-        XSSFCell cell1 = row1.createCell(0);
+        XSSFCell cellOne = row1.createCell(0);
         if (StringUtils.isNotBlank(regionIdStr)) {
-            cell1.setCellValue(regionIdStr);
+            cellOne.setCellValue(regionIdStr);
         }
 
         XSSFRow rowm = sheet.createRow(1);  // 产生表格标题行
@@ -137,33 +140,37 @@ public class ExcelUtils {
 
         // 让列宽随着导出的列长自动适应
         for (int colNum = 0; colNum < columnNum; colNum++) {
-            int columnWidth = sheet.getColumnWidth(colNum) / 256;
-            for (int rowNum = 0; rowNum < sheet.getLastRowNum(); rowNum++) {
-                XSSFRow currentRow;
-                // 当前行未被使用过
-                if (sheet.getRow(rowNum) == null) {
-                    currentRow = sheet.createRow(rowNum);
-                } else {
-                    currentRow = sheet.getRow(rowNum);
-                }
-                if (currentRow.getCell(colNum) != null) {
-                    XSSFCell currentCell = currentRow.getCell(colNum);
-                    if (currentCell.getCellType() == XSSFCell.CELL_TYPE_STRING) {
-                        int length = currentCell.getStringCellValue()
-                                .getBytes().length;
-                        if (columnWidth < length) {
-                            columnWidth = length;
-                        }
+            rowHeightAdaptive(sheet, colNum);
+        }
+        return workbook;
+    }
+
+    private static void rowHeightAdaptive(XSSFSheet sheet, int colNum) {
+        int columnWidth = sheet.getColumnWidth(colNum) / 256;
+        for (int rowNum = 0; rowNum < sheet.getLastRowNum(); rowNum++) {
+            XSSFRow currentRow;
+            // 当前行未被使用过
+            if (sheet.getRow(rowNum) == null) {
+                currentRow = sheet.createRow(rowNum);
+            } else {
+                currentRow = sheet.getRow(rowNum);
+            }
+            if (currentRow.getCell(colNum) != null) {
+                XSSFCell currentCell = currentRow.getCell(colNum);
+                if (currentCell.getCellType() == XSSFCell.CELL_TYPE_STRING) {
+                    int length = currentCell.getStringCellValue()
+                            .getBytes().length;
+                    if (columnWidth < length) {
+                        columnWidth = length;
                     }
                 }
             }
-            if (colNum == 0) {
-                sheet.setColumnWidth(colNum, (columnWidth - 2) * 256);
-            } else {
-                sheet.setColumnWidth(colNum, (columnWidth + 4) * 256);
-            }
         }
-        return workbook;
+        if (colNum == 0) {
+            sheet.setColumnWidth(colNum, (columnWidth - 2) * 256);
+        } else {
+            sheet.setColumnWidth(colNum, (columnWidth + 4) * 256);
+        }
     }
 
     private static XSSFCellStyle getTitleStyle(XSSFWorkbook workbook) {
@@ -173,7 +180,7 @@ public class ExcelUtils {
         return style;
     }
 
-    /*
+    /**
      * 列头单元格样式
      */
     private static XSSFCellStyle getColumnTopStyle(XSSFWorkbook workbook) {
@@ -191,19 +198,15 @@ public class ExcelUtils {
         // 设置底边框;
         style.setBorderBottom(XSSFCellStyle.BORDER_THIN);
         // 设置底边框颜色;
-//        style.setBottomBorderColor(XSSFColor.BLACK.index);
         // 设置左边框;
         style.setBorderLeft(XSSFCellStyle.BORDER_THIN);
         // 设置左边框颜色;
-//        style.setLeftBorderColor(XSSFColor.BLACK.index);
         // 设置右边框;
         style.setBorderRight(XSSFCellStyle.BORDER_THIN);
         // 设置右边框颜色;
-//        style.setRightBorderColor(XSSFColor.BLACK.index);
         // 设置顶边框;
         style.setBorderTop(XSSFCellStyle.BORDER_THIN);
         // 设置顶边框颜色;
-//        style.setTopBorderColor(XSSFColor.BLACK.index);
         // 在样式用应用设置的字体;
         style.setFont(font);
         // 设置自动换行;
@@ -217,7 +220,7 @@ public class ExcelUtils {
 
     }
 
-    /*
+    /**
      * 列数据信息单元格样式
      */
     private static XSSFCellStyle getStyle(XSSFWorkbook workbook) {
@@ -225,9 +228,7 @@ public class ExcelUtils {
         // 设置字体
         XSSFFont font = workbook.createFont();
         // 设置字体大小
-        // font.setFontHeightInPoints((short)10);
         // 字体加粗
-        // font.setBoldweight(XSSFFont.BOLDWEIGHT_BOLD);
         // 设置字体名字
         font.setFontName("Courier New");
         font.setColor(IndexedColors.RED.index);
@@ -236,19 +237,15 @@ public class ExcelUtils {
         // 设置底边框;
         style.setBorderBottom(XSSFCellStyle.BORDER_THIN);
         // 设置底边框颜色;
-//        style.setBottomBorderColor(XSSFColor.BLACK.index);
         // 设置左边框;
         style.setBorderLeft(XSSFCellStyle.BORDER_THIN);
         // 设置左边框颜色;
-//        style.setLeftBorderColor(XSSFColor.BLACK.index);
         // 设置右边框;
         style.setBorderRight(XSSFCellStyle.BORDER_THIN);
         // 设置右边框颜色;
-//        style.setRightBorderColor(XSSFColor.BLACK.index);
         // 设置顶边框;
         style.setBorderTop(XSSFCellStyle.BORDER_THIN);
         // 设置顶边框颜色;
-//        style.setTopBorderColor(XSSFColor.BLACK.index);
         // 在样式用应用设置的字体;
         style.setFont(font);
         // 设置自动换行;
@@ -264,9 +261,9 @@ public class ExcelUtils {
     public static Workbook getWorkbookFromUpload(InputStream inputStream, String fileName) throws IOException {
         Workbook wb;
         String fileType = fileName.substring(fileName.lastIndexOf("."));
-        if (".xlsx".equals(fileType)) {
+        if (ExcelUtils.XLSX.equals(fileType)) {
             wb = new XSSFWorkbook(inputStream);
-        } else if ("xls".equals(fileType)) {
+        } else if (ExcelUtils.XLS.equals(fileType)) {
             wb = new HSSFWorkbook(inputStream);
         } else {
             return null;
@@ -281,7 +278,7 @@ public class ExcelUtils {
      * @return
      */
     public static List<Map<Integer, String>> readExcel(int row, String fileType, Workbook xssfWorkbook, Map<Integer, Boolean> dateTypeMap) {
-        if (fileType.equals("xlsx")) {
+        if (ExcelUtils.XLSX.equals(fileType)) {
             return readXlsx(xssfWorkbook, row, dateTypeMap);
         } else {
             return null;
@@ -290,7 +287,7 @@ public class ExcelUtils {
 
     public static List<Map<Integer, String>> readXlsx(Workbook xssfWorkbook, int row, Map<Integer, Boolean> dateTypeMap) {
         List<Map<Integer, String>> result = new ArrayList<Map<Integer, String>>();
-        SimpleDateFormat format = new SimpleDateFormat(Constants.dateformat);
+        SimpleDateFormat format = new SimpleDateFormat(Constants.DATE_FORMAT);
 //            XSSFWorkbook xssfWorkbook = new XSSFWorkbook(in);
         for (int numSheet = 0; numSheet < 1; numSheet++) {
             Sheet xssfSheet = xssfWorkbook.getSheetAt(numSheet);

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

@@ -277,4 +277,29 @@ public class BadEvaluateConfigVO implements Serializable {
     public void setBadTotalScore(Integer badTotalScore) {
         this.badTotalScore = badTotalScore;
     }
+
+    @Override
+    public String toString() {
+        return "BadEvaluateConfigVO{" +
+                "badEvaluateConfigId=" + badEvaluateConfigId +
+                ", enterpriseId=" + enterpriseId +
+                ", badOnceStatus=" + badOnceStatus +
+                ", badTotalStatus=" + badTotalStatus +
+                ", badTotalType=" + badTotalType +
+                ", badTotalScore=" + badTotalScore +
+                ", badGoodsType=" + badGoodsType +
+                ", badGoodsScore=" + badGoodsScore +
+                ", badStoreType=" + badStoreType +
+                ", badStoreScore=" + badStoreScore +
+                ", badServiceType=" + badServiceType +
+                ", badServiceScore=" + badServiceScore +
+                ", goodStatus=" + goodStatus +
+                ", goodOnceType=" + goodOnceType +
+                ", goodOnceScore=" + goodOnceScore +
+                ", goodTotalType=" + goodTotalType +
+                ", goodTotalScore=" + goodTotalScore +
+                ", goodNoReturn=" + goodNoReturn +
+                ", updateTime=" + updateTime +
+                '}';
+    }
 }

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

@@ -84,4 +84,16 @@ public class BadTagConfigVO implements Serializable {
     public void setBadSuggestionTagType(Integer badSuggestionTagType) {
         this.badSuggestionTagType = badSuggestionTagType;
     }
+
+    @Override
+    public String toString() {
+        return "BadTagConfigVO{" +
+                "evaluateOrderConfigId=" + evaluateOrderConfigId +
+                ", badEvaluateTag=" + badEvaluateTag +
+                ", badEvaluateTagType=" + badEvaluateTagType +
+                ", badSuggestionTag=" + badSuggestionTag +
+                ", badSuggestionTagType=" + badSuggestionTagType +
+                ", enterpriseId=" + enterpriseId +
+                '}';
+    }
 }

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

@@ -4,6 +4,7 @@ import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
+import java.util.Arrays;
 
 /**
  *
@@ -336,4 +337,33 @@ public class EvaluateOrderConfigVO implements Serializable {
     public void setReviewRemind(Integer reviewRemind) {
         this.reviewRemind = reviewRemind;
     }
+
+    @Override
+    public String toString() {
+        return "EvaluateOrderConfigVO{" +
+                "evaluateOrderConfigId=" + evaluateOrderConfigId +
+                ", enterpriseId=" + enterpriseId +
+                ", goods=" + goods +
+                ", store=" + store +
+                ", service=" + service +
+                ", goodsRequired=" + goodsRequired +
+                ", storeRequired=" + storeRequired +
+                ", serviceRequired=" + serviceRequired +
+                ", mindHour=" + mindHour +
+                ", remindDay=" + remindDay +
+                ", evaluateLimitday=" + evaluateLimitday +
+                ", defaultContent='" + defaultContent + '\'' +
+                ", review=" + review +
+                ", reviewRemind=" + reviewRemind +
+                ", reviewLimitday=" + reviewLimitday +
+                ", reviewUserHidden=" + reviewUserHidden +
+                ", reviewTimes=" + reviewTimes +
+                ", commentModule=" + commentModule +
+                ", reward=" + reward +
+                ", orderType=" + orderType +
+                ", goodEvaluateQuick=" + Arrays.toString(goodEvaluateQuick) +
+                ", badEvaluateQuick=" + Arrays.toString(badEvaluateQuick) +
+                ", replyQuick=" + Arrays.toString(replyQuick) +
+                '}';
+    }
 }

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

 package com.gic.evaluate.web.vo;
 
 import java.io.Serializable;
+import java.util.Arrays;
 
 
 /**
@@ -98,4 +99,17 @@ public class ProblemUserReplyVO implements Serializable {
     public void setUserName(String userName) {
         this.userName = userName;
     }
+
+    @Override
+    public String toString() {
+        return "ProblemUserReplyVO{" +
+                "problemReplyId=" + problemReplyId +
+                ", problemIds=" + Arrays.toString(problemIds) +
+                ", enterpriseId=" + enterpriseId +
+                ", problemId=" + problemId +
+                ", replyContent='" + replyContent + '\'' +
+                ", userId=" + userId +
+                ", userName='" + userName + '\'' +
+                '}';
+    }
 }

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

 package com.gic.evaluate.web.vo;
 
 import java.io.Serializable;
+import java.util.Arrays;
 
 /**
  * 管理员回复
@@ -87,4 +88,16 @@ public class UserReplyVO implements Serializable {
     public void setUserName(String userName) {
         this.userName = userName;
     }
+
+    @Override
+    public String toString() {
+        return "UserReplyVO{" +
+                "evaluateReplyId=" + evaluateReplyId +
+                ", enterpriseId=" + enterpriseId +
+                ", evaluateIds=" + Arrays.toString(evaluateIds) +
+                ", replyContent='" + replyContent + '\'' +
+                ", userId=" + userId +
+                ", userName='" + userName + '\'' +
+                '}';
+    }
 }