bugfix

src/main/java/com/caimei365/manager/entity/caimei/CmBehaviorRecord.java

@@ -81,12 +81,12 @@ public class CmBehaviorRecord {
     /**
      * 访问时长
      */
-    @ExcelProperty(value = "访问时长", index = 12)
+    @ExcelProperty(value = "访问时长", index = 13)
     private String accessDuration;
     /**
      * 访问日期
      */
-    @ExcelProperty(value = "访问日期", index = 13)
+    @ExcelProperty(value = "访问日期", index = 14)
     private String accessDate;
     @ExcelIgnore
     private String consultName;
@@ -113,17 +113,17 @@ public class CmBehaviorRecord {
     /**
      * 公司名称
      */
-    @ExcelProperty(value = "公司名称", index = 4)
+    @ExcelProperty(value = "公司名称", index = 5)
     private String corporateName;
     /**
      *  联系人
      */
-    @ExcelProperty(value = "联系人", index = 5)
+    @ExcelProperty(value = "联系人", index = 6)
     private String contacts;
     /**
      * 手机号码
      */
-    @ExcelProperty(value = "手机号码", index = 6)
+    @ExcelProperty(value = "手机号码", index = 7)
     private String phoneNumber;
 
     @ExcelIgnore
@@ -131,7 +131,7 @@ public class CmBehaviorRecord {
     /**
      * 访问页面总数
      */
-    @ExcelProperty(value = "访问页面总数", index = 11)
+    @ExcelProperty(value = "访问页面总数", index = 12)
     private Integer numbers;
     /**
      * 公司类型
@@ -144,6 +144,11 @@ public class CmBehaviorRecord {
      */
     @ExcelIgnore
     private Integer clubId;
+    /**
+     * 导出使用id
+     */
+    @ExcelProperty(value = "id", index = 4)
+    private Integer reId;
     /**
      * 机构公司名称
      */
@@ -182,10 +187,12 @@ public class CmBehaviorRecord {
     /**
      * 注册开始时间--筛选
      */
+    @ExcelIgnore
     private String registerStartTime;
     /**
      * 注册结束时间--筛选
      */
+    @ExcelIgnore
     private String registerEndTime;
     /**
      * 供应商公司名称
@@ -205,7 +212,7 @@ public class CmBehaviorRecord {
     /**
      * 协销名称
      */
-    @ExcelProperty(value = "协销名称", index = 7)
+    @ExcelProperty(value = "协销名称", index = 8)
     private String spName;
     /**
      * 开始时间
@@ -235,17 +242,17 @@ public class CmBehaviorRecord {
     /**
      * 关联供应商
      */
-    @ExcelProperty(value = "关联供应商", index = 8)
+    @ExcelProperty(value = "关联供应商", index = 9)
     private String relevanceShop;
     /**
      * 标签
      */
-    @ExcelProperty(value = "标签", index = 9)
+    @ExcelProperty(value = "标签", index = 10)
     private String label;
     /**
      * 注册时间
      */
-    @ExcelProperty(value = "注册时间", index = 10)
+    @ExcelProperty(value = "注册时间", index = 11)
     private String addTime;
     /**
      * 页面查询条件

src/main/java/com/caimei365/manager/service/caimei/user/impl/CmBehaviorRecordServiceImpl.java

@@ -149,8 +149,10 @@ public class CmBehaviorRecordServiceImpl implements CmBehaviorRecordService {
                 t.setCompanyType("游客");
             } else if ("2".equals(t.getCompanyType())) {
                 t.setCompanyType("机构");
+                t.setReId(null != t.getClubId() ? t.getClubId() : null);
             } else {
-                t.setAccessClient("供应商");
+                t.setCompanyType("供应商");
+                t.setReId(null != t.getShopId() ? t.getShopId() : null);
             }
             // 总时长
             String time = calculationTime(t.getAccessDuration());

src/main/resources/mapper/CmBehaciorRecordDao.xml

@@ -42,9 +42,10 @@
         cbri.IP as ip,
         cbri.userID as userId,
         cbri.clubID as clubId,
+        s.shopId,
         cbri.lastAccessTime,
         cbri.companyType,
-        cbri.corporateName,
+        (CASE WHEN cbri.corporateName IS NULL OR cbri.corporateName = '' THEN c.name END) AS corporateName,
         cbri.contacts,
         cbri.phoneNumber,
         cbri.spName,
@@ -62,6 +63,8 @@
         cbri.addTime
         FROM cm_behavior_record_index cbri
         left join user u on u.userId = cbri.userId
+        LEFT JOIN club c ON c.clubId = cbri.clubId
+        LEFT JOIN shop s ON s.userId = cbri.userId
         <where>
             cbri.delFlag = 0
             <if test="clubId != null">
@@ -127,9 +130,10 @@
         cbrt.IP as ip,
         cbrt.userID as userId,
         cbrt.clubID as clubId,
+        s.shopId,
         cbrt.lastAccessTime,
         cbrt.companyType,
-        cbrt.corporateName,
+        (CASE WHEN cbrt.corporateName IS NULL OR cbrt.corporateName = '' THEN c.name END) AS corporateName,
         cbrt.contacts,
         cbrt.phoneNumber,
         cbrt.spName,
@@ -146,6 +150,8 @@
         cbrt.addTime
         FROM cm_behavior_record_today cbrt
         left join user u on u.userId = cbrt.userId
+        left join club c on c.clubId = cbrt.clubId
+        LEFT JOIN shop s ON s.userId = cbrt.userId
         <where>
             <if test="clubId != null">
                 AND cbrt.clubId = #{clubId}