Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

src/main/java/com/huiju/estateagents/controller/TaPersonVisitRecordController.java

@@ -350,13 +350,16 @@ public class TaPersonVisitRecordController extends BaseController {
         }
         //使用分页插件
         IPage<TaConsultantInfo> pg = new Page<>(pageNumber, pageSize);
-        IPage<TaConsultantInfo> result = iTaPersonVisitRecordService.getConsultantShareInfoList(pg, userId, getOrgId(request));
+        QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
+        taPersonQueryWrapper.eq("user_id", userId);
+        TaPerson taPerson = taPersonService.getOne(taPersonQueryWrapper);
+        IPage<TaConsultantInfo> result = iTaPersonVisitRecordService.getConsultantShareInfoList(pg, taPerson.getPersonId());
 
         List<TaConsultantInfo> taConsultantInfos = result.getRecords();
         taConsultantInfos.forEach(e ->{
-            Integer shareNum = iTaPersonVisitRecordService.countShareNumByEventType(e.getTargetId(), getOrgId(request), userId, e.getEventType());
+            Integer shareNum = iTaPersonVisitRecordService.countShareNumByEventType(getOrgId(request), e.getTargetId(), userId, (CommConstant.FAVOR_PROJECT.equals(e.getEventType()) ? "building" : e.getEventType()) + "_share");
             switch (e.getEventType()){
-                case CommConstant.POSTER_CONTENT_TYPE_ACTIVITY:
+                case CommConstant.FAVOR_PROJECT:
                     e.setActivityShareNum(shareNum);
                     break;
                 case CommConstant.POINTS_CHANGE_HELP:

src/main/java/com/huiju/estateagents/entity/TaBuilding.java

@@ -52,7 +52,7 @@ public class TaBuilding implements Serializable {
     /**
      * 开盘时间
      */
-    private LocalDateTime openingDate;
+    private String openingDate;
 
     /**
      * 项目地址

src/main/java/com/huiju/estateagents/mapper/TaPersonVisitRecordMapper.java

@@ -80,7 +80,7 @@ public interface TaPersonVisitRecordMapper extends BaseMapper<TaPersonVisitRecor
 
     IPage<TaPersonVisitRecord> getWxVisitRecordActivityList(IPage<TaPersonVisitRecord> pg, @Param("userId") Integer userId,@Param("personId") String personId,@Param("orgId") Integer orgId,@Param("eventType") String eventType);
 
-    IPage<TaConsultantInfo> getConsultantShareInfoList(IPage<TaConsultantInfo> pg, @Param("userId") Integer userId, @Param("orgId") Integer orgId);
+    IPage<TaConsultantInfo> getConsultantShareInfoList(IPage<TaConsultantInfo> pg, @Param("personId") String personId);
 
-    Integer countShareNumByEventType(@Param("targetId") String targetId, @Param("orgId")Integer orgId, @Param("userId")Integer userId, @Param("eventType")String eventType);
+    Integer countShareNumByEventType(@Param("orgId")Integer orgId, @Param("targetId") String targetId, @Param("userId")Integer userId, @Param("eventType")String eventType);
 }

src/main/java/com/huiju/estateagents/service/ITaPersonVisitRecordService.java

@@ -60,7 +60,7 @@ public interface ITaPersonVisitRecordService extends IService<TaPersonVisitRecor
 
 	IPage<TaPersonVisitRecord> getDrainageVisitRecord(IPage<TaPersonVisitRecord> pg, Integer orgId, String activityName, String eventType, String shareName, String shareTel, String buildingId, String personType, List<TaPersonBuilding> taPersonBuildingList);
 
-	IPage<TaConsultantInfo> getConsultantShareInfoList(IPage<TaConsultantInfo> pg, Integer userId, Integer orgId);
+	IPage<TaConsultantInfo> getConsultantShareInfoList(IPage<TaConsultantInfo> pg, String personId);
 
-	Integer countShareNumByEventType(String targetId, Integer orgId, Integer userId, String eventType);
+	Integer countShareNumByEventType(Integer orgId, String targetId, Integer userId, String eventType);
 }

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

@@ -458,9 +458,6 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
         TaBuilding building = object.toJavaObject(TaBuilding.class);
 
-        if(null!= object.getDate("openingDate")){
-            building.setOpeningDate(DateUtils.date2LocalDateTime(object.getDate("openingDate")));
-        }
         building.setCreateDate(LocalDateTime.now());
         building.setStatus(2);
         building.setOrgId(orgId);

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

@@ -164,14 +164,14 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 	}
 
 	@Override
-	public IPage<TaConsultantInfo> getConsultantShareInfoList(IPage<TaConsultantInfo> pg, Integer userId, Integer orgId) {
-		IPage<TaConsultantInfo> result = personVisitRecordMapper.getConsultantShareInfoList(pg,userId,orgId);
+	public IPage<TaConsultantInfo> getConsultantShareInfoList(IPage<TaConsultantInfo> pg, String personId) {
+		IPage<TaConsultantInfo> result = personVisitRecordMapper.getConsultantShareInfoList(pg,personId);
 		return result;
 	}
 
 	@Override
-	public Integer countShareNumByEventType(String targetId, Integer orgId, Integer userId, String eventType) {
-		return personVisitRecordMapper.countShareNumByEventType(targetId, orgId, userId, eventType);
+	public Integer countShareNumByEventType(Integer orgId, String targetId, Integer userId, String eventType) {
+		return personVisitRecordMapper.countShareNumByEventType(orgId, targetId, userId, eventType);
 	}
 
 	/**

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

@@ -62,7 +62,7 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
             taBuildingDynamicQuery.eq("dynamic_id",id);
             TaBuildingDynamic taBuildingDynamic = taBuildingDynamicMapper.selectOne(taBuildingDynamicQuery);
             taBuildingDynamicMapper.updateById( taBuildingDynamic.setShareNum(taBuildingDynamic.getShareNum() == null ? 1:taBuildingDynamic.getShareNum()+1));
-            return ResponseBean.success("成功");
+//            return ResponseBean.success("成功");
         }
 
         QueryWrapper<TaShare> queryWrapper = new QueryWrapper<>();

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -211,20 +211,18 @@
         select * From (
             select * from (
                 select
-                t.target_id,
+                t.be_share as target_id,
                 a.url as activity_img,
                 a.building_name as activity_name,
                 a.building_name,
                 a.address,
                 a.price,
-                t.event_type,
-                t.visit_time
-                from ta_person_visit_record t
-                left join (select b.url, a.building_name,a.address,a.price,a.building_id from ta_building a left join ta_building_img b on a.building_id = b.building_id where b.img_type = 'list') a on t.target_id = a.building_id
-                where t.event_type = 'building'
-                and t.consultant_id = #{userId}
-                and t.org_id = #{orgId}
-                and t.`event` = 'share' order by t.visit_time desc limit 9999
+                t.tagert_type as eventType,
+				t.create_date
+                from ta_share t
+                left join (select b.url, a.building_name,a.address,a.price,a.building_id from ta_building a left join ta_building_img b on a.building_id = b.building_id where b.img_type = 'list') a on t.be_share = a.building_id
+                where t.tagert_type = 'project'
+                and t.person_id = #{personId} order by t.create_date desc limit 9999
             ) t
             group by t.target_id
 
@@ -232,20 +230,18 @@
 
         select * from (
         select
-        t.target_id,
+        t.be_share as target_id,
         b.list_img_url as activity_img,
         b.title as activity_name,
         '1' as price,
         '2' as building_name,
         '3' as address,
-        t.event_type,
-		t.visit_time
-        from ta_person_visit_record t
-        left join ta_building_dynamic b on t.target_id = b.dynamic_id
-        where t.event_type = 'activity'
-        and t.consultant_id = #{userId}
-        and t.org_id = #{orgId}
-        and t.`event` = 'share' order by t.visit_time desc limit 9999
+        t.tagert_type as eventType,
+		t.create_date
+        from ta_share t
+        left join ta_building_dynamic b on t.be_share = b.dynamic_id
+        where t.tagert_type = 'activity'
+        and t.person_id = #{personId} order by t.create_date desc limit 9999
         ) t
         group by t.target_id
 
@@ -253,20 +249,18 @@
 
         select * from (
         select
-        t.target_id,
+        t.be_share as target_id,
         c.list_img as activity_img,
         c.title as activity_name,
         '1' as price,
         '2' as building_name,
         '3' as address,
-        t.event_type,
-		t.visit_time
-        from ta_person_visit_record t
-        left join ta_help_activity c on t.target_id = c.help_activity_id
-        where t.event_type = 'help'
-        and t.consultant_id = #{userId}
-        and t.org_id = #{orgId}
-        and t.`event` = 'share' order by t.visit_time desc limit 9999
+        t.tagert_type as eventType,
+		t.create_date
+        from ta_share t
+        left join ta_help_activity c on t.be_share = c.help_activity_id
+        where t.tagert_type = 'help'
+        and t.person_id = #{personId} order by t.create_date desc limit 9999
         ) t
         group by t.target_id
 
@@ -274,41 +268,37 @@
 
         select * from (
         select
-        t.target_id,
+        t.be_share as target_id,
         d.list_img as activity_img,
         d.activity_name as activity_name,
         '1' as price,
         '2' as building_name,
         '3' as address,
-        t.event_type,
-		t.visit_time
-        from ta_person_visit_record t
-        left join ta_share_activity d on t.target_id = d.group_activity_id
-        where t.event_type = 'group'
-        and t.consultant_id = #{userId}
-        and t.org_id = #{orgId}
-        and t.`event` = 'share'
-        group by t.target_id order by t.visit_time desc limit 9999
+        t.tagert_type as eventType,
+		t.create_date
+        from ta_share t
+        left join ta_share_activity d on t.be_share = d.group_activity_id
+        where t.tagert_type = 'group'
+        and t.person_id = #{personId} order by t.create_date desc limit 9999
         ) t
+		group by t.target_id
 
         union all
 
         select * from (
         select
-        t.target_id,
+        t.be_share as target_id,
         e.news_img as activity_img,
         e.news_name as activity_name,
         '1' as price,
         '2' as building_name,
         '3' as address,
-        t.event_type,
-		t.visit_time
-        from ta_person_visit_record t
-        left join ta_news e on t.target_id = e.news_id
-        where t.event_type = 'news'
-        and t.consultant_id = #{userId}
-        and t.org_id = #{orgId}
-        and t.`event` = 'share' order by t.visit_time desc limit 9999
+        t.tagert_type as eventType,
+		t.create_date
+        from ta_share t
+        left join ta_news e on t.be_share = e.news_id
+        where t.tagert_type = 'news'
+        and t.person_id = #{personId} order by t.create_date desc limit 9999
         ) t
         group by t.target_id
 
@@ -316,35 +306,32 @@
 
         select * from (
             select
-            t.target_id,
+            t.be_share as target_id,
             f.share_img as activity_img,
             f.`name` as activity_name,
             '1' as price,
             '2' as building_name,
             '3' as address,
-            t.event_type,
-            t.visit_time
-            from ta_person_visit_record t
-            left join ta_drainage f on t.target_id = f.drainage_id
-            where t.event_type = 'h5'
-            and t.consultant_id = #{userId}
-            and t.org_id = #{orgId}
-            and t.`event` = 'share' order by t.visit_time desc limit 9999
+			t.tagert_type as eventType,
+			t.create_date
+            from ta_share t
+            left join ta_drainage f on t.be_share = f.drainage_id
+            where t.tagert_type = 'h5'
+            and t.person_id = #{personId} order by t.create_date desc limit 9999
             ) t
             group by t.target_id
         ) t
-        order by t.visit_time desc
+        order by t.create_date desc
     </select>
 
     <select id="countShareNumByEventType" resultType="java.lang.Integer">
-        select count(DISTINCT t.person_id)  from ta_person_visit_record t
+        select count(DISTINCT t.person_id)  from ta_share_person_from t
         where
-        t.consultant_id = #{userId}
-        and t.org_id = #{orgId}
-        and t.event_type = #{eventType}
+        t.share_person = #{userId}
+        and t.orgId = #{orgId}
+        and t.target_type = #{eventType}
         and t.target_id = #{targetId}
-        and t.person_id != t.share_person_id
-        group by t.event_type
+        group by t.target_type
     </select>
 
 </mapper>