添加门店电话字段

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

@@ -109,6 +109,11 @@ public class EvaluateDTO implements Serializable {
     private String storeGroupName;
 
     /**
+     *
+     */
+    private String storePhone;
+
+    /**
      * 订单号
      */
     private String orderNumber;
@@ -457,6 +462,14 @@ public class EvaluateDTO implements Serializable {
         this.updateTime = updateTime;
     }
 
+    public String getStorePhone() {
+        return storePhone;
+    }
+
+    public void setStorePhone(String storePhone) {
+        this.storePhone = storePhone;
+    }
+
     public List<EvaluateReplyDTO> getReplyList() {
         return replyList;
     }

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

@@ -92,6 +92,11 @@ public class TabEvaluate {
     private String storeCode;
 
     /**
+     * 
+     */
+    private String storePhone;
+
+    /**
      * 门店分组id
      */
     private Integer storeGroupId;
@@ -312,6 +317,14 @@ public class TabEvaluate {
         this.storeCode = storeCode;
     }
 
+    public String getStorePhone() {
+        return storePhone;
+    }
+
+    public void setStorePhone(String storePhone) {
+        this.storePhone = storePhone;
+    }
+
     public Integer getStoreGroupId() {
         return storeGroupId;
     }

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

@@ -19,6 +19,7 @@
     <result column="goods_info" jdbcType="VARCHAR" property="goodsInfo" />
     <result column="store_name" jdbcType="VARCHAR" property="storeName" />
     <result column="store_code" jdbcType="VARCHAR" property="storeCode" />
+    <result column="store_phone" jdbcType="VARCHAR" property="storePhone" />
     <result column="store_group_id" jdbcType="INTEGER" property="storeGroupId" />
     <result column="store_group_name" jdbcType="VARCHAR" property="storeGroupName" />
     <result column="order_number" jdbcType="VARCHAR" property="orderNumber" />
@@ -40,10 +41,10 @@
   <sql id="Base_Column_List">
     evaluate_id, enterprise_id, store_id, member_id, order_id, evaluate_content, goods_score, 
     store_score, service_score, evaluate_time, member_name, member_phone, member_img_url, 
-    goods_id, goods_info, store_name, store_code, store_group_id, store_group_name, order_number, 
-    receipts_date, clerk_id, clerk_name, bad_evaluate_status, good_evaluate_status, review_status, 
-    top_hot_status, malicious_status, show_status, visit_status, reply_status, status, 
-    create_time, update_time
+    goods_id, goods_info, store_name, store_code, store_phone, store_group_id, store_group_name, 
+    order_number, receipts_date, clerk_id, clerk_name, bad_evaluate_status, good_evaluate_status, 
+    review_status, top_hot_status, malicious_status, show_status, visit_status, reply_status, 
+    status, create_time, update_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -61,25 +62,27 @@
       goods_score, store_score, service_score, 
       evaluate_time, member_name, member_phone, 
       member_img_url, goods_id, goods_info, 
-      store_name, store_code, store_group_id, 
-      store_group_name, order_number, receipts_date, 
-      clerk_id, clerk_name, bad_evaluate_status, 
-      good_evaluate_status, review_status, top_hot_status, 
-      malicious_status, show_status, visit_status, 
-      reply_status, status, create_time, 
-      update_time)
+      store_name, store_code, store_phone, 
+      store_group_id, store_group_name, order_number, 
+      receipts_date, clerk_id, clerk_name, 
+      bad_evaluate_status, good_evaluate_status, 
+      review_status, top_hot_status, malicious_status, 
+      show_status, visit_status, reply_status, 
+      status, create_time, update_time
+      )
     values (#{evaluateId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{storeId,jdbcType=INTEGER}, 
       #{memberId,jdbcType=BIGINT}, #{orderId,jdbcType=BIGINT}, #{evaluateContent,jdbcType=VARCHAR}, 
       #{goodsScore,jdbcType=INTEGER}, #{storeScore,jdbcType=INTEGER}, #{serviceScore,jdbcType=INTEGER}, 
       #{evaluateTime,jdbcType=TIMESTAMP}, #{memberName,jdbcType=VARCHAR}, #{memberPhone,jdbcType=VARCHAR}, 
       #{memberImgUrl,jdbcType=VARCHAR}, #{goodsId,jdbcType=BIGINT}, #{goodsInfo,jdbcType=VARCHAR}, 
-      #{storeName,jdbcType=VARCHAR}, #{storeCode,jdbcType=VARCHAR}, #{storeGroupId,jdbcType=INTEGER}, 
-      #{storeGroupName,jdbcType=VARCHAR}, #{orderNumber,jdbcType=VARCHAR}, #{receiptsDate,jdbcType=TIMESTAMP}, 
-      #{clerkId,jdbcType=INTEGER}, #{clerkName,jdbcType=VARCHAR}, #{badEvaluateStatus,jdbcType=INTEGER}, 
-      #{goodEvaluateStatus,jdbcType=INTEGER}, #{reviewStatus,jdbcType=INTEGER}, #{topHotStatus,jdbcType=INTEGER}, 
-      #{maliciousStatus,jdbcType=INTEGER}, #{showStatus,jdbcType=INTEGER}, #{visitStatus,jdbcType=INTEGER}, 
-      #{replyStatus,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateTime,jdbcType=TIMESTAMP})
+      #{storeName,jdbcType=VARCHAR}, #{storeCode,jdbcType=VARCHAR}, #{storePhone,jdbcType=VARCHAR}, 
+      #{storeGroupId,jdbcType=INTEGER}, #{storeGroupName,jdbcType=VARCHAR}, #{orderNumber,jdbcType=VARCHAR}, 
+      #{receiptsDate,jdbcType=TIMESTAMP}, #{clerkId,jdbcType=INTEGER}, #{clerkName,jdbcType=VARCHAR}, 
+      #{badEvaluateStatus,jdbcType=INTEGER}, #{goodEvaluateStatus,jdbcType=INTEGER}, 
+      #{reviewStatus,jdbcType=INTEGER}, #{topHotStatus,jdbcType=INTEGER}, #{maliciousStatus,jdbcType=INTEGER}, 
+      #{showStatus,jdbcType=INTEGER}, #{visitStatus,jdbcType=INTEGER}, #{replyStatus,jdbcType=INTEGER}, 
+      #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.gic.evaluate.entity.TabEvaluate">
     insert into tab_evaluate
@@ -135,6 +138,9 @@
       <if test="storeCode != null">
         store_code,
       </if>
+      <if test="storePhone != null">
+        store_phone,
+      </if>
       <if test="storeGroupId != null">
         store_group_id,
       </if>
@@ -239,6 +245,9 @@
       <if test="storeCode != null">
         #{storeCode,jdbcType=VARCHAR},
       </if>
+      <if test="storePhone != null">
+        #{storePhone,jdbcType=VARCHAR},
+      </if>
       <if test="storeGroupId != null">
         #{storeGroupId,jdbcType=INTEGER},
       </if>
@@ -343,6 +352,9 @@
       <if test="storeCode != null">
         store_code = #{storeCode,jdbcType=VARCHAR},
       </if>
+      <if test="storePhone != null">
+        store_phone = #{storePhone,jdbcType=VARCHAR},
+      </if>
       <if test="storeGroupId != null">
         store_group_id = #{storeGroupId,jdbcType=INTEGER},
       </if>
@@ -415,6 +427,7 @@
       goods_info = #{goodsInfo,jdbcType=VARCHAR},
       store_name = #{storeName,jdbcType=VARCHAR},
       store_code = #{storeCode,jdbcType=VARCHAR},
+      store_phone = #{storePhone,jdbcType=VARCHAR},
       store_group_id = #{storeGroupId,jdbcType=INTEGER},
       store_group_name = #{storeGroupName,jdbcType=VARCHAR},
       order_number = #{orderNumber,jdbcType=VARCHAR},
@@ -513,9 +526,9 @@
   </select>
   <update id="updateShowStatus">
     update tab_evaluate set show_status = #{showStatus} where enterprise_id = #{enterpriseId}
-    <if test="null != evaluateId and evaluateId.size > 0">
+    <if test="null != evaluateId and evaluateId.size &gt; 0">
       and evaluate_id in
-      <foreach collection="evaluateId" index="index" item="item" open="(" separator="," close=")">
+      <foreach close=")" collection="evaluateId" index="index" item="item" open="(" separator=",">
         #{item}
       </foreach>
     </if>
@@ -743,10 +756,10 @@
       <if test="enterpriseId != null ">
           and enterprise_id = #{enterpriseId}
       </if>
-      <if test="replyType == 2" >
+      <if test="replyType == 2">
           and good_evaluate_status = 1
       </if>
-      <if test="replyType == 1" >
+      <if test="replyType == 1">
           and bad_evaluate_status = 1
       </if>
     group by statisticsDate
@@ -760,10 +773,10 @@
     <if test="enterpriseId != null ">
         and enterprise_id = #{enterpriseId}
     </if>
-    <if test="replyType == 2" >
+    <if test="replyType == 2">
         and good_evaluate_status = 1
     </if>
-    <if test="replyType == 1" >
+    <if test="replyType == 1">
         and bad_evaluate_status = 1
     </if>
     <if test="firstDate != null ">
@@ -780,10 +793,10 @@
     <if test="enterpriseId != null ">
         and enterprise_id = #{enterpriseId}
     </if>
-    <if test="replyType == 2" >
+    <if test="replyType == 2">
         and good_evaluate_status = 1
     </if>
-    <if test="replyType == 1" >
+    <if test="replyType == 1">
         and bad_evaluate_status = 1
     </if>
     <if test="firstDate != null ">