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

src/main/java/com/huiju/estateagents/activity/controller/ActivityController.java

@@ -1,10 +1,13 @@
 package com.huiju.estateagents.activity.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huiju.estateagents.activity.service.ActivityServiceI;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaRecommendCustomer;
 import com.huiju.estateagents.service.ITaPersonService;
+import com.huiju.estateagents.service.ITaRecommendCustomerService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -30,6 +33,9 @@ public class ActivityController extends BaseController {
 	@Autowired
 	private ITaPersonService taPersonService;
 	
+	@Autowired
+	ITaRecommendCustomerService taRecommendCustomerService;
+	
 	@RequestMapping(value = "/wx/activity/list", method = RequestMethod.GET)
 	public ResponseBean wxBuildingDynamiceList(@RequestParam(value = "pageNumber",defaultValue = "1")Integer pageNumber,
 	                                           @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
@@ -47,4 +53,29 @@ public class ActivityController extends BaseController {
 		
 		return responseBean;
 	}
+	
+	@RequestMapping(value = "/wx/customer/activity/list", method = RequestMethod.GET)
+	public ResponseBean wxActivityList(@RequestParam(value = "pageNumber",defaultValue = "1")Integer pageNumber,
+	                                           @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
+	                                           @RequestParam(value = "customerId") String customerId,
+	                                           HttpServletRequest request){
+		ResponseBean  responseBean = new ResponseBean();
+		Integer orgId = getOrgId(request);
+		//查找客户信息
+		QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("customer_id",customerId);
+		TaRecommendCustomer taRecommendCustomer = taRecommendCustomerService.getOne(queryWrapper);
+		if (null == taRecommendCustomer){
+			return ResponseBean.error("验证人员信息失败",ResponseBean.ERROR_UNAVAILABLE);
+		}
+		if (null == taRecommendCustomer.getPersonId()){
+			return ResponseBean.error("验证人员信息失败",ResponseBean.ERROR_UNAVAILABLE);
+		}
+		
+		QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
+		taPersonQueryWrapper.eq("person_id",taRecommendCustomer.getPersonId());
+		TaPerson person = taPersonService.getOne(taPersonQueryWrapper);
+		responseBean = activityService.getCustomerActivityList(pageNumber,pageSize,orgId,person);
+		return responseBean;
+	}
 }

src/main/java/com/huiju/estateagents/activity/mapper/ActivityMapper.java

@@ -6,8 +6,18 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 public interface ActivityMapper {
 	List<Activity> getActivityList(Page pg, @Param("orgId") Integer orgId,@Param("status") Integer status,@Param("cityId") Integer cityId);
+	
+	/**
+	 * 获取客户参与的活动列表
+	 * @param pg
+	 * @param orgId
+	 * @param personId
+	 * @return
+	 */
+	List<Map<String,Object>> getCustomerActivityList(Page pg,@Param("orgId") Integer orgId,@Param("personId") String personId);
 }

src/main/java/com/huiju/estateagents/activity/service/ActivityServiceI.java

@@ -14,4 +14,14 @@ public interface ActivityServiceI {
 	 * @return
 	 */
 	ResponseBean getActivityList(Integer pageNumber, Integer pageSize, Integer orgId, TaPerson person,Integer cityId);
+	
+	/**
+	 * 获取客户参加的活动信息
+	 * @param pageNumber
+	 * @param pageSize
+	 * @param orgId
+	 * @param person
+	 * @return
+	 */
+	ResponseBean getCustomerActivityList(Integer pageNumber, Integer pageSize, Integer orgId, TaPerson person);
 }

src/main/java/com/huiju/estateagents/activity/service/impl/ActivityServiceImpl.java

@@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author FXF
@@ -113,4 +114,22 @@ public class ActivityServiceImpl implements ActivityServiceI {
 		pg.setRecords(list);
 		return ResponseBean.success(pg);
 	}
+	
+	/**
+	 * 获取客户参加的活动信息
+	 *
+	 * @param pageNumber
+	 * @param pageSize
+	 * @param orgId
+	 * @param person
+	 * @return
+	 */
+	@Override
+	public ResponseBean getCustomerActivityList(Integer pageNumber, Integer pageSize, Integer orgId, TaPerson person) {
+		//分页获取全部数据
+		Page pg = new Page(pageNumber,pageSize);
+		List<Map<String, Object>> customerActivityList = activityMapper.getCustomerActivityList(pg, orgId, person.getPersonId());
+		pg.setRecords(customerActivityList);
+		return ResponseBean.success(pg);
+	}
 }

src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java

