change sms url

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>estateagents</artifactId>
-	<version>v3.5.2.2</version>
+	<version>v3.5.5</version>
 	<name>estateages</name>
 	<description>置业经纪人</description>
 

src/main/java/com/huiju/estateagents/cleancode/CleanCode.java

@@ -32,7 +32,7 @@ public class CleanCode {
     @Autowired
     private ISysButtonInMenuService sysButtonInMenuService;
 
-    @RequestMapping(value = "/clean/menurole", method = RequestMethod.GET)
+    @RequestMapping(value = "/admin/clean/menurole", method = RequestMethod.GET)
     public void cleanMenu() {
         List<SysMenu> sysMenuList = sysMenuService.list();
 
@@ -50,7 +50,7 @@ public class CleanCode {
         });
     }
 
-    @RequestMapping(value = "/clean/buttonrole", method = RequestMethod.GET)
+    @RequestMapping(value = "/admin/clean/buttonrole", method = RequestMethod.GET)
     public void cleanButton() {
         List<SysButtonInMenu> buttlist = sysButtonInMenuService.list();
 

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

@@ -109,7 +109,7 @@ public class ExtendContentController extends BaseController {
             queryWrapper.ne("status",9);
             queryWrapper.eq(status != null, "status", status);
             queryWrapper.eq( "org_id", getOrgId(request));
-            queryWrapper.and(wapper -> wapper.in(taPersonBuildingList.size() > 0,"building_id",taPersonBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList())).or().isNull("building_id"));
+            queryWrapper.and(taPersonBuildingList.size() > 0, wapper -> wapper.in("building_id",taPersonBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList())).or().isNull("building_id"));
             queryWrapper.orderByDesc("create_date");
             IPage<ExtendContent> result = iExtendContentService.page(pg, queryWrapper);
 

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

@@ -537,6 +537,27 @@ public class TaBuildingDynamicController extends BaseController {
         }
         return responseBean;
     }
+
+    @ApiOperation(value = "活动推首页", notes = "活动推首页")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "String", name = "dynamicId", paramType = "query",value = "活动ID"),
+            @ApiImplicitParam(dataType = "Integer", name = "home", paramType = "query",value = "首页标志")
+    })
+    @RequestMapping(value = "/admin/buildingDynamic/home" ,method =RequestMethod.PUT)
+    public  ResponseBean buildingDynamicHome(@RequestParam String dynamicId,@RequestParam Integer home,HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        TaBuildingDynamic dynamic = iBuildingDynamicService.getById(dynamicId);
+        dynamic.setHome(home);
+        dynamic.setOrgId(getOrgId(request));
+        QueryWrapper<TaBuildingDynamic> dynamicQueryWrapper = new QueryWrapper<>();
+        dynamicQueryWrapper.eq("dynamic_id",dynamic);
+        if (iBuildingDynamicService.updateById(dynamic)){
+            responseBean.addSuccess("成功");
+        }else {
+            responseBean.addError("失败");
+        }
+        return responseBean;
+    }
     
     
     @ApiOperation(value = "后端删除", notes = "后端删除")

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

