bug fix

src/main/java/com/huiju/estateagents/channel/sysChannel/controller/SysUserChannelController.java

@@ -233,6 +233,7 @@ public class SysUserChannelController extends BaseController {
             return responseBean;
         }
 
+        taChannelProxy.setExpireDate(taChannelProxy.getExpireDate().plusDays(1L));
         //更新业务层的登录账号为禁用
         if (taChannelProxy.getStatus() != null){
             QueryWrapper<TaChannelAppRelation> taChannelAppRelationQueryWrapper = new QueryWrapper<>();

src/main/java/com/huiju/estateagents/excel/TaActivityDynamicEnlistExport.java

@@ -41,10 +41,10 @@ public class TaActivityDynamicEnlistExport implements Serializable {
      * 推广人
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "推广人", index = 4)
+    @ExcelProperty(value = "引流人", index = 4)
     private String sharePersonName;
 
-    /**
+    /*
      * 公司
      */
     @ColumnWidth(15)

src/main/java/com/huiju/estateagents/service/impl/TaPersonVisitRecordServiceImpl.java

@@ -132,7 +132,7 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 				e.setUserTel(personInfo.getPhone());
 			}
 
-			TaPerson userShareInfo = taPersonMapper.selectById(e.getSharePersonId());
+			TaPerson userShareInfo = taPersonMapper.selectById(e.getPersonId());
 			if (userShareInfo != null) {
 				e.setShareName(userShareInfo.getNickname());
 				e.setShareTel(userShareInfo.getPhone());

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -154,7 +154,12 @@
     <select id="getDrainageVisitRecord" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
         select * from (
             select
-            <include refid="columnSql"></include>,
+<!--            <include refid="columnSql"></include>,-->
+            t.person_id,
+            c.person_type,
+            t.create_date as visit_time,
+            t.tagert_type as event_type,
+            t.be_share as target_id,
             b.name as drainageName,
             d.building_name as buildingName,
             tn.news_name as newsName,
@@ -162,26 +167,25 @@
             tsa.activity_name as groupActivityName,
             tbd.title as activityName,
             b.drainage_id
-            from ta_person_visit_record t
-            left join ta_drainage b on t.target_id = b.drainage_id
-            left join ta_building d on t.target_id = d.building_id
-            left join ta_news tn on t.target_id = tn.news_id
-            left join ta_help_activity tha on t.target_id = tha.help_activity_id
-            left join ta_share_activity tsa on t.target_id = tsa.group_activity_id
-            left join ta_building_dynamic tbd on t.target_id = tbd.dynamic_id
-            left join ta_person c on t.share_person_id = c.person_id
-            where
-            t.share_person_id != t.person_id and t.share_person_id is not null and t.share_person_id != ''
+            from ta_share t
+            left join ta_drainage b on t.be_share = b.drainage_id
+            left join ta_building d on t.be_share = d.building_id
+            left join ta_news tn on t.be_share = tn.news_id
+            left join ta_help_activity tha on t.be_share = tha.help_activity_id
+            left join ta_share_activity tsa on t.be_share = tsa.group_activity_id
+            left join ta_building_dynamic tbd on t.be_share = tbd.dynamic_id
+            left join ta_person c on t.person_id = c.person_id
+            where 1=1
             <if test="orgId != null and orgId != ''">
-                and t.org_id = #{orgId}
+                and c.org_id = #{orgId}
             </if>
             <if test="eventType !=null and eventType != ''">
-                and t.event_type = #{eventType}
+                and t.tagert_type = #{eventType}
             </if>
             <if test="activityName !=null and activityName != ''">
                 and (
-                (b.name like concat('%',#{activityName},'%') and t.event_type = 'h5')or (d.name like concat('%',#{activityName},'%') and t.event_type = 'building') or (tn.news_name like concat('%',#{activityName},'%') and t.event_type = 'news')
-                or (tha.title like concat( '%', #{activityName}, '%' ) and t.event_type = 'help')  or (tsa.activity_name like concat('%',#{activityName},'%') and t.event_type = 'group') or (tbd.title like concat('%',#{activityName},'%') and t.event_type = 'activity')
+                (b.name like concat('%',#{activityName},'%') and t.tagert_type = 'h5')or (d.name like concat('%',#{activityName},'%') and t.tagert_type = 'building') or (tn.news_name like concat('%',#{activityName},'%') and t.tagert_type = 'news')
+                or (tha.title like concat( '%', #{activityName}, '%' ) and t.tagert_type = 'help')  or (tsa.activity_name like concat('%',#{activityName},'%') and t.tagert_type = 'group') or (tbd.title like concat('%',#{activityName},'%') and t.tagert_type = 'activity')
                 )
             </if>
             <if test="shareName !=null and shareName != ''">
@@ -191,23 +195,23 @@
                 and c.phone = #{shareTel}
             </if>
             <if test="personType == 'Realty Consultant'">
-                and t.consultant_id is not null  and t.consultant_id != ''
+                and c.person_type = 'Realty Consultant'
             </if>
             <if test="personType == 'customer'">
-                and t.consultant_id is null
+                and c.person_type != 'Realty Consultant'
             </if>
             <if test="buildingId !=null and buildingId != ''">
-                and t.building_id = #{buildingId}
+                and d.building_id = #{buildingId}
             </if>
             <if test="personBuildingList != null and personBuildingList.size > 0">
-                AND t.building_id in
+                AND d.building_id in
                 <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
                     #{personBuilding.buildingId}
                 </foreach>
             </if>
-            order by t.visit_time desc
+            order by t.create_date desc
         ) t
-        group by t.person_id, t.share_person_id,t.target_id,t.event_type
+        group by t.person_id, t.target_id,t.event_type
         order by t.visit_time desc
     </select>
 
@@ -325,7 +329,7 @@
             ) t
             group by t.target_id
         ) t
-        order by t.create_date desc
+        order by t.visit_time desc
     </select>
 
     <select id="countShareNumByEventType" resultType="java.lang.Integer">