@@ -160,6 +160,9 @@ public class TaUser implements Serializable {
     @TableField(exist = false)
     private String buildingId;
 
+    @TableField(exist = false)
+    private List<String> projects;
+
     /**
      * ta_org/orgNum楼盘最大数
      */

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

@@ -10,15 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.entity.HelpActivity;
-import com.huiju.estateagents.entity.HelpInitiateRecord;
-import com.huiju.estateagents.entity.HelpRecord;
-import com.huiju.estateagents.entity.TaBuildingDynamic;
-import com.huiju.estateagents.entity.TaChannel;
-import com.huiju.estateagents.entity.TaPerson;
-import com.huiju.estateagents.entity.TaPoster;
-import com.huiju.estateagents.entity.TaShareContent;
-import com.huiju.estateagents.entity.TdPosterTemplate;
+import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
 import com.huiju.estateagents.excel.HelpProceedAndFinish;
 import com.huiju.estateagents.excel.HelpRecordExport;
@@ -159,6 +151,13 @@ public class HelpActivityController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
         Integer cityId = iTaBuildingService.getCityById(helpActivity.getBuildingId());
+        QueryWrapper<HelpActivity> helpActivityQueryWrapper = new QueryWrapper<>();
+        helpActivityQueryWrapper.eq("heavy", helpActivity.getHeavy());
+        Integer heavyCount = taHelpActivityService.count(helpActivityQueryWrapper);
+        if (heavyCount != 0){
+            responseBean.addError("权重已存在，请重新编辑");
+            return responseBean;
+        }
         helpActivity.setCityId(cityId);
         // 活动暂且定位为未开始
         helpActivity.setActivityStatus(1);
@@ -201,6 +200,13 @@ public class HelpActivityController extends BaseController {
     public ResponseBean helpActivityUpdate(@RequestBody String parameter) {
         ResponseBean responseBean = new ResponseBean();
         HelpActivity helpActivity = JSONObject.parseObject(parameter, HelpActivity.class);
+        QueryWrapper<HelpActivity> helpActivityQueryWrapper = new QueryWrapper<>();
+        helpActivityQueryWrapper.eq("heavy", helpActivity.getHeavy());
+        Integer heavyCount = taHelpActivityService.count(helpActivityQueryWrapper);
+        if (heavyCount != 0){
+            responseBean.addError("权重已存在，请重新编辑");
+            return responseBean;
+        }
         Integer cityId = iTaBuildingService.getCityById( helpActivity.getBuildingId());
         helpActivity.setCityId(cityId);
         helpActivity.setHelpActivityId(helpActivity.getHelpActivityId());
@@ -264,6 +270,30 @@ public class HelpActivityController extends BaseController {
         return responseBean;
     }
 
+    @RequestMapping(value = "/admin/helpActivity/send/{helpActivityId}", method = RequestMethod.PUT)
+    public ResponseBean send(@PathVariable String helpActivityId, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        QueryWrapper<HelpActivity> helpActivityQueryWrapper = new QueryWrapper<>();
+        helpActivityQueryWrapper.eq("help_activity_id", helpActivityId);
+        HelpActivity helpActivity = taHelpActivityService.getOne(helpActivityQueryWrapper);
+        helpActivity.setStatus(1);
+        helpActivity.setOrgId(getOrgId(request));
+        taHelpActivityService.update(helpActivity, helpActivityQueryWrapper);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/admin/helpActivity/cancel/{helpActivityId}", method = RequestMethod.PUT)
+    public ResponseBean cancel(@PathVariable String helpActivityId, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        QueryWrapper<HelpActivity> taShareActivityQueryWrapper = new QueryWrapper<>();
+        taShareActivityQueryWrapper.eq("help_activity_id", helpActivityId);
+        HelpActivity helpActivity = taHelpActivityService.getOne(taShareActivityQueryWrapper);
+        helpActivity.setStatus(-1);
+        helpActivity.setOrgId(getOrgId(request));
+        taHelpActivityService.update(helpActivity, taShareActivityQueryWrapper);
+        return responseBean;
+    }
+
     @ApiOperation(value = "助力记录", notes = "助力记录")
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query", value = "第几页"),

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

@@ -75,6 +75,9 @@ public class TaBuildingDynamicController extends BaseController {
     @Autowired
     private ITaBuildingService iTaBuildingService;
 
+    @Autowired
+    private ITaRecommendCustomerService recommendCustomerService;
+
     @Autowired
     private TaActivityDynamicEnlistMapper taActivityDynamicEnlistMapper;
 
@@ -310,6 +313,14 @@ public class TaBuildingDynamicController extends BaseController {
                    if (tempIsCheckin.intValue() == CommConstant.STATUS_UNACCALIMED.intValue()){
                        enlist.setEnlistId(Integer.valueOf(enlistId));
                        applicationContext.publishEvent(new EventBus(enlist,ActivityCheckin,getOrgId(request)));
+                       QueryWrapper<TaRecommendCustomer> customerQueryWrapper = new QueryWrapper<>();
+                       customerQueryWrapper.eq("person_id",enlist.getPersonId());
+                       customerQueryWrapper.eq("building_id",enlist.getBuildingId());
+                       TaRecommendCustomer recommendCustomer = recommendCustomerService.getOne(customerQueryWrapper);
+                       if (recommendCustomer.getStatus() < CommConstant.CUSTOMER_VISITE){
+                           recommendCustomer.setStatus(CommConstant.CUSTOMER_VISITE);
+                           recommendCustomerService.updateById(recommendCustomer);
+                       }
                        Integer rulePoints = taPointsRecordsService.getRulePoints(CommConstant.POINTS_CHANGE_ACTIVITY_CHECKIN, getOrgId(request));
                        enlist.setAddPoints(rulePoints);
                        responseBean.addSuccess(enlist);

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

@@ -139,6 +139,42 @@ public class TaPersonController extends BaseController {
         return responseBean;
     }
 
+    @PutMapping("/wx/registerConsultantOneClick")
+    public ResponseBean registerConsultantOneClick(HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        Integer orgId =getOrgId(request);
+        String openid = getOpenId(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        QueryWrapper<TaUser>queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("phone",person.getPhone());
+        queryWrapper.eq("org_id",orgId);
+        queryWrapper.eq("is_consultant",true);
+        List<TaUser> users = taUserService.list(queryWrapper);
+        if(users.size()>0){
+            TaUser user = users.get(0);
+            person.setPersonType(CommConstant.PERSON_REALTY_CONSULTANT);
+            person.setUserId(user.getUserId());
+            person.setAvatarurl(user.getAvatar());
+            person.setCompany(user.getOrgName());
+            person.setTel(user.getPhone());
+            person.setName(user.getUserName());
+            person.setAddress(user.getAddress());
+            person.setIdNo(user.getIdNo());
+            person.setDepartment(user.getDepartment());
+            person.setPost(user.getPosition());
+            person.setPhoto(user.getPhoto());
+            taPersonService.updateById(person);
+            responseBean.addSuccess(person);
+        }else {
+            responseBean.addError("手机号不存在,请联系管理员维护。");
+        }
+        return responseBean;
+    }
+
     @PutMapping("/wx/registerAgent")
     public ResponseBean registerAgent(@RequestParam(required = false) String recommendAgentCode, @RequestParam(required = false) String channelCode,HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();

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

@@ -200,4 +200,25 @@ public class TaPersonVisitRecordController extends BaseController {
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
         }
     }
+    
+    /**
+     * 盘客工具分页获取访问记录
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/wx/taPersonVisitRecord",method= RequestMethod.GET)
+    public ResponseBean wxPersonVisitRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                                @RequestParam(value = "customerId") String customerId){
+        try {
+            //使用分页插件
+            IPage<TaPersonVisitRecord> pg = new Page<>(pageNum, pageSize);
+            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getPersonVisitRecordList(pg, customerId);
+            return ResponseBean.success(result);
+        }catch (Exception e){
+            logger.error("taPersonVisitRecordList -=- {}",e.toString());
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
 }

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

@@ -474,7 +474,7 @@ public class TaRecommendCustomerController extends BaseController {
 
 
     @GetMapping(value = "/admin/customer/recommend/get/{id}")
-    public ResponseBean getCutomerDetail(@PathVariable String id) {
+    public ResponseBean getCustomerDetail(@PathVariable String id) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(taRecommendCustomerService.getCustomerDetail(id));
@@ -485,6 +485,18 @@ public class TaRecommendCustomerController extends BaseController {
         return responseBean;
     }
 
+    @GetMapping(value = "/admin/customer/recommend/public/get/{id}")
+    public ResponseBean getPublicCustomerDetail(@PathVariable String id) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(taRecommendCustomerService.getPublicCustomerDetail(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
     @GetMapping("/admin/customer/recommend/drift")
     public ResponseBean getDriftCustomerList (HttpServletRequest request,
                                               @RequestParam(value ="buildingId",defaultValue = "false") String buildingId,
@@ -749,5 +761,60 @@ public class TaRecommendCustomerController extends BaseController {
 
 
     }
-
+    
+    /**
+     * 查询判客工具下的我的客户人数集合
+     * @param request
+     * @return
+     */
+    @GetMapping("/wx/inventory/customer/statistics")
+    @ApiOperation(value = "查询我的客户人数统计", notes = "查询我的客户人数统计")
+    public ResponseBean getMyCustStatistics(HttpServletRequest request) {
+        String openid = getOpenId(request);
+        return taRecommendCustomerService.getMyCustStatistics(openid);
+    }
+    
+    /**
+     * 分页查询判客工具下的我的客户跟进人集合
+     *  根据type区分  follow 跟进  clinch 成交
+     * @param request
+     * @return
+     */
+    @GetMapping("/wx/inventory/customer/{type}")
+    @ApiOperation(value = "查询我的客户人数统计", notes = "查询我的客户人数统计")
+    public ResponseBean getMyCustFollows(@PathVariable(value = "type") String type,
+                                         @RequestParam(value = "pageNumber",defaultValue = "0") Integer pageNumber,
+                                         @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize,
+                                         @RequestParam(value = "name",required = false) String name,
+                                         @RequestParam(value = "phone",required = false) String phone,
+                                         @RequestParam(value = "status",required = false) Integer status,HttpServletRequest request) {
+        String openid = getOpenId(request);
+        return taRecommendCustomerService.getMyCustFollowOrClinch(pageNumber,pageSize,openid,type,name,phone,status);
+    }
+    
+    /**
+     * 查询盘客工具下我的客户详情
+     * @param request
+     * @return
+     */
+    @GetMapping("/wx/inventory/customer/{customerId}")
+    @ApiOperation(value = "查询客户详情", notes = "查询客户详情")
+    public ResponseBean getMyCustDetail(@PathVariable(value = "customerId") String customerId,HttpServletRequest request) {
+        String openid = getOpenId(request);
+        return taRecommendCustomerService.getMyCustDetail(customerId,openid);
+    }
+    
+    /**
+     * 查询盘客工具下编辑基本信息
+     * @param request
+     * @return
+     */
+    @PutMapping("/wx/inventory/customer/{customerId}")
+    @ApiOperation(value = "编辑客户信息", notes = "编辑客户信息")
+    public ResponseBean updateMyCustDetail(@PathVariable(value = "customerId") String customerId,
+                                           @RequestBody TaRecommendCustomer taRecommendCustomer, HttpServletRequest request) {
+        String openid = getOpenId(request);
+        taRecommendCustomer.setCustomerId(customerId);
+        return taRecommendCustomerService.updateMyCust(taRecommendCustomer,openid);
+    }
 }

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

@@ -132,6 +132,15 @@ public class TaShareActivityController extends BaseController {
                 responseBean.addError("拼团人数必须大于等于2人");
                 return responseBean;
             }
+
+            QueryWrapper<TaShareActivity> taShareActivityQueryWrapper = new QueryWrapper<>();
+            taShareActivityQueryWrapper.eq("heavy", taShareActivity.getHeavy());
+            Integer heavyCount = iTaShareActivityService.count(taShareActivityQueryWrapper);
+            if (heavyCount != 0){
+                responseBean.addError("权重已存在，请重新编辑");
+                return responseBean;
+            }
+
             Integer cityId = iTaBuildingService.getCityById(taShareActivity.getBuildingId());
             taShareActivity.setCityId(cityId);
             taShareActivity.setOrgId(getOrgId(request));
@@ -186,6 +195,15 @@ public class TaShareActivityController extends BaseController {
             TaShareActivity taShareActivity = JSONObject.parseObject(parameter, TaShareActivity.class);
             Integer cityId = iTaBuildingService.getCityById(taShareActivity.getBuildingId());
             taShareActivity.setCityId(cityId);
+
+            QueryWrapper<TaShareActivity> taShareActivityQueryWrapper = new QueryWrapper<>();
+            taShareActivityQueryWrapper.eq("heavy", taShareActivity.getHeavy());
+            Integer heavyCount = iTaShareActivityService.count(taShareActivityQueryWrapper);
+            if (heavyCount != 0){
+                responseBean.addError("权重已存在，请重新编辑");
+                return responseBean;
+            }
+
             if (iTaShareActivityService.updateById(taShareActivity)){
                 responseBean.addSuccess(taShareActivity);
             }else {

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

@@ -106,6 +106,11 @@ public class HelpActivity implements Serializable {
      */
     private String img;
 
+    /**
+     * 列表图
+     */
+    private String detailImg;
+
     /**
      * 城市ID
      */

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

@@ -0,0 +1,37 @@
+package com.huiju.estateagents.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 收藏表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-25
+ */
+@Data
+public class PersonIntention implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+
+    private String personId;
+
+
+    private String buildingName;
+
+
+    private String buildingId;
+
+
+    private Integer intention;
+
+
+
+
+}

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

@@ -267,6 +267,11 @@ public class TaPerson implements Serializable {
     @TableField(exist = false)
     private List<TaShareContent> shareContents;
 
+    @TableField(exist = false)
+    private List<PersonIntention> intentions;
+
+    @TableField(exist = false)
+    private Integer visitTimes;
     /**
      * 推广人
      */

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

@@ -101,5 +101,11 @@ public class TaPersonVisitRecord implements Serializable {
      */
     @TableField(exist = false)
     private Integer accessCount;
+    
+    /**
+     * 楼盘名称
+     */
+    @TableField(exist = false)
+    private String buildingName;
 
 }

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

@@ -10,6 +10,7 @@ import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -168,7 +169,7 @@ public class TaRecommendCustomer implements Serializable {
     private Integer visitTimes;
 
     @TableField(exist = false)
-    private TaPerson consultant;
+    private TaUser consultant;
 
     @TableField(exist = false)
     private String recommendName;
@@ -177,8 +178,11 @@ public class TaRecommendCustomer implements Serializable {
     private String recommendTel;
 
     @TableField(exist = false)
+    private List<PersonIntention> intentions;
+
     private String intentionName;
 
+
     /**
      * 推广人
      */

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

@@ -114,7 +114,12 @@ public class TaShareActivity implements Serializable {
      * 置顶
      */
     private Integer weight;
-    
+
+    /**
+     * 权重，用于排序
+     */
+    private Integer heavy;
+
     /**
      * Initiate 发起者  Booster 助力者
      */

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

@@ -49,7 +49,13 @@ public interface TaPersonVisitRecordMapper extends BaseMapper<TaPersonVisitRecor
     @ResultType(TaPersonVisitRecord.class)
     @Select("select * from ta_person_visit_record where event = #{event} and person_id = #{personId} and org_id = #{orgId} ")
     List<TaPersonVisitRecord> selectEventAll(@Param("event") String event, @Param("personId") String personId, @Param("orgId") Integer orgId);
-
-
-
+    
+    
+    /**
+     * 获取用户行为列表
+     * @param pg
+     * @param personId
+     * @return
+     */
+	IPage<TaPersonVisitRecord> getPersonVisitRecordList(IPage<TaPersonVisitRecord> pg,@Param("personId") String personId);
 }

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.entity.PersonIntention;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaRecommendCustomer;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -9,6 +10,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -149,5 +151,35 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @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);
+    
+    /**
+     * 获取我的客户的人数统计
+     * @param personId
+     * @param userId
+     * @return
+     */
+	List<Map<String, Object>> getMyCustStatistics(@Param("personId") String personId,@Param("userId") Integer userId,@Param("orgId") Integer orgId);
+    
+    /**
+     * 获取我的跟进客户数据
+     * @param page
+     * @param personId
+     * @param userId
+     * @param orgId
+     * @param type
+     * @param name
+     * @param phone
+     * @param status
+     * @return
+     */
+    IPage<TaRecommendCustomer> getMyCustFollowOrClinch(IPage<TaRecommendCustomer> page, @Param("personId") String personId, @Param("userId") Integer userId, @Param("orgId") Integer orgId, @Param("type") String type, @Param("name") String name, @Param("phone") String phone,@Param("status") Integer status);
+    
+    /**
+     * 获取我的客户详情数据
+     * @param customerId
+     * @return
+     */
+    TaRecommendCustomer getMyCustDetailById(String customerId);
 
+    List<PersonIntention> getCustomerIntentions(@Param("personId")String personId);
 }

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

@@ -15,6 +15,13 @@ import com.huiju.estateagents.entity.TaPersonVisitRecord;
  * @since 2019-07-23
  */
 public interface ITaPersonVisitRecordService extends IService<TaPersonVisitRecord> {
+	/**
+	 * 分页获取客户访问记录
+	 * @param pg
+	 * @param customerId
+	 * @return
+	 */
+	IPage<TaPersonVisitRecord> getPersonVisitRecordList(IPage<TaPersonVisitRecord> pg, String customerId);
 //    IPage<TaPerson> selectCustomer(IPage<TaPerson> page);
 //    TaPerson customerInfo(String personId);
 }

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

@@ -44,6 +44,8 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
 
     TaRecommendCustomer getCustomerDetail(String customerId);
 
+    TaPerson getPublicCustomerDetail(String personId);
+
     TaRecommendCustomer getCustomerById(String customerId);
 
     IPage<TaRecommendCustomer>getCustomersIRecommended(int pageNumber, int pageSize,String customerId,Integer orgId);
@@ -95,5 +97,39 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
      * @return
      */
     List<AgentsRecommendCustomer> getIndependentAgentsExport(Integer orgId, Integer pageCode, Integer pageSize);
-
+    
+    /**
+     * 查询我的客户人数集合
+     * @param openid
+     * @return
+     */
+    ResponseBean getMyCustStatistics(String openid);
+    
+    /**
+     * 分页查询我的跟进客户集合
+     * @param pageNumber
+     * @param pageSize
+     * @param openid
+     * @param name
+     * @param phone
+     * @param status
+     * @return
+     */
+    ResponseBean getMyCustFollowOrClinch(Integer pageNumber, Integer pageSize, String openid, String type, String name, String phone, Integer status);
+    
+    /**
+     * 获取盘客工具下我的客户详情
+     * @param customerId
+     * @param openid
+     * @return
+     */
+    ResponseBean getMyCustDetail(String customerId, String openid);
+    
+    /**
+     * 更新我的客户基本信息
+     * @param taRecommendCustomer
+     * @param openid
+     * @return
+     */
+    ResponseBean updateMyCust(TaRecommendCustomer taRecommendCustomer, String openid);
 }

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

@@ -4,12 +4,16 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaPersonVisitRecord;
+import com.huiju.estateagents.entity.TaRecommendCustomer;
 import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.mapper.TaPersonVisitRecordMapper;
+import com.huiju.estateagents.mapper.TaRecommendCustomerMapper;
 import com.huiju.estateagents.service.ITaPersonVisitRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  *   服务实现类
@@ -20,6 +24,26 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRecordMapper, TaPersonVisitRecord> implements ITaPersonVisitRecordService {
+	
+	@Autowired
+	private TaRecommendCustomerMapper taRecommendCustomerMapper;
+	
+	@Autowired
+	private TaPersonVisitRecordMapper personVisitRecordMapper;
+	
+	/**
+	 * 分页获取客户访问记录
+	 *
+	 * @param pg
+	 * @param customerId
+	 * @return
+	 */
+	@Override
+	public IPage<TaPersonVisitRecord> getPersonVisitRecordList(IPage<TaPersonVisitRecord> pg, String customerId) {
+		TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.selectById(customerId);
+		IPage<TaPersonVisitRecord> result = personVisitRecordMapper.getPersonVisitRecordList(pg,taRecommendCustomer.getPersonId());
+		return result;
+	}
 //    @Autowired
 //    private TaPersonMapper taPersonMapper;
 //    @Autowired

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

@@ -1,6 +1,5 @@
 package com.huiju.estateagents.service.impl;
 
-import ch.qos.logback.core.status.StatusUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -23,10 +22,11 @@ import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.service.IMiniAppService;
 import com.huiju.estateagents.service.ITaRecommendCustomerService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.statistic.entity.TaCustomerFollowUpRecord;
+import com.huiju.estateagents.statistic.mapper.TaCustomerFollowUpRecordMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.naming.spi.ResolveResult;
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
@@ -63,6 +63,9 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
     @Autowired
     private TdCityMapper cityMapper;
+    
+    @Autowired
+    private TaCustomerFollowUpRecordMapper customerFollowUpRecordMapper;
 
     @Override
     public ResponseBean getMyCustList(String openid, String keywords, int pageNumber, int pageSize) {
@@ -442,6 +445,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         if(!StringUtils.isEmpty(personId)){
             taRecommendCustomer.setVisitRecords(taPersonVisitRecordMapper.visitRecordByPersonId(personId));
             taRecommendCustomer.setVisitTimes(taPersonVisitRecordMapper.visitRecordByPersonId(personId).size());
+            taRecommendCustomer.setIntentions(taRecommendCustomerMapper.getCustomerIntentions(personId));
             Map<String,String>geoInfo = new HashMap<>();
             geoInfo.put("provience",person.getProvince());
             geoInfo.put("country",person.getCountry());
@@ -455,21 +459,25 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         }
         if(!StringUtils.isEmpty(taRecommendCustomer.getRealtyConsultant())){
             TaPerson consultant =  taPersonMapper.getById(taRecommendCustomer.getRealtyConsultant());
+            TaUser user = new TaUser();
             if(null == consultant){
-                TaUser user = userService.getById(taRecommendCustomer.getRealtyConsultant());
-                consultant.setPersonId(taRecommendCustomer.getRealtyConsultant());
-                consultant.setTel(user.getPhone());
-                consultant.setPhone(user.getPhone());
-                consultant.setDepartment(user.getDepartment());
-                consultant.setUserId(user.getUserId());
-                consultant.setPost(user.getPosition());
-                consultant.setName(user.getUserName());
-                consultant.setAddress(user.getAddress());
-                consultant.setAvatarurl(user.getAvatar());
-                consultant.setCompany(user.getOrgName());
+                user = userService.getById(taRecommendCustomer.getRealtyConsultant());
+            }else {
+                user = userService.getById(consultant.getUserId());
             }
-            consultant.setProjects(taPersonMapper.getUserProjects(consultant.getUserId()));
-            taRecommendCustomer.setConsultant(consultant);
+            user.setProjects(taPersonMapper.getUserProjects(user.getUserId()));
+            taRecommendCustomer.setConsultant(user);
+        }
+        return taRecommendCustomer;
+    }
+
+    @Override
+    public TaPerson getPublicCustomerDetail(String personId){
+        TaPerson taRecommendCustomer = taPersonMapper.getById(personId);
+        if(!StringUtils.isEmpty(personId)){
+            taRecommendCustomer.setVisitRecords(taPersonVisitRecordMapper.visitRecordByPersonId(personId));
+            taRecommendCustomer.setVisitTimes(taPersonVisitRecordMapper.visitRecordByPersonId(personId).size());
+            taRecommendCustomer.setIntentions(taRecommendCustomerMapper.getCustomerIntentions(personId));
         }
         return taRecommendCustomer;
     }
@@ -579,4 +587,105 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     public List<AgentsRecommendCustomer> getIndependentAgentsExport(Integer orgId, Integer pageCode, Integer pageSize) {
         return taRecommendCustomerMapper.getIndependentAgentsExport(orgId, pageCode, pageSize);
     }
+    
+    /**
+     * 查询我的客户人数集合
+     *
+     * @param openid
+     * @return
+     */
+    @Override
+    public ResponseBean getMyCustStatistics(String openid) {
+        List<TaPerson> taPersons = getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    
+        TaPerson taPerson = taPersons.get(0);
+        List<Map<String,Object>> list = taRecommendCustomerMapper.getMyCustStatistics(taPerson.getPersonId(),taPerson.getUserId(),taPerson.getOrgId());
+        return ResponseBean.success(list);
+    }
+    
+    /**
+     * 分页查询我的跟进客户集合
+     *
+     * @param pageNumber
+     * @param pageSize
+     * @param openid
+     * @param name
+     * @param phone
+     * @param status
+     * @return
+     */
+    @Override
+    public ResponseBean getMyCustFollowOrClinch(Integer pageNumber, Integer pageSize, String openid, String type, String name, String phone, Integer status) {
+        List<TaPerson> taPersons = getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    
+        TaPerson taPerson = taPersons.get(0);
+        
+        IPage<TaRecommendCustomer> page = new Page<>();
+        page.setCurrent(pageNumber);
+        page.setSize(pageSize);
+        
+        //分页获取跟进客户status != 4的为跟进客户， status = 4的为成交客户 根据type区分  follow 跟进  clinch 成交
+        IPage<TaRecommendCustomer> result = taRecommendCustomerMapper.getMyCustFollowOrClinch(page, taPerson.getPersonId(),taPerson.getUserId(),taPerson.getOrgId(), type,name,phone,status);
+        return ResponseBean.success(result);
+    }
+    
+    /**
+     * 获取盘客工具下我的客户详情
+     *
+     * @param customerId
+     * @param openid
+     * @return
+     */
+    @Override
+    public ResponseBean getMyCustDetail(String customerId, String openid) {
+        List<TaPerson> taPersons = getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    
+        TaPerson taPerson = taPersons.get(0);
+        TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.getMyCustDetailById(customerId);
+        //添加跟进行为
+        addCustomerFpllowUp(taPerson,taRecommendCustomer,"查看客户详情");
+        return ResponseBean.success(taRecommendCustomer);
+    }
+    
+    /**
+     * 更新我的客户基本信息
+     *
+     * @param taRecommendCustomer
+     * @param openid
+     * @return
+     */
+    @Override
+    public ResponseBean updateMyCust(TaRecommendCustomer taRecommendCustomer, String openid) {
+        List<TaPerson> taPersons = getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    
+        TaPerson taPerson = taPersons.get(0);
+        taRecommendCustomerMapper.updateById(taRecommendCustomer);
+        //添加跟进行为
+        addCustomerFpllowUp(taPerson,taRecommendCustomer,"编辑客户信息");
+        return ResponseBean.success(taRecommendCustomer);
+    }
+    
+    //添加跟进行为
+    private void addCustomerFpllowUp(TaPerson taPerson,TaRecommendCustomer taRecommendCustomer,String recordType) {
+        TaCustomerFollowUpRecord taCustomerFollowUpRecord = new TaCustomerFollowUpRecord();
+        taCustomerFollowUpRecord.setOrgId(taPerson.getOrgId());
+        taCustomerFollowUpRecord.setCreateDate(LocalDateTime.now());
+        taCustomerFollowUpRecord.setCustomerId(taRecommendCustomer.getCustomerId());
+        taCustomerFollowUpRecord.setRecordType(recordType);
+        taCustomerFollowUpRecord.setFollowerId(taPerson.getPersonId());
+        taCustomerFollowUpRecord.setCustomerSex(taRecommendCustomer.getSex());
+        customerFollowUpRecordMapper.insert(taCustomerFollowUpRecord);
+    }
 }

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

@@ -48,8 +48,7 @@ public class TaShareActivityServiceImpl extends ServiceImpl<TaShareActivityMappe
         queryWrapper.eq(endTime != null, "end_time", endTime);
         queryWrapper.eq(orgId != null, "org_id", orgId);
         queryWrapper.eq(cityId != null, "city_id", cityId);
-        queryWrapper.orderByAsc("activity_status");
-        queryWrapper.orderByAsc("start_time");
+        queryWrapper.orderByDesc("heavy");
         IPage<TaShareActivity> taNewsIPage = this.page(page, queryWrapper);
 
         List<TaShareActivity> taShareActivities = taNewsIPage.getRecords();

src/main/java/com/huiju/estateagents/statistic/controller/TaCustomerFollowUpRecordController.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.statistic.entity.TaCustomerFollowUpRecord;
 import com.huiju.estateagents.statistic.service.ITaCustomerFollowUpRecordService;
 import org.slf4j.Logger;
@@ -18,6 +20,9 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
 /**
  * <p>
     * 跟进记录表 小程序盘客工具我的客户跟进记录信息 前端控制器
@@ -27,14 +32,16 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2019-11-08
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaCustomerFollowUpRecordController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaCustomerFollowUpRecordController.class);
 
     @Autowired
     public ITaCustomerFollowUpRecordService iTaCustomerFollowUpRecordService;
-
+    
+    @Autowired
+    private ITaPersonService taPersonService;
 
     /**
      * 分页查询列表
@@ -146,4 +153,72 @@ public class TaCustomerFollowUpRecordController extends BaseController {
         }
         return responseBean;
     }
+    
+    /**
+     * 盘客工具添加跟进记录
+     * @param taCustomerFollowUpRecord 实体对象
+     * @return
+     */
+    @RequestMapping(value="/wx/taCustomerFollowUpRecord",method= RequestMethod.POST)
+    public ResponseBean wxCustomerFollowUpRecordAdd(@RequestBody TaCustomerFollowUpRecord taCustomerFollowUpRecord, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        String openid = getOpenId(request);
+        Integer orgId = getOrgId(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        try {
+            taCustomerFollowUpRecord.setFollowerId(person.getPersonId());
+            if (iTaCustomerFollowUpRecordService.save(taCustomerFollowUpRecord)){
+                responseBean.addSuccess(taCustomerFollowUpRecord);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerFollowUpRecordAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    
+    /**
+     * 分页查询跟进记录列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/wx/taCustomerFollowUpRecord",method= RequestMethod.GET)
+    public ResponseBean wxCustomerFollowUpRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                                     @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                                     @RequestParam(value ="customerId",required = true) Integer customerId,
+                                                     HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        String openid = getOpenId(request);
+        Integer orgId = getOrgId(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        try {
+            //使用分页插件
+            IPage<TaCustomerFollowUpRecord> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaCustomerFollowUpRecord> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("follower_id",person.getPersonId());
+            queryWrapper.eq("org_id",orgId);
+            queryWrapper.eq("customer_id",customerId);
+            queryWrapper.orderByDesc("create_date");
+            
+            IPage<TaCustomerFollowUpRecord> result = iTaCustomerFollowUpRecordService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerFollowUpRecordList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

src/main/java/com/huiju/estateagents/statistic/controller/TaCustomerGenderStatisticController.java

@@ -18,6 +18,9 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
 /**
  * <p>
     * 客户分析性别统计表 小程序盘客工具客户分析 前端控制器
@@ -27,7 +30,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2019-11-08
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaCustomerGenderStatisticController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaCustomerGenderStatisticController.class);
@@ -146,4 +149,29 @@ public class TaCustomerGenderStatisticController extends BaseController {
         }
         return responseBean;
     }
+    
+    /**
+     * 微信端查询三条性别列表数据
+     * @return
+     */
+    @RequestMapping(value="/wx/genderStatistic/{customerType}",method= RequestMethod.GET)
+    public ResponseBean wxCustomerGenderStatisticList(@PathVariable(value = "customerType") String customerType, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //查询当前小程序的男女比统计
+            QueryWrapper<TaCustomerGenderStatistic> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id",getOrgId(request));
+            queryWrapper.eq("customer_type",customerType);
+            queryWrapper.orderByDesc("create_date");
+     
+            List<TaCustomerGenderStatistic> result = iTaCustomerGenderStatisticService.list(queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerGenderStatisticList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    
 }

src/main/java/com/huiju/estateagents/statistic/controller/TaCustomerStatisticDailyController.java

@@ -18,6 +18,9 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
 /**
  * <p>
     * 客户分析日统计表 小程序盘客工具客户分析 前端控制器
@@ -27,7 +30,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2019-11-08
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaCustomerStatisticDailyController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaCustomerStatisticDailyController.class);
@@ -146,4 +149,24 @@ public class TaCustomerStatisticDailyController extends BaseController {
         }
         return responseBean;
     }
+    
+    /**
+     * 微信端查询日客户分析统计数据
+     * 日筛选：可以选择包括当前日往前的31日
+     * @return
+     */
+    @RequestMapping(value="/wx/customerStatisticDaily/{customerType}",method= RequestMethod.GET)
+    public ResponseBean wxCustomerStatisticDailyList(@PathVariable(value = "customerType") String customerType,
+                                                     HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            List<TaCustomerStatisticDaily> list = iTaCustomerStatisticDailyService.getDailyList(customerType,getOrgId(request));
+            responseBean.addSuccess(list);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("wxCustomerStatisticDailyList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

src/main/java/com/huiju/estateagents/statistic/controller/TaCustomerStatisticMonthlyController.java

@@ -18,6 +18,9 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
 /**
  * <p>
     * 客户分析月统计表 小程序盘客工具客户分析 前端控制器
@@ -27,7 +30,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2019-11-08
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaCustomerStatisticMonthlyController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaCustomerStatisticMonthlyController.class);
@@ -146,4 +149,25 @@ public class TaCustomerStatisticMonthlyController extends BaseController {
         }
         return responseBean;
     }
+    
+    /**
+     * 微信端查询月客户分析统计数据
+     * 月筛选：可以选择包括当前月往前的12个月
+     * @return
+     */
+    @RequestMapping(value="/wx/customerStatisticMonthly/{customerType}",method= RequestMethod.GET)
+    public ResponseBean taCustomerStatisticMonthlyList(@PathVariable(value = "customerType") String customerType,
+                                                       HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //查询月客户分析数据
+            List<TaCustomerStatisticMonthly> result = iTaCustomerStatisticMonthlyService.getCustomerMonthlyList(customerType, getOrgId(request));
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerStatisticMonthlyList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

src/main/java/com/huiju/estateagents/statistic/entity/TaCustomerFollowUpRecord.java

@@ -58,7 +58,7 @@ public class TaCustomerFollowUpRecord implements Serializable {
     /**
      * 跟进人ID
      */
-    private Integer followerId;
+    private String followerId;
     
     /**
      * 客户性别

src/main/java/com/huiju/estateagents/statistic/mapper/TaCustomerStatisticDailyMapper.java

@@ -42,4 +42,14 @@ public interface TaCustomerStatisticDailyMapper extends BaseMapper<TaCustomerSta
 	 * @return
 	 */
 	List<TaCustomerStatisticDaily> getVisiteCustomerData(@Param("nowDate") LocalDateTime nowDate,@Param("checkin") int checkin);
+	
+	/**
+	 * 获取31天的统计数据
+	 * @param customerType
+	 * @param orgId
+	 * @param nowDate
+	 * @param beforeDate
+	 * @return
+	 */
+	List<TaCustomerStatisticDaily> getDailyList(@Param("customerType") String customerType,@Param("orgId")  Integer orgId,@Param("nowDate")  LocalDateTime nowDate,@Param("beforeDate")  LocalDateTime beforeDate);
 }

src/main/java/com/huiju/estateagents/statistic/mapper/TaCustomerStatisticMonthlyMapper.java

@@ -41,4 +41,14 @@ public interface TaCustomerStatisticMonthlyMapper extends BaseMapper<TaCustomerS
 	 * @return
 	 */
 	List<TaCustomerStatisticMonthly> getVisiteStatisticMonthly(@Param("nowDate") LocalDateTime nowDate,@Param("checkin") int checkin);
+	
+	/**
+	 * 获取12个月的统计数据
+	 * @param customerType
+	 * @param orgId
+	 * @param nowDate
+	 * @param beforeDate
+	 * @return
+	 */
+	List<TaCustomerStatisticMonthly> getMonthlyList(@Param("customerType") String customerType,@Param("orgId") Integer orgId,@Param("nowDate") LocalDateTime nowDate,@Param("beforeDate") LocalDateTime beforeDate);
 }

src/main/java/com/huiju/estateagents/statistic/service/ITaCustomerStatisticDailyService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.statistic.entity.TaCustomerStatisticDaily;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -32,4 +33,12 @@ public interface ITaCustomerStatisticDailyService extends IService<TaCustomerSta
 	 * @param nowDate
 	 */
 	void visiteStatisticDaily(LocalDateTime nowDate);
+	
+	/**
+	 * 获取日统计数据
+	 * @param customerType
+	 * @param orgId
+	 * @return
+	 */
+	List<TaCustomerStatisticDaily> getDailyList(String customerType, Integer orgId);
 }

src/main/java/com/huiju/estateagents/statistic/service/ITaCustomerStatisticMonthlyService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.statistic.entity.TaCustomerStatisticMonthly;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -32,4 +33,12 @@ public interface ITaCustomerStatisticMonthlyService extends IService<TaCustomerS
 	 * @param nowDate
 	 */
 	void visiteStatisticMonthly(LocalDateTime nowDate);
+	
+	/**
+	 * 查询12个月的客户统计分析数据
+	 * @param customerType
+	 * @param orgId
+	 * @return
+	 */
+	List<TaCustomerStatisticMonthly> getCustomerMonthlyList(String customerType, Integer orgId);
 }

src/main/java/com/huiju/estateagents/statistic/service/impl/TaCustomerStatisticDailyServiceImpl.java

@@ -73,6 +73,24 @@ public class TaCustomerStatisticDailyServiceImpl extends ServiceImpl<TaCustomerS
 		statisticDailySaveBatch(saveList,nowDate,CommConstant.CUSTOMER_TYPE_VISITE);
 	}
 	
+	/**
+	 * 获取日统计数据
+	 *
+	 * @param customerType
+	 * @param orgId
+	 * @return
+	 */
+	@Override
+	public List<TaCustomerStatisticDaily> getDailyList(String customerType, Integer orgId) {
+		//当前日期
+		LocalDateTime nowDate = LocalDateTime.now();
+		//31天前的日期
+		LocalDateTime beforeDate = nowDate.plusDays(-31);
+		//获取31天的日期数据
+		List<TaCustomerStatisticDaily> list = customerStatisticDailyMapper.getDailyList(customerType,orgId,nowDate,beforeDate);
+		return list;
+	}
+	
 	/**
 	 * 批量保存当天的统计数据
 	 * @param list

src/main/java/com/huiju/estateagents/statistic/service/impl/TaCustomerStatisticMonthlyServiceImpl.java

@@ -3,6 +3,7 @@ package com.huiju.estateagents.statistic.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.statistic.entity.TaCustomerStatisticDaily;
 import com.huiju.estateagents.statistic.entity.TaCustomerStatisticMonthly;
 import com.huiju.estateagents.statistic.mapper.TaCustomerStatisticMonthlyMapper;
 import com.huiju.estateagents.statistic.service.ITaCustomerStatisticMonthlyService;
@@ -71,6 +72,24 @@ public class TaCustomerStatisticMonthlyServiceImpl extends ServiceImpl<TaCustome
 		statisticMonthlySaveBatch(newVisiteMonthList,nowDate, CommConstant.CUSTOMER_TYPE_FOLLOW);
 	}
 	
+	/**
+	 * 查询12个月的客户统计分析数据
+	 *
+	 * @param customerType
+	 * @param orgId
+	 * @return
+	 */
+	@Override
+	public List<TaCustomerStatisticMonthly> getCustomerMonthlyList(String customerType, Integer orgId) {
+		//当前日期
+		LocalDateTime nowDate = LocalDateTime.now();
+		//12个月前的日期
+		LocalDateTime beforeDate = nowDate.plusMonths(-12);
+		//获取31天的日期数据
+		List<TaCustomerStatisticMonthly> list = customerStatisticMonthlyMapper.getMonthlyList(customerType,orgId,nowDate,beforeDate);
+		return list;
+	}
+	
 	/**
 	 * 批量保存当月的统计数据
 	 * @param list

src/main/resources/mapper/Activity.xml

@@ -25,4 +25,80 @@
         </if>
         ORDER BY weight desc,activity_status,start_date
     </select>
+    <select id="getCustomerActivityList" resultType="java.util.Map">
+        SELECT
+            t.enlist_id AS id,
+            t.dynamic_id AS activityId,
+            t.create_date AS createDate,
+            IF( t.is_checkin = 1, "已签到", "未签到" ) AS `status`,
+            d.img_url AS mainImg,
+            d.title,
+            d.start_date AS startDate,
+            d.enlist_end AS endDate,
+            'dynamic' AS type
+        FROM
+            ta_activity_dynamic_enlist t
+            LEFT JOIN ta_building_dynamic d ON t.dynamic_id = d.dynamic_id
+        WHERE
+            t.org_id = #{orgId}
+            AND t.person_id = #{personId}
+      UNION ALL
+        SELECT
+            t.record_id AS id,
+            t.group_activity_id AS activityId,
+            t.create_time AS createDate,
+        CASE
+            WHEN t.STATUS = 1 THEN
+            "进行中"
+            WHEN t.STATUS = 0
+            AND t.verification_status = 1 THEN
+            "成功已核销"
+        WHEN t.STATUS = 0
+        AND t.verification_status != 1 THEN
+        "成功未核销"
+        WHEN t.STATUS = 2 THEN
+        "失败"
+        END `status`,
+            d.main_img AS mainImg,
+            d.activity_name AS title,
+            d.start_time AS startDate,
+            d.end_time AS endDate,
+            'group' AS type
+        FROM
+            ta_share_record t
+            LEFT JOIN ta_share_activity d ON t.group_activity_id = d.group_activity_id
+        WHERE
+            t.org_id = #{orgId}
+            AND t.person_id = #{personId}
+      UNION ALL
+        SELECT
+            t.help_record_initiate_id AS id,
+            t.help_activity_id AS activityId,
+            t.create_date AS createDate,
+        CASE
+                WHEN t.STATUS = 1 THEN
+                "进行中"
+                WHEN t.STATUS = 0
+                AND t.verification_status = 1 THEN
+                    "成功已核销"
+                    WHEN t.STATUS = 0
+                    AND t.verification_status != 1 THEN
+                        "成功未核销"
+                        WHEN t.STATUS = 2 THEN
+                        "失败"
+                    END `status`,
+            d.img AS mainImg,
+            d.title,
+            d.start_date AS startDate,
+            d.end_date AS endDate,
+            'help' AS type
+        FROM
+            ta_help_initiate_record t
+            LEFT JOIN ta_help_activity d ON t.help_activity_id = d.help_activity_id
+        WHERE
+            t.org_id = #{orgId}
+            AND t.person_id = #{personId}
+        ORDER BY
+        createDate DESC
+    </select>
 </mapper>

src/main/resources/mapper/HelpActivityMapper.xml

@@ -31,10 +31,7 @@
             and ha.org_id=#{orgId}
         </where>
         GROUP BY ha.help_activity_id
-        order by ha.activity_status = 0 desc,
-                  ha.activity_status = 1 desc,
-                  ha.activity_status = 2 desc,
-                  ha.start_date asc
+        order by ha.heavy desc
     </select>
 
     <update id="updateActivityToUnStart">

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -49,5 +49,17 @@
         GROUP BY tpvr.person_id, tpvr.event
         ORDER BY 	accessCount DESC,tpvr.visit_time DESC
     </select>
+    <select id="getPersonVisitRecordList" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
+        SELECT
+            t.*,
+            b.building_name
+        FROM
+            ta_person_visit_record t
+            LEFT JOIN ta_building b ON t.building_id = b.building_id
+        WHERE
+            t.person_id = #{personId}
+        ORDER BY
+            t.visit_time DESC
+    </select>
 
 </mapper>

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -226,30 +226,29 @@ FROM
         ) AS sharePersonName
         FROM
         ta_person b
-               <where>
-                    b.status > 0
-                   AND IFNULL(b.person_type, '') in ('estate agent', 'customer')
-                    <if test="name != null and name !=''">
-                        and b.nickname like CONCAT('%',#{name}, '%')
-                    </if>
-                    <if test="tel != null and tel!=''">
-                        and b.phone like CONCAT('%',#{tel}, '%')
-                    </if>
-                    <if test="entryType != null and entryType !=''">
-                        and b.entry_type = #{entryType}
-                    </if>
-                    <if test="sex != null and sex !=''">
-                        and b.sex = #{sex}
-                    </if>
-                    <if test="orgId != null">
-                       and b.org_id = #{orgId}
-                    </if>
-                    <if test="consultTel != null and consultTel !=''">
-                        and b.tel like CONCAT('%',#{consultTel}, '%')
-                    </if>
-                    and NOT EXISTS ( select * from ta_recommend_customer a where a.recommend_person = b.person_id)
-                </where>
-               order by b.create_date desc
+        <where>
+            b.status > 0
+            and b.org_id = #{orgId}
+            AND IFNULL(b.person_type, '') in ('estate agent', 'customer')
+            AND b.person_id not IN ( SELECT c.person_id FROM ta_recommend_customer c WHERE c.org_id = #{orgId} AND person_id is not null AND person_id != ''  )
+            <if test="name != null and name !=''">
+                and b.nickname like CONCAT('%',#{name}, '%')
+            </if>
+            <if test="tel != null and tel!=''">
+                and b.phone like CONCAT('%',#{tel}, '%')
+            </if>
+            <if test="entryType != null and entryType !=''">
+                and b.entry_type = #{entryType}
+            </if>
+            <if test="sex != null and sex !=''">
+                and b.sex = #{sex}
+            </if>
+            <if test="consultTel != null and consultTel !=''">
+                and b.tel like CONCAT('%',#{consultTel}, '%')
+            </if>
+            and NOT EXISTS ( select * from ta_recommend_customer a where a.recommend_person = b.person_id)
+        </where>
+        order by b.create_date desc
     </select>
 
     <select id="getRecCustomerExport" resultType="com.huiju.estateagents.excel.ExcelRecommendCustomer">
@@ -606,4 +605,63 @@ FROM
         limit #{pageCode}, #{pageSize}
     </select>
 
+    <select id="getMyCustStatistics" resultType="java.util.Map">
+        SELECT
+            sum( IF ( STATUS = 4, 1, 0 ) ) AS followSum,
+            sum( IF ( STATUS != 4 AND STATUS != 4, 1, 0 ) ) AS clinchSum
+        FROM
+            ta_recommend_customer
+        WHERE
+            org_id = #{orgId}
+        AND ( realty_consultant = #{personId} OR realty_consultant = #{userId} )
+    </select>
+
+    <select id="getMyCustFollowOrClinch" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
+        SELECT
+            *
+        FROM
+            ta_recommend_customer
+        WHERE
+            org_id = #{orgId}
+        AND ( realty_consultant = #{personId} OR realty_consultant = #{userId} )
+        <if test="type == 'follow'">
+          AND STATUS != 4
+            <if test="name != null and name !=''">
+                and `name` like CONCAT('%',#{name}, '%')
+            </if>
+            <if test="phone != null and phone !=''">
+                and phone like CONCAT('%',#{phone}, '%')
+            </if>
+            <if test="status != null and status !=''">
+                and status = #{status}
+            </if>
+        </if>
+        <if test="type == 'clinch'">
+          AND STATUS = 4
+        </if>
+    </select>
+
+    <select id="getMyCustDetailById" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
+        SELECT
+            *
+        FROM
+            ta_recommend_customer
+        where customer_id = #{customerId}
+    </select>
+
+    <select id="getCustomerIntentions" resultType="com.huiju.estateagents.entity.PersonIntention">
+        SELECT
+            SUM( intention ) AS intention,
+            building_id,
+            building_name
+        FROM
+            `ta_person_intention_record`
+        WHERE
+            person_id = #{personId}
+        GROUP BY
+            building_id
+        ORDER BY
+            intention DESC
+    </select>
+
 </mapper>

src/main/resources/mapper/statistic/TaCustomerStatisticDailyMapper.xml

@@ -41,4 +41,16 @@
         GROUP BY
             c.org_id
     </select>
+
+    <select id="getDailyList" resultType="com.huiju.estateagents.statistic.entity.TaCustomerStatisticDaily">
+        SELECT
+          *
+        FROM
+          ta_customer_statistic_daily
+        WHERE
+          org_id = #{orgId}
+        AND customer_type = #{customerType}
+        AND date_format( create_date, '%Y-%m-%d' ) >= date_format( #{beforeDate}, '%Y-%m-%d' )
+        AND date_format( create_date, '%Y-%m-%d' ) &lt;= date_format( #{nowDate}, '%Y-%m-%d' )
+    </select>
 </mapper>

src/main/resources/mapper/statistic/TaCustomerStatisticMonthlyMapper.xml

@@ -44,4 +44,15 @@
         GROUP BY
             c.org_id
     </select>
+    <select id="getMonthlyList" resultType="com.huiju.estateagents.statistic.entity.TaCustomerStatisticMonthly">
+        SELECT
+          *
+        FROM
+          ta_customer_statistic_monthly
+        WHERE
+          org_id = #{orgId}
+        AND customer_type = #{customerType}
+        AND date_format( create_date, '%Y-%m-%d' ) >= date_format( #{beforeDate}, '%Y-%m-%d' )
+        AND date_format( create_date, '%Y-%m-%d' ) &lt;= date_format( #{nowDate}, '%Y-%m-%d' )
+    </select>
 </mapper>