提供好办查询接口

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/qo/EvaluateOutQO.java

@@ -19,6 +19,8 @@ public class EvaluateOutQO implements Serializable {
 
     private Long orderId;
 
+    private String orderNumber;
+
     public Integer getEnterpriseId() {
         return enterpriseId;
     }
@@ -50,4 +52,12 @@ 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;
+    }
 }

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

@@ -111,4 +111,6 @@ public interface TabEvaluateMapper {
 
     @MapKey("storeId")
     Map<Integer,Map<String,Object>> queryEvaluateCountByStoreId(@Param("enterpriseId") Integer enterpriseId, @Param("ids") List<Integer> storeIdList);
+
+    TabEvaluate getEvaluateByOrderNumber(@Param("enterpriseId") Integer enterpriseId, @Param("orderNumber") String orderNumber);
 }
\ No newline at end of file

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

@@ -78,4 +78,6 @@ public interface EvaluateService {
     boolean hasMaliciousStatusBeforeHours(Integer evaluateId, Integer badEvaluateTagType);
 
     Map<Integer,Map<String,Object>> queryEvaluateCountByStoreId(Integer enterpriseId, List<Integer> storeIdList);
+
+    TabEvaluate getEvaluateByOrderNumber(Integer enterpriseId, String orderNumber);
 }

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

@@ -162,6 +162,7 @@ public class EvaluateServiceImpl implements EvaluateService {
         return tabEvaluateMapper.listTrend(storeTrendQO);
     }
 
+    @Override
     public TabEvaluate getEvaluateByOrderId(Integer enterpriseId, Long orderId) {
         return tabEvaluateMapper.getEvaluateByOrderId(enterpriseId, orderId);
     }
@@ -297,6 +298,11 @@ public class EvaluateServiceImpl implements EvaluateService {
         return this.tabEvaluateMapper.queryEvaluateCountByStoreId(enterpriseId, storeIdList);
     }
 
+    @Override
+    public TabEvaluate getEvaluateByOrderNumber(Integer enterpriseId, String orderNumber) {
+        return this.tabEvaluateMapper.getEvaluateByOrderNumber(enterpriseId, orderNumber);
+    }
+
     private List<String> getYear() {
         List<String> list = new ArrayList<>();
         int year = DateUtil.getYear(new Date());

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

@@ -290,7 +290,11 @@ public class EvaluateOutApiServiceImpl implements EvaluateOutApiService {
     public ServiceResponse<EvaluateDTO> listEvaluateByOrderId(EvaluateOutQO evaluateOutQO) {
         TabEvaluate evaluate = this.evaluateService.getEvaluateByOrderId(evaluateOutQO.getEnterpriseId(), evaluateOutQO.getOrderId());
         if (evaluate == null) {
-            return EnterpriseServiceResponse.failure(ErrorCode.NOTEXISTS);
+            if (StringUtils.isNotBlank(evaluateOutQO.getOrderNumber())) {
+                evaluate = this.evaluateService.getEvaluateByOrderNumber(evaluateOutQO.getEnterpriseId(), evaluateOutQO.getOrderNumber());
+            } else {
+                return EnterpriseServiceResponse.failure(ErrorCode.NOTEXISTS);
+            }
         }
 
         EvaluateDTO evaluateDTO = EntityUtil.changeEntityByJSON(EvaluateDTO.class, evaluate);

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,13 @@
     </if>
     group by store_id
   </select>
+  <select id="getEvaluateByOrderNumber" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from tab_evaluate
+    where enterprise_id = #{enterpriseId}
+    and order_number = #{orderNumber}
+    and status = 1
+    limit 1
+  </select>
 </mapper>
\ No newline at end of file

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

@@ -177,21 +177,69 @@ public class EvaluateExportController extends DownloadUtils {
     }
 
     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/ProblemExportController.java

@@ -149,11 +149,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

@@ -281,7 +281,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 ("xlsx".equals(fileType)) {
             return readXlsx(xssfWorkbook, row, dateTypeMap);
         } else {
             return null;