@@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Method;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.List;
@@ -50,6 +51,9 @@ public class TaPersonVisitRecordController extends BaseController {
     public ITaPersonIntentionRecordService personIntentionRecordService;
     @Autowired
     public ITaBuildingService buildingService;
+    @Autowired
+    private ITaRecommendCustomerService taRecommendCustomerService;
+
 
 
     /**
@@ -259,13 +263,13 @@ public class TaPersonVisitRecordController extends BaseController {
      * @return
      */
     @RequestMapping(value="/wx/visitRecord",method= RequestMethod.GET)
-    public ResponseBean wxVisitRecordList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
+    public ResponseBean wxPersonVisitRecordList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                                 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                                @RequestParam(value = "userId") Integer userId,HttpServletRequest request){
+                                                @RequestParam(value = "userId") Integer userId,@RequestParam(value = "targetId")String targetId,HttpServletRequest request){
         try {
             //使用分页插件
             IPage<TaPersonVisitRecord> pg = new Page<>(pageNumber, pageSize);
-            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getWxVisitRecordList(pg, userId,getOrgId(request));
+            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getWxVisitRecordList(pg, userId,getOrgId(request),targetId);
             return ResponseBean.success(result);
         }catch (Exception e){
             e.printStackTrace();
@@ -319,8 +323,8 @@ public class TaPersonVisitRecordController extends BaseController {
 
         List<TaConsultantInfo> taConsultantInfos = result.getRecords();
         taConsultantInfos.forEach(e ->{
-            Integer shareNum = iTaPersonVisitRecordService.countShareNumByEventType(e.getTargetId(), getOrgId(request), userId, e.getShareType());
-            switch (e.getShareType()){
+            Integer shareNum = iTaPersonVisitRecordService.countShareNumByEventType(e.getTargetId(), getOrgId(request), userId, e.getEventType());
+            switch (e.getEventType()){
                 case CommConstant.POSTER_CONTENT_TYPE_ACTIVITY:
                     e.setActivityShareNum(shareNum);
                     break;
@@ -344,22 +348,4 @@ public class TaPersonVisitRecordController extends BaseController {
         result.setRecords(taConsultantInfos);
         return ResponseBean.success(result);
     }
-
-    @RequestMapping(value = "/wx/sharePersonInfoList",method= RequestMethod.GET)
-    public ResponseBean getSharePersonList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
-                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                           @RequestParam(value = "userId") Integer userId,
-                                           @RequestParam(value = "targetId")Integer targetId,
-                                           HttpServletRequest request){
-        try {
-            //使用分页插件
-            IPage<TaPerson> pg = new Page<>(pageNumber, pageSize);
-            IPage<TaPerson> result = iTaPersonVisitRecordService.getSharePersonList(pg, getOrgId(request), userId, targetId);
-            return ResponseBean.success(result);
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("taPersonVisitRecordList -=- {}",e.toString());
-            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
 }

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

@@ -398,7 +398,7 @@ public class TaRecommendCustomerController extends BaseController {
     public ResponseBean getCustomersIRecommended (@RequestParam int pageNumber, @RequestParam int pageSize, @PathVariable String customerId,HttpServletRequest request){
         Integer orgId = getOrgId(request);
         try{
-            return ResponseBean.success(taRecommendCustomerService.getCustomersIRecommended(pageNumber,pageSize,customerId,orgId));
+            return ResponseBean.success(taRecommendCustomerService.getCustomersIRecommended(pageNumber,pageSize,customerId,orgId,getTaPersonBuildingListByUserId(request)));
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
@@ -415,7 +415,7 @@ public class TaRecommendCustomerController extends BaseController {
         }
         TaPerson person = taPersons.get(0);
         try{
-            return ResponseBean.success(taRecommendCustomerService.getCustomersIRecommended(pageNumber,pageSize,person.getPersonId(),orgId));
+            return ResponseBean.success(taRecommendCustomerService.getCustomersIRecommended(pageNumber,pageSize,person.getPersonId(),orgId,null));
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
@@ -521,10 +521,10 @@ public class TaRecommendCustomerController extends BaseController {
     @GetMapping(value = "/admin/customer/recommend/get/{id}")
     public ResponseBean getCustomerDetail(@PathVariable String id,
                                           @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
-                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) {
+                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(taRecommendCustomerService.getCustomerDetail(id,pageNumber,pageSize));
+            responseBean.addSuccess(taRecommendCustomerService.getCustomerDetail(id,pageNumber,pageSize,getTaPersonBuildingListByUserId(request)));
         }catch (Exception e){
             e.printStackTrace();
             responseBean.addError(e.getMessage());
@@ -535,10 +535,10 @@ public class TaRecommendCustomerController extends BaseController {
     @GetMapping(value = "/admin/customer/recommend/public/get/{id}")
     public ResponseBean getPublicCustomerDetail(@PathVariable String id,
                                                 @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
-                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) {
+                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(taRecommendCustomerService.getPublicCustomerDetail(id,pageNumber,pageSize));
+            responseBean.addSuccess(taRecommendCustomerService.getPublicCustomerDetail(id,pageNumber,pageSize,getTaPersonBuildingListByUserId(request)));
         }catch (Exception e){
             e.printStackTrace();
             responseBean.addError(e.getMessage());
@@ -618,7 +618,7 @@ public class TaRecommendCustomerController extends BaseController {
         response.setCharacterEncoding("utf-8");
         response.setHeader("Content-disposition", "attachment;filename=推荐客户.xlsx");
 
-        Integer count = taRecommendCustomerService.getRecCustomerExportCount(getOrgId(request));
+        Integer count = taRecommendCustomerService.getRecCustomerExportCount(getOrgId(request),getTaPersonBuildingListByUserId(request));
 
         Integer pageCode = 0;
         Integer pageSize = 100;
@@ -629,7 +629,7 @@ public class TaRecommendCustomerController extends BaseController {
         // 设置 sheet, 同一个sheet只需要设置一次
         WriteSheet writeSheet = EasyExcel.writerSheet("推荐客户").build();
         do {
-            List<ExcelRecommendCustomer> recCustomerExport = taRecommendCustomerService.getRecCustomerExport(getOrgId(request), pageCode * pageSize, pageSize);
+            List<ExcelRecommendCustomer> recCustomerExport = taRecommendCustomerService.getRecCustomerExport(getOrgId(request), pageCode * pageSize, pageSize,getTaPersonBuildingListByUserId(request));
             excelWriter.write(recCustomerExport, writeSheet);
 
             pageCode ++;
@@ -660,7 +660,7 @@ public class TaRecommendCustomerController extends BaseController {
         response.setCharacterEncoding("utf-8");
         response.setHeader("Content-disposition", "attachment;filename=报备客户.xlsx");
 
-        Integer count = taRecommendCustomerService.getRepCustomerReportCount(buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex,getOrgId(request));
+        Integer count = taRecommendCustomerService.getRepCustomerReportCount(buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex,getOrgId(request),getTaPersonBuildingListByUserId(request));
 
         Integer pageCode = 0;
         Integer pageSize = 100;
@@ -672,7 +672,7 @@ public class TaRecommendCustomerController extends BaseController {
         WriteSheet writeSheet = EasyExcel.writerSheet("报备客户").build();
         List<ReporRecommendCustomer> recCustomerExport = null;
         do {
-            recCustomerExport = taRecommendCustomerService.getRepCustomerReportExport(buildingId, name, tel, consultName, consultTel, entryType, verifyStatus, sex, getOrgId(request), pageCode * pageSize, pageSize);
+            recCustomerExport = taRecommendCustomerService.getRepCustomerReportExport(buildingId, name, tel, consultName, consultTel, entryType, verifyStatus, sex, getOrgId(request), pageCode * pageSize, pageSize,getTaPersonBuildingListByUserId(request));
             excelWriter.write(recCustomerExport, writeSheet);
 
             pageCode ++;
@@ -794,11 +794,11 @@ public class TaRecommendCustomerController extends BaseController {
             // 设置 sheet, 同一个sheet只需要设置一次
             WriteSheet writeSheet = EasyExcel.writerSheet("客户列表-私客").build();
 
-            Integer count = taRecommendCustomerMapper.getCustomerExportListCount(buildingId, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,status);
+            Integer count = taRecommendCustomerMapper.getCustomerExportListCount(buildingId, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,status,getTaPersonBuildingListByUserId(request));
             pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
             List<PrivateCustomerExport> privateList = null;
             do {
-                privateList = taRecommendCustomerMapper.getCustomerExportList(pageCode *  pageSize, pageSize, buildingId, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,status);
+                privateList = taRecommendCustomerMapper.getCustomerExportList(pageCode *  pageSize, pageSize, buildingId, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,status,getTaPersonBuildingListByUserId(request));
                 excelWriter.write(privateList, writeSheet);
 
                 pageCode ++;

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

@@ -154,12 +154,12 @@ public class HelpActivity implements Serializable {
      * activityId
      */
     @TableField(exist = false)
-    private Integer activityId;
+    private String activityId;
 
     /**
      * 助力拼团2表和1
      * type(1助力，2拼团)
      */
     @TableField(exist = false)
-    private Integer type;
+    private String type;
 }

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

@@ -117,6 +117,11 @@ public class TaBuildingDynamic implements Serializable {
      */
     private  LocalDateTime enlistEnd;
 
+    /**
+     * 活动推首页标志
+     */
+    private Integer home;
+
     /**
      * 活动的当前状态1:进行中，2:未开始,3:结束
      */

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

@@ -4,47 +4,31 @@ import lombok.Data;
 
 @Data
 public class TaConsultantInfo {
-    private Integer targetId;
-
-    private String shareType;
+    private String activityImg;
 
-    private String buildingUrl;
+    private String activityName;
 
     private String buildingName;
 
-    private Integer buildingNum;
-
     private String address;
 
     private String price;
 
-    private String activityImg;
+    private String eventType;
 
-    private String activityName;
+    private String targetId;
 
-    private Integer activityShareNum;
+    private String buildingUrl;
 
-    private String helpActivityName;
+    private Integer buildingNum;
 
-    private String helpActivityImg;
+    private Integer activityShareNum;
 
     private Integer helpActivityShareNum;
 
-    private String groupActivityImg;
-
-    private String groupActivityName;
-
     private Integer groupActivityShareNum;
 
-    private String newImg;
-
-    private String newName;
-
     private Integer newsNum;
 
-    private String drainageImg;
-
-    private String drainageName;
-
     private Integer drainageShareNum;
 }

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

@@ -281,4 +281,10 @@ public class TaPerson implements Serializable {
 
     @TableField(exist = false)
     private Integer duration;
+
+    /**
+     * 来源类型
+     */
+    @TableField(exist = false)
+    private String personFrom;
 }

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

@@ -130,6 +130,30 @@ public class TaPersonVisitRecord implements Serializable {
     @TableField(exist = false)
     private String activityName;
 
+    /**
+     * 资讯名称
+     */
+    @TableField(exist = false)
+    private String newsName;
+
+    /**
+     * 助力名称
+     */
+    @TableField(exist = false)
+    private String helpActivityName;
+
+    /**
+     * 拼团名称
+     */
+    @TableField(exist = false)
+    private String groupActivityName;
+
+    /**
+     * H5名称
+     */
+    @TableField(exist = false)
+    private String drainageName;
+
     /**
      * 分享者名称
      */
@@ -164,4 +188,10 @@ public class TaPersonVisitRecord implements Serializable {
      */
     @TableField(exist = false)
     private String nickname;
+
+    /**
+     * 客户id
+     */
+    @TableField(exist = false)
+    private String customerId;
 }

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

@@ -198,4 +198,10 @@ public class TaRecommendCustomer implements Serializable {
 
     @TableField(exist = false)
     private String avatarurl;
+
+    /**
+     * 来源类型
+     */
+    @TableField(exist = false)
+    private String personFrom;
 }

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

@@ -74,13 +74,11 @@ public interface TaPersonVisitRecordMapper extends BaseMapper<TaPersonVisitRecor
      */
 	IPage<TaPersonVisitRecord> getDrainageVisitRecord(IPage<TaPersonVisitRecord> pg, @Param("orgId") Integer orgId, @Param("activityName") String activityName, @Param("eventType") String eventType, @Param("shareName") String shareName, @Param("shareTel") String shareTel, @Param("buildingId") String buildingId, @Param("personType") String personType, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
-	IPage<TaPersonVisitRecord> getWxVisitRecordList(IPage<TaPersonVisitRecord> pg, @Param("userId") Integer userId, @Param("orgId") Integer orgId, @Param("eventType") String eventType,@Param("personId") String personId);
+	IPage<TaPersonVisitRecord> getWxVisitRecordList(IPage<TaPersonVisitRecord> pg, @Param("userId") Integer userId, @Param("orgId") Integer orgId, @Param("targetId") String targetId,@Param("personId") String personId);
 
     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);
 
-    Integer countShareNumByEventType(@Param("targetId") Integer targetId, @Param("orgId")Integer orgId, @Param("userId")Integer userId, @Param("eventType")String eventType);
-
-    IPage<TaPerson> getSharePersonList(IPage<TaPerson> pg, @Param("orgId") Integer orgId, @Param("userId")Integer userId, @Param("targetId")Integer targetId);
+    Integer countShareNumByEventType(@Param("targetId") String targetId, @Param("orgId")Integer orgId, @Param("userId")Integer userId, @Param("eventType")String eventType);
 }

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

@@ -55,28 +55,28 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param orgId
      * @return
      */
-    List<ExcelRecommendCustomer> getRecCustomerExport(@Param("orgId") Integer orgId, @Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize);
+    List<ExcelRecommendCustomer> getRecCustomerExport(@Param("orgId") Integer orgId, @Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
     /**
      * 导出数据 获取推荐用户数据 总数
      * @param orgId
      * @return
      */
-    Integer getRecCustomerExportCount(@Param("orgId") Integer orgId);
+    Integer getRecCustomerExportCount(@Param("orgId") Integer orgId,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
     /**
      * 导出数据 获取报备客户数据 总数
      * @param orgId
      * @return
      */
-    Integer getRepCustomerReportCount(@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex,@Param("orgId")Integer orgId);
+    Integer getRepCustomerReportCount(@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex,@Param("orgId")Integer orgId,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
     /**
      * 导出数据 获取报备客户数据
      * @param orgId
      * @return
      */
-    List<ReporRecommendCustomer> getRepCustomerReportExport(@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize);
+    List<ReporRecommendCustomer> getRepCustomerReportExport(@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
     /**
      * 导出数据 获取经纪人数据 总数
@@ -134,7 +134,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param status
      * @return
      */
-    Integer getCustomerExportListCount(@Param("building") String buildingId, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId,@Param("status")Integer status);
+    Integer getCustomerExportListCount(@Param("building") String buildingId, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId,@Param("status")Integer status,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
     /**
      * 导出数据 私客
@@ -152,7 +152,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param status
      * @return
      */
-    List<PrivateCustomerExport> getCustomerExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("building") String buildingId, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("status")Integer status);
+    List<PrivateCustomerExport> getCustomerExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("building") String buildingId, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("status")Integer status,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
     
     /**
      * 获取我的客户的人数统计
@@ -187,7 +187,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      */
     TaRecommendCustomer getMyCustDetailById(String customerId);
 
-    List<PersonIntention> getCustomerIntentions(@Param("personId")String personId);
+    List<PersonIntention> getCustomerIntentions(@Param("personId")String personId,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
-    IPage<TaRecommendCustomer>getCustomersIRecommended(IPage<TaRecommendCustomer> page,@Param("customerId")String customerId,@Param("status")Integer status,@Param("orgId") Integer orgId);
+    IPage<TaRecommendCustomer>getCustomersIRecommended(IPage<TaRecommendCustomer> page,@Param("customerId")String customerId,@Param("status")Integer status,@Param("orgId") Integer orgId,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 }

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

@@ -24,4 +24,11 @@ public interface ITaBuildingIntentionService extends IService<TaBuildingIntentio
      * @return
      */
     ResponseBean taBuildingIntentionAddOrUpdate(List<TdBizEvent> tdBizEventsList, String buildingId, Integer orgId);
+
+    /**
+     * 保存楼盘默认值
+     * @param orgId
+     * @param buildingId
+     */
+    void saveDefaultIntention(Integer orgId, String buildingId);
 }

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

@@ -35,7 +35,7 @@ public interface ITaPersonVisitRecordService extends IService<TaPersonVisitRecor
 	 * @param orgId
 	 * @return
 	 */
-	IPage<TaPersonVisitRecord> getWxVisitRecordList(IPage<TaPersonVisitRecord> pg, Integer userId, Integer orgId);
+	IPage<TaPersonVisitRecord> getWxVisitRecordList(IPage<TaPersonVisitRecord> pg, Integer userId, Integer orgId, String targetId);
 
 	/**
 	 * 获取这个人的活动数据列表
@@ -53,7 +53,5 @@ public interface ITaPersonVisitRecordService extends IService<TaPersonVisitRecor
 
 	IPage<TaConsultantInfo> getConsultantShareInfoList(IPage<TaConsultantInfo> pg, Integer userId, Integer orgId);
 
-	Integer countShareNumByEventType(Integer targetId, Integer orgId, Integer userId, String eventType);
-
-	IPage<TaPerson> getSharePersonList(IPage<TaPerson> pg, Integer orgId, Integer userId, Integer targetId);
+	Integer countShareNumByEventType(String targetId, Integer orgId, Integer userId, String eventType);
 }

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

@@ -44,13 +44,13 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
     IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize,String name,String tel, Integer orgId);
 
 
-    TaRecommendCustomer getCustomerDetail(String customerId,int pageNumber, int pageSize);
+    TaRecommendCustomer getCustomerDetail(String customerId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList);
 
-    TaPerson getPublicCustomerDetail(String personId,int pageNumber, int pageSize);
+    TaPerson getPublicCustomerDetail(String personId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList);
 
     TaRecommendCustomer getCustomerById(String customerId);
 
-    IPage<TaRecommendCustomer>getCustomersIRecommended(int pageNumber, int pageSize,String customerId,Integer orgId);
+    IPage<TaRecommendCustomer>getCustomersIRecommended(int pageNumber, int pageSize,String customerId,Integer orgId,List<TaPersonBuilding> taPersonBuildingList);
 
     TaRecommendCustomer newByPerson(TaPerson person);
 
@@ -59,21 +59,21 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
      * @param orgId
      * @return
      */
-    List<ExcelRecommendCustomer> getRecCustomerExport(Integer orgId, Integer pageCode, Integer pageSize);
+    List<ExcelRecommendCustomer> getRecCustomerExport(Integer orgId, Integer pageCode, Integer pageSize,List<TaPersonBuilding> taPersonBuildingList);
 
     /**
      * 导出数据(推荐客户) 总数
      * @param orgId
      * @return
      */
-    Integer getRecCustomerExportCount(Integer orgId);
+    Integer getRecCustomerExportCount(Integer orgId,List<TaPersonBuilding> taPersonBuildingList);
 
     /**
      * 导出数据(报备客户) 总数
      * @param orgId
      * @return
      */
-    Integer getRepCustomerReportCount(String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, Integer orgId);
+    Integer getRepCustomerReportCount(String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, Integer orgId,List<TaPersonBuilding> taPersonBuildingList);
 
     /**
      * 导出数据(报备客户)
@@ -82,7 +82,7 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
      * @param pageSize
      * @return
      */
-    List<ReporRecommendCustomer> getRepCustomerReportExport(String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, Integer orgId, Integer pageCode, Integer pageSize);
+    List<ReporRecommendCustomer> getRepCustomerReportExport(String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, Integer orgId, Integer pageCode, Integer pageSize,List<TaPersonBuilding> taPersonBuildingList);
 
     /**
      * 导出数据(经纪人) 总数
@@ -148,4 +148,5 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
      * @return
      */
     ResponseBean getAdminMyCustList(String openid, String keywords, int pageNumber, int pageSize);
+
 }

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

@@ -1,14 +1,18 @@
 package com.huiju.estateagents.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaBuildingIntention;
 import com.huiju.estateagents.entity.TdBizEvent;
 import com.huiju.estateagents.mapper.TaBuildingIntentionMapper;
+import com.huiju.estateagents.mapper.TdBizEventMapper;
 import com.huiju.estateagents.service.ITaBuildingIntentionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -26,6 +30,9 @@ public class TaBuildingIntentionServiceImpl extends ServiceImpl<TaBuildingIntent
     @Autowired
     private TaBuildingIntentionMapper taBuildingIntentionMapper;
 
+    @Autowired
+    private TdBizEventMapper tdBizEventMapper;
+
     @Override
     public ResponseBean taBuildingIntentionAddOrUpdate(List<TdBizEvent>tdBizEventsList, String buildingId, Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
@@ -53,4 +60,32 @@ public class TaBuildingIntentionServiceImpl extends ServiceImpl<TaBuildingIntent
         responseBean.addSuccess("操作成功！");
         return responseBean;
     }
+
+    /**
+     * 保存楼盘默认值
+     *
+     * @param orgId
+     * @param buildingId
+     */
+    @Override
+    public void saveDefaultIntention(Integer orgId, String buildingId) {
+        //获取所有的意向值类型
+        List<TdBizEvent> tdBizEventList = tdBizEventMapper.selectList(new QueryWrapper<>());
+        //构造意向值
+        List<TaBuildingIntention> taBuildingIntentions = new ArrayList<>();
+        tdBizEventList.forEach(e -> {
+            TaBuildingIntention taBuildingIntention = new TaBuildingIntention();
+            taBuildingIntention.setIntentionId(e.getIntentionId());
+            taBuildingIntention.setEventId(e.getEventId());
+            taBuildingIntention.setEventCode(e.getEventCode());
+            taBuildingIntention.setEventName(e.getEventName());
+            taBuildingIntention.setIntention(1);
+            taBuildingIntention.setCreateDate(LocalDateTime.now());
+            taBuildingIntention.setBuildingId(buildingId);
+            taBuildingIntention.setStatus(1);
+            taBuildingIntention.setOrgId(orgId);
+            taBuildingIntentions.add(taBuildingIntention);
+        });
+        this.saveBatch(taBuildingIntentions);
+    }
 }

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

@@ -15,11 +15,8 @@ import com.huiju.estateagents.common.DateUtils;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
-import com.huiju.estateagents.service.ITaBuildingMapRelationService;
-import com.huiju.estateagents.service.ITaBuildingService;
+import com.huiju.estateagents.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.huiju.estateagents.service.TaPosterService;
-import com.huiju.estateagents.service.TaShareContentService;
 import javafx.scene.control.Tab;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -90,6 +87,9 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     @Autowired
     private ITaBuildingMapRelationService iTaBuildingMapRelationService;
 
+    @Autowired
+    public ITaBuildingIntentionService iTaBuildingIntentionService;
+
     @Override
     public ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain, Integer orgId,List<TaPersonBuilding> taPersonBuildingList) {
         Page<TaBuilding> page = new Page<>();
@@ -467,6 +467,8 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             insertBuildingMapRelationBeach(taBuildingMapRelations, building.getBuildingId(), orgId);
         }
 
+        //添加默认意向值
+        iTaBuildingIntentionService.saveDefaultIntention(building.getOrgId(),building.getBuildingId());
 
         return ResponseBean.success(building);
     }
@@ -845,7 +847,6 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         QueryWrapper<TaBuilding> taBuildingQueryWrapper = new QueryWrapper<>();
         taBuildingQueryWrapper.eq("city_id", taBuilding.getCityId());
         taBuildingQueryWrapper.eq("is_main", 1);
-        taBuildingQueryWrapper.eq("status", 1);
         taBuildingQueryWrapper.eq("org_id", orgId);
         if (taBuilding.getBuildingId() != null){
             taBuildingQueryWrapper.ne("building_id", taBuilding.getBuildingId());

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

@@ -146,17 +146,10 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 	}
 
 	@Override
-	public Integer countShareNumByEventType(Integer targetId, Integer orgId, Integer userId, String eventType) {
+	public Integer countShareNumByEventType(String targetId, Integer orgId, Integer userId, String eventType) {
 		return personVisitRecordMapper.countShareNumByEventType(targetId, orgId, userId, eventType);
 	}
 
-	@Override
-	public IPage<TaPerson> getSharePersonList(IPage<TaPerson> pg, Integer orgId, Integer userId, Integer targetId) {
-		IPage<TaPerson> result = personVisitRecordMapper.getSharePersonList(pg, orgId, userId, targetId);
-		return result;
-	}
-
-
 	/**
 	 * 分页获取个人中心访客记录
 	 *
@@ -166,14 +159,14 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 	 * @return
 	 */
 	@Override
-	public IPage<TaPersonVisitRecord> getWxVisitRecordList(IPage<TaPersonVisitRecord> pg, Integer userId, Integer orgId) {
+	public IPage<TaPersonVisitRecord> getWxVisitRecordList(IPage<TaPersonVisitRecord> pg, Integer userId, Integer orgId, String targetId) {
 		//根据userId获取用户信息
 		QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
 		taPersonQueryWrapper.eq("user_id",userId);
 		taPersonQueryWrapper.eq("org_id",orgId);
 		TaPerson taPerson = taPersonMapper.selectOne(taPersonQueryWrapper);
 		//获取我的访问客户列表
-		IPage<TaPersonVisitRecord> result = personVisitRecordMapper.getWxVisitRecordList(pg,userId,orgId, CommConstant.EVENT_H5,taPerson.getPersonId());
+		IPage<TaPersonVisitRecord> result = personVisitRecordMapper.getWxVisitRecordList(pg,userId,orgId, targetId,taPerson.getPersonId());
 		List<TaPersonVisitRecord> records = result.getRecords();
 		//判断是否我的客户状态
 		records.forEach(e -> {
@@ -184,6 +177,8 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 			if (null != taRecommendCustomer){
 				//1是我的客户
 				e.setMyCustomer(CommConstant.STATUS_NORMAL);
+				//返回customer_id给微信端
+				e.setCustomerId(taRecommendCustomer.getCustomerId());
 			}
 		});
 		return result;

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

@@ -88,6 +88,9 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     @Autowired
     private TaUserMapper taUserMapper;
 
+    @Autowired
+    private TdPersonFromMapper tdPersonFromMapper;
+
     @Override
     public ResponseBean getMyCustList(String openid, String keywords, int pageNumber, int pageSize) {
         List<TaPerson> taPersons = getPersonsByOpenId(openid);
@@ -552,7 +555,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
 
     @Override
-    public TaRecommendCustomer getCustomerDetail(String customerId,int pageNumber, int pageSize){
+    public TaRecommendCustomer getCustomerDetail(String customerId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList){
         String personId = taRecommendCustomerMapper.getCustomerById(customerId).getPersonId();
         TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.getCustomerDetail(customerId,personId);
         TaPerson person = taPersonMapper.selectById(personId);
@@ -601,7 +604,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
             taPersonVisitRecordIPage.setRecords(records);
             taRecommendCustomer.setVisitRecords(taPersonVisitRecordIPage);
             taRecommendCustomer.setVisitTimes(taPersonVisitRecordIPage.getRecords().size());
-            taRecommendCustomer.setIntentions(taRecommendCustomerMapper.getCustomerIntentions(personId));
+            taRecommendCustomer.setIntentions(taRecommendCustomerMapper.getCustomerIntentions(personId,taPersonBuildingList));
             Map<String,String>geoInfo = new HashMap<>();
             geoInfo.put("provience",person.getProvince());
             geoInfo.put("country",person.getCountry());
@@ -629,11 +632,20 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
                 taRecommendCustomer.setConsultant(user);
             }
         }
+        //构造来源类型
+        taRecommendCustomer.setPersonFrom("");
+        if (null != person && null != person.getFromCode()){
+            QueryWrapper<TdPersonFrom> tdPersonFromQueryWrapper = new QueryWrapper<>();
+            tdPersonFromQueryWrapper.eq("from_code",person.getFromCode());
+            TdPersonFrom tdPersonFrom = tdPersonFromMapper.selectOne(tdPersonFromQueryWrapper);
+            taRecommendCustomer.setPersonFrom(null != tdPersonFrom ? tdPersonFrom.getFromName() : "");
+        }
+
         return taRecommendCustomer;
     }
 
     @Override
-    public TaPerson getPublicCustomerDetail(String personId,int pageNumber, int pageSize){
+    public TaPerson getPublicCustomerDetail(String personId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList){
         TaPerson taRecommendCustomer = taPersonMapper.getById(personId);
         if(!StringUtils.isEmpty(personId)){
             IPage<TaPersonVisitRecord>page = new Page<>(pageNumber,pageSize);
@@ -680,19 +692,28 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
             taPersonVisitRecordIPage.setRecords(records);
             taRecommendCustomer.setVisitRecords(taPersonVisitRecordIPage);
             taRecommendCustomer.setVisitTimes(taPersonVisitRecordIPage.getRecords().size());
-            taRecommendCustomer.setIntentions(taRecommendCustomerMapper.getCustomerIntentions(personId));
+            taRecommendCustomer.setIntentions(taRecommendCustomerMapper.getCustomerIntentions(personId,taPersonBuildingList));
             taRecommendCustomer.setDuration(taPersonVisitRecordMapper.getDurationByPersonId(personId));
             taRecommendCustomer.setVisitTime(taPersonVisitRecordMapper.getFirstVisitTimeByPersonId(personId));
             TdCity city = cityMapper.selectById(taRecommendCustomer.getCity());
             if(null != city){
                 taRecommendCustomer.setCity(city.getName());
             }
+
+            //构造来源类型
+            taRecommendCustomer.setPersonFrom("");
+            if (null != taRecommendCustomer.getFromCode()){
+                QueryWrapper<TdPersonFrom> tdPersonFromQueryWrapper = new QueryWrapper<>();
+                tdPersonFromQueryWrapper.eq("from_code",taRecommendCustomer.getFromCode());
+                TdPersonFrom tdPersonFrom = tdPersonFromMapper.selectOne(tdPersonFromQueryWrapper);
+                taRecommendCustomer.setPersonFrom(null != tdPersonFrom ? tdPersonFrom.getFromName() : "");
+            }
         }
         return taRecommendCustomer;
     }
 
     @Override
-    public IPage<TaRecommendCustomer>getCustomersIRecommended(int pageNumber, int pageSize,String customerId,Integer orgId){
+    public IPage<TaRecommendCustomer>getCustomersIRecommended(int pageNumber, int pageSize,String customerId,Integer orgId,List<TaPersonBuilding> taPersonBuildingList){
 
         QueryWrapper<TaRecommendCustomer>queryWrapper = new QueryWrapper<>();
         // todo
@@ -702,7 +723,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 ////        queryWrapper.eq("building_id",building);
 //        queryWrapper.eq("status", CommConstant.VERIFY_AGREE);
 //        queryWrapper.eq("org_id", orgId);
-        return taRecommendCustomerMapper.getCustomersIRecommended(page,customerId,CommConstant.STATUS_NORMAL,orgId);
+        return taRecommendCustomerMapper.getCustomersIRecommended(page,customerId,CommConstant.STATUS_NORMAL,orgId,taPersonBuildingList);
     }
 
     @Override
@@ -766,24 +787,24 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
 
     @Override
-    public List<ExcelRecommendCustomer> getRecCustomerExport(Integer orgId, Integer pageCode, Integer pageSize) {
-        return taRecommendCustomerMapper.getRecCustomerExport(orgId, pageCode, pageSize);
+    public List<ExcelRecommendCustomer> getRecCustomerExport(Integer orgId, Integer pageCode, Integer pageSize,List<TaPersonBuilding> taPersonBuildingList) {
+        return taRecommendCustomerMapper.getRecCustomerExport(orgId, pageCode, pageSize,taPersonBuildingList);
     }
 
     @Override
-    public Integer getRecCustomerExportCount(Integer orgId) {
-        return taRecommendCustomerMapper.getRecCustomerExportCount(orgId);
+    public Integer getRecCustomerExportCount(Integer orgId,List<TaPersonBuilding> taPersonBuildingList) {
+        return taRecommendCustomerMapper.getRecCustomerExportCount(orgId,taPersonBuildingList);
     }
 
 
     @Override
-    public Integer getRepCustomerReportCount(String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex,Integer orgId) {
-        return taRecommendCustomerMapper.getRepCustomerReportCount(building, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId);
+    public Integer getRepCustomerReportCount(String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex,Integer orgId,List<TaPersonBuilding> taPersonBuildingList) {
+        return taRecommendCustomerMapper.getRepCustomerReportCount(building, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,taPersonBuildingList);
     }
 
     @Override
-    public List<ReporRecommendCustomer> getRepCustomerReportExport(String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, Integer orgId, Integer pageCode, Integer pageSize) {
-        return taRecommendCustomerMapper.getRepCustomerReportExport(building, name, tel, consultName, consultTel, entryType,verifyStatus,sex, orgId, pageCode, pageSize);
+    public List<ReporRecommendCustomer> getRepCustomerReportExport(String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, Integer orgId, Integer pageCode, Integer pageSize,List<TaPersonBuilding> taPersonBuildingList) {
+        return taRecommendCustomerMapper.getRepCustomerReportExport(building, name, tel, consultName, consultTel, entryType,verifyStatus,sex, orgId, pageCode, pageSize,taPersonBuildingList);
     }
 
 

src/main/resources/mapper/HelpActivityMapper.xml

@@ -66,9 +66,13 @@
 			SELECT
                 a.city_id as cityId,
 				a.help_activity_id as activityId,
-				a.img as img,
+				a.list_img as img,
                 a.banner_list_img as bannerListImg,
-				1 AS type
+                a.title as title,
+                a.end_date as endDate,
+                a.`status` as status,
+                a.activity_status as activityStatus,
+				"help" AS type
 			FROM
 				ta_help_activity a
 				WHERE
@@ -82,15 +86,20 @@
                 <if test="buildingId != null and buildingId != ''">
                   and a.building_id = #{buildingId}
                 </if>
+                 order  by a.heavy desc
 		)
 		UNION ALL
 			(
 				SELECT
                     s.city_id as cityId,
 					s.group_activity_id as activityId,
-					s.main_img as img,
+					s.list_img as img,
                     s.banner_list_img as bannerListImg,
-					2 AS type
+                    s.activity_name as title,
+                    s.end_time as endDate,
+                    s.status as status,
+                    s.activity_status as activityStatus,
+					"group" AS type
 				FROM
 					ta_share_activity s
 					WHERE
@@ -104,7 +113,35 @@
                 <if test="buildingId != null and buildingId != ''">
                     and s.building_id = #{buildingId}
                 </if>
+                order  by s.heavy desc
 			)
+		UNION ALL
+		    (
+                SELECT
+                t.city_id as cityId,
+                t.dynamic_id as activityId,
+                t.list_img_url as img,
+                t.banner_list_img as bannerListImg,
+                t.title as title,
+                t.end_date as endDate,
+                t.status as status,
+                t.activity_status as activityStatus,
+                "activity" AS type
+                FROM
+                ta_building_dynamic t
+                WHERE
+                t.org_id =#{orgId} and t.`status` = 1
+                <if test="buildingId  == null or  buildingId =='' ">
+                    and  t.home = 1
+                </if>
+                <if test="cityID != null and cityID != ''">
+                    and  t.city_id = #{cityID}
+                </if>
+                <if test="buildingId != null and buildingId != ''">
+                    and t.building_id = #{buildingId}
+                </if>
+                order  by t.heavy desc
+            )
     </select>
 
     <select id="helpActivityListEffectivePage" resultType="com.huiju.estateagents.entity.HelpActivity">

src/main/resources/mapper/TaDrainageMapper.xml

@@ -4,6 +4,6 @@
     <update id="updateDrainageToEnd">
         update ta_drainage
         set status = 0
-        where NOW() > end_date
+        where NOW() > end_date and status != -1
     </update>
 </mapper>

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -99,7 +99,7 @@
 	        d.name as activity_name,
 	        d.create_date
         FROM
-            ( SELECT * FROM ta_person_visit_record WHERE org_id = #{orgId} and event_type = #{eventType} AND consultant_id = #{userId} and person_id != #{personId} ORDER BY visit_time DESC LIMIT 999) t
+            ( SELECT * FROM ta_person_visit_record WHERE org_id = #{orgId} and target_id = #{targetId} AND consultant_id = #{userId} and person_id != #{personId} ORDER BY visit_time DESC LIMIT 999) t
             left JOIN ta_person p on t.person_id = p.person_id
             LEFT join ta_drainage d on t.target_id = d.drainage_id
         GROUP BY
@@ -125,12 +125,21 @@
         select * from (
             select
             <include refid="columnSql"></include>,
-            b.name as activityName,
+            b.name as drainageName,
+            d.building_name as buildingName,
+            tn.news_name as newsName,
+            tha.title as helpActivityName,
+            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_person c on t.share_person_id = c.person_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 is not null
             <if test="orgId != null and orgId != ''">
@@ -171,35 +180,106 @@
 
     <select id="getConsultantShareInfoList" resultType="com.huiju.estateagents.entity.TaConsultantInfo">
         select
-            t.target_id,
-            t.event_type as share_type,
-            a.url as building_img,
-            a.building_name,
-            a.address,
-            a.price,
-            b.list_img_url as activity_img,
-            b.title as activity_name,
-            c.list_img as help_activity_img,
-            c.title as help_activity_name,
-            d.list_img as group_activity_img,
-            d.activity_name as group_activity_name,
-            e.news_img,
-            e.news_name,
-            f.share_img as drainage_img,
-            f.`name` as drainage_name
-        From ta_person_visit_record t
+        a.url as activity_img,
+        a.building_name as activity_name,
+        a.building_name,
+        a.address,
+        a.price,
+        t.event_type
+        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
+
+        union all
+
+        select
+        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
+        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
+
+        union all
+
+        select
+        c.list_img as activity_img,
+        c.title as activity_name,
+        '1' as price,
+        '2' as building_name,
+        '3' as address,
+        t.event_type
+        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
+
+        union all
+
+        select
+        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
+        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'
+        order by t.visit_time desc
+
+        union all
+
+        select
+        e.news_img as activity_img,
+        e.news_name,
+        '1' as price,
+        '2' as building_name,
+        '3' as address,
+        t.event_type
+        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
+
+        union all
+
+        select
+        f.share_img as drainage_img,
+        f.`name` as drainage_name,
+        '1' as price,
+        '2' as building_name,
+        '3' as address,
+        t.event_type
+        from ta_person_visit_record t
         left join ta_drainage f on t.target_id = f.drainage_id
-        where
-        t.consultant_id = #{userId}
+        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
     </select>
+
     <select id="countShareNumByEventType" resultType="java.lang.Integer">
         select count(*) from ta_person_visit_record t
         where
@@ -211,19 +291,4 @@
         group by t.event_type, person_id
     </select>
 
-    <select id="getSharePersonList" resultType="com.huiju.estateagents.entity.TaPerson">
-        select
-        t.person_type,
-        t.avatarurl,
-        t.nickname,
-        a.visit_time
-        from ta_person t
-        left join ta_person_visit_record a on t.person_id = a.person_id
-        where
-        a.org_id = #{orgId}
-        and a.target_id = #{targetId}
-        and a.consultant_id = #{userId}
-        group by a.person_id order by a.visit_time desc
-    </select>
-
 </mapper>

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -288,6 +288,12 @@ FROM
             <if test="orgId != null">
                 and a.org_id = #{orgId}
             </if>
+            <if test="personBuildingList != null and personBuildingList.size > 0">
+                AND a.building_id in
+                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                    #{personBuilding.buildingId}
+                </foreach>
+            </if>
         </where>
         order by a.create_date desc
         limit #{pageCode}, #{pageSize}
@@ -305,6 +311,12 @@ FROM
             <if test="orgId != null">
                 and a.org_id = #{orgId}
             </if>
+            <if test="personBuildingList != null and personBuildingList.size > 0">
+                AND a.building_id in
+                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                    #{personBuilding.buildingId}
+                </foreach>
+            </if>
         </where>
     </select>
 
@@ -346,6 +358,12 @@ FROM
                 and a.sex = #{sex}
                 and a.org_id = #{orgid}
             </if>
+            <if test="personBuildingList != null and personBuildingList.size > 0">
+                AND a.building_id in
+                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                    #{personBuilding.buildingId}
+                </foreach>
+            </if>
         </where>
         order by a.create_date desc
     </select>
@@ -393,6 +411,12 @@ FROM
                 and a.sex = #{sex}
                 and a.org_id = #{orgid}
             </if>
+            <if test="personBuildingList != null and personBuildingList.size > 0">
+                AND a.building_id in
+                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                    #{personBuilding.buildingId}
+                </foreach>
+            </if>
         </where>
         order by a.create_date desc
         limit #{pageCode}, #{pageSize}
@@ -568,6 +592,12 @@ FROM
             <if test="sex != null and sex !=''">
                 and a.sex = #{sex}
             </if>
+            <if test="personBuildingList != null and personBuildingList.size > 0">
+                AND a.building_id in
+                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                    #{personBuilding.buildingId}
+                </foreach>
+            </if>
         </where>
         order by a.create_date desc
     </select>
@@ -618,6 +648,12 @@ FROM
             <if test="sex != null and sex !=''">
                 and a.sex = #{sex}
             </if>
+            <if test="personBuildingList != null and personBuildingList.size > 0">
+                AND a.building_id in
+                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                    #{personBuilding.buildingId}
+                </foreach>
+            </if>
         </where>
         order by a.create_date desc
         limit #{pageCode}, #{pageSize}
@@ -694,6 +730,12 @@ FROM
             left join ta_building b on a.building_id = b.building_id
         WHERE
            a.person_id = #{personId}
+        <if test="personBuildingList != null and personBuildingList.size > 0">
+            AND a.building_id in
+            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                #{personBuilding.buildingId}
+            </foreach>
+        </if>
         GROUP BY
             a.building_id
         ORDER BY
@@ -705,6 +747,12 @@ FROM
         where a.recommend_person = #{customerId}
         and a.status = #{status}
         and a.org_id = #{orgId}
+        <if test="personBuildingList != null and personBuildingList.size > 0">
+            AND a.building_id in
+            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                #{personBuilding.buildingId}
+            </foreach>
+        </if>
     </select>
 
 </mapper>

src/main/resources/mapper/TaShareRecordMapper.xml

@@ -93,23 +93,41 @@
         </if> order by t.create_time desc
     </select>
     <select id="getShareRecordSuccessExportList" resultType="com.huiju.estateagents.excel.ShareRecordSuccessExport">
-        select
-        t.nickname,
-        t.phone,
-        t.create_time,
-        t.end_time,
-        t.verification_status
-        from ta_share_record t
-        where 1=1
-        <!--<if test="status != null and status != ''">-->
+        (
+            select
+            t.nickname,
+            t.phone,
+            t.create_time,
+            t.end_time,
+            t.verification_status
+            from ta_share_record t
+            where 1=1
             and t.status = #{status}
-        <!--</if>-->
-        <if test="recordId != null and recordId != ''">
-            and t.record_id = #{recordId}
-        </if>
-        <if test="groupActivityId != null and groupActivityId != ''">
-            and t.group_Activity_Id = #{groupActivityId}
-        </if>
+            <if test="recordId != null and recordId != ''">
+                and t.record_id = #{recordId}
+            </if>
+            <if test="groupActivityId != null and groupActivityId != ''">
+                and t.group_Activity_Id = #{groupActivityId}
+            </if>
+        )
+        union all
+        (
+            select
+            t.nickname,
+            t.phone,
+            t.create_time,
+            t.end_time,
+            t.verification_status
+            from ta_share_child_record t
+            where 1=1
+            and t.status = #{status}
+            <if test="recordId != null and recordId != ''">
+                and t.record_id = #{recordId}
+            </if>
+            <if test="groupActivityId != null and groupActivityId != ''">
+                and t.group_Activity_Id = #{groupActivityId}
+            </if>
+        )
         limit #{pageCode}, #{pageSize}
     </select>
     <select id="getShareRecordFailExportList" resultType="com.huiju.estateagents.excel.ShareRecordFailExport">