Merge branch 'dev'

# Conflicts:
#	src/main/resources/mapper/TaRecommendCustomerMapper.xml

src/main/java/com/huiju/estateagents/bo/request/ActivityStatisticResponseBO.java

@@ -41,4 +41,9 @@ public class ActivityStatisticResponseBO {
      */
     private Integer newCustomers;
 
+    /**
+     * 活动名称
+     */
+    private String activityName;
+
 }

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

@@ -1,238 +1,244 @@
-package com.huiju.estateagents.center.taUser.entity;
-
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.huiju.estateagents.entity.*;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * <p>
- * 用户表 
- * </p>
- *
- * @author jobob
- * @since 2019-09-11
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class TaUser implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 用户ID
-     */
-    @TableId(value = "user_id", type = IdType.AUTO)
-    private Integer userId;
-
-    /**
-     * 公司id
-     */
-    private Integer orgId;
-
-    /**
-     * 用户名称
-     */
-    private String userName;
-
-    /**
-     * 登录账户
-     */
-    private String loginName;
-
-    /**
-     * 手机号
-     */
-    private String phone;
-
-    /**
-     * 登录密码
-     */
-    private String loginPassword;
-
-    /**
-     * 用户头像
-     */
-    private String avatar;
-
-    /**
-     * 用户状态
-     */
-    private Integer status;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createDate;
-
-    /**
-     * 账户过期时间
-     */
-    private LocalDateTime expDate;
-
-    /**
-     * 是否管理员
-     */
-    private Boolean isAdmin;
-
-    /**
-     * 公司名称
-     */
-    private String orgName;
-
-    /**
-     * 部门
-     */
-    private String department;
-
-    /**
-     * 职位
-     */
-    private String position;
-
-    /**
-     * 邮箱
-     */
-    private String email;
-
-    /**
-     * 身份证号
-     */
-    private String idNo;
-    
-    private String address;
-    private String photo;
-    private String description;
-
-    /**
-     * 权重
-     */
-    @TableField(strategy= FieldStrategy.IGNORED)
-    private String weight;
-
-    /**
-     * 是否置业顾问
-     */
-    private Boolean isConsultant;
-
-    /**
-     * 公司水印
-     */
-    @TableField(exist = false)
-    private String waterMark;
-
-    /**
-     * 关联小程序
-     */
-    @TableField(exist = false)
-    private TaMiniapp miniapp;
-
-    /**
-     * 授权角色列表
-     */
-    @TableField(exist = false)
-    private List<TaRole> roles;
-
-    /**
-     * 授权菜单列表
-     */
-    @TableField(exist = false)
-    private List<SysMenu> menus;
-
-    /**
-     * 授权按钮列表
-     */
-    @TableField(exist = false)
-    private List<SysButtonInMenu> buttons;
-    
-    @TableField(exist = false)
-    private List<TaTags> taTagsList = new ArrayList<TaTags>();
-    
-    @TableField(exist = false)
-    private List<Integer> taTags = new ArrayList<Integer>();
-    
-    @TableField(exist = false)
-    private List<Integer> roleIds = new ArrayList<Integer>();
-    
-    @TableField(exist = false)
-    private String buildingId;
-
-    @TableField(exist = false)
-    private List<String> projects;
-
-    /**
-     * ta_org/orgNum楼盘最大数
-     */
-  @TableField(exist = false)
-    private int orgNum;
-
-    // 所有省份城市
-    @TableField(exist = false)
-    List<TdCity> tdCityList;
-
-    /**
-     * 前台传值城市
-     */
-    @TableField(exist = false)
-    private ArrayList<String> selectCityTree;
-
-    /**
-     * 城市ID
-     */
-    @TableField(exist = false)
-    private Integer cityId;
-
-    /**
-     * 默认城市
-     */
-    @TableField(exist = false)
-    private Integer defaultCityId;
-
-    /**
-     * 小程序绑定状态
-     *
-     * 0 未绑定 1 绑定
-     */
-    @TableField(exist = false)
-    private Integer miniStatus;
-
-    @TableField(exist = false)
-    private List<String> buildingIds = new ArrayList<String>();
-
-    /**
-     * 新密码
-     */
-    @TableField(exist = false)
-    private String newPassword;
-
-    /**
-     * 确认新密码
-     */
-    @TableField(exist = false)
-    private String confirmPassword;
-
-    /**
-     * 置业顾问的personid
-     */
-    @TableField(exist = false)
-    private String consultantPersonId;
-
-    /**
-     * personId集合
-     */
-    @TableField(exist = false)
-    private List<TaPerson> personIds;
-
-    @TableField(exist = false)
-    private String miniAppName;
-}
+package com.huiju.estateagents.center.taUser.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.huiju.estateagents.entity.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 用户表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaUser implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户ID
+     */
+    @TableId(value = "user_id", type = IdType.AUTO)
+    private Integer userId;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 用户名称
+     */
+    private String userName;
+
+    /**
+     * 登录账户
+     */
+    private String loginName;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 登录密码
+     */
+    private String loginPassword;
+
+    /**
+     * 用户头像
+     */
+    private String avatar;
+
+    /**
+     * 用户状态
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 账户过期时间
+     */
+    private LocalDateTime expDate;
+
+    /**
+     * 是否管理员
+     */
+    private Boolean isAdmin;
+
+    /**
+     * 公司名称
+     */
+    private String orgName;
+
+    /**
+     * 部门
+     */
+    private String department;
+
+    /**
+     * 职位
+     */
+    private String position;
+
+    /**
+     * 邮箱
+     */
+    private String email;
+
+    /**
+     * 身份证号
+     */
+    private String idNo;
+    
+    private String address;
+    private String photo;
+    private String description;
+
+    /**
+     * 权重
+     */
+    @TableField(strategy= FieldStrategy.IGNORED)
+    private String weight;
+
+    /**
+     * 是否置业顾问
+     */
+    private Boolean isConsultant;
+
+    /**
+     * 公司水印
+     */
+    @TableField(exist = false)
+    private String waterMark;
+
+    /**
+     * 关联小程序
+     */
+    @TableField(exist = false)
+    private TaMiniapp miniapp;
+
+    /**
+     * 授权角色列表
+     */
+    @TableField(exist = false)
+    private List<TaRole> roles;
+
+    /**
+     * 授权菜单列表
+     */
+    @TableField(exist = false)
+    private List<SysMenu> menus;
+
+    /**
+     * 授权按钮列表
+     */
+    @TableField(exist = false)
+    private List<SysButtonInMenu> buttons;
+    
+    @TableField(exist = false)
+    private List<TaTags> taTagsList = new ArrayList<TaTags>();
+    
+    @TableField(exist = false)
+    private List<Integer> taTags = new ArrayList<Integer>();
+    
+    @TableField(exist = false)
+    private List<Integer> roleIds = new ArrayList<Integer>();
+    
+    @TableField(exist = false)
+    private String buildingId;
+
+    @TableField(exist = false)
+    private List<String> projects;
+
+    /**
+     * ta_org/orgNum楼盘最大数
+     */
+  @TableField(exist = false)
+    private int orgNum;
+
+    // 所有省份城市
+    @TableField(exist = false)
+    List<TdCity> tdCityList;
+
+    /**
+     * 前台传值城市
+     */
+    @TableField(exist = false)
+    private ArrayList<String> selectCityTree;
+
+    /**
+     * 城市ID
+     */
+    @TableField(exist = false)
+    private Integer cityId;
+
+    /**
+     * 默认城市
+     */
+    @TableField(exist = false)
+    private Integer defaultCityId;
+
+    /**
+     * 小程序绑定状态
+     *
+     * 0 未绑定 1 绑定
+     */
+    @TableField(exist = false)
+    private Integer miniStatus;
+
+    @TableField(exist = false)
+    private List<String> buildingIds = new ArrayList<String>();
+
+    /**
+     * 新密码
+     */
+    @TableField(exist = false)
+    private String newPassword;
+
+    /**
+     * 确认新密码
+     */
+    @TableField(exist = false)
+    private String confirmPassword;
+
+    /**
+     * 置业顾问的personid
+     */
+    @TableField(exist = false)
+    private String consultantPersonId;
+
+    /**
+     * personId集合
+     */
+    @TableField(exist = false)
+    private List<TaPerson> personIds;
+
+    /**
+     * customerId集合
+     */
+    @TableField(exist = false)
+    private List<TaRecommendCustomer> customerIds;
+
+    @TableField(exist = false)
+    private String miniAppName;
+}

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java

@@ -357,16 +357,15 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
         if (!isOn){
             //查看是否置业顾问
             if (taUser.getIsConsultant()){
-                taUser.setIsConsultant(false);
-                taUserMapper.updateById(taUser);
+//                taUser.setIsConsultant(false);
+//                taUserMapper.updateById(taUser);
                 //小程序端调整为普通客户
                 QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
                 taPersonQueryWrapper.eq("user_id",id);
                 taPersonQueryWrapper.eq("org_id",taUser.getOrgId());
                 TaPerson taPerson = taPersonMapper.selectOne(taPersonQueryWrapper);
                 if (null != taPerson){
-                    taPerson.setPersonType(CommConstant.PERSON_ESTATE_CUSTOMER);
-                    taPersonMapper.updateById(taPerson);
+                    taPersonMapper.cancelConsulatant(taPerson.getPersonId());
                 }
             }
         }
@@ -374,6 +373,7 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
         Integer status = isOn ? CommConstant.STATUS_NORMAL : CommConstant.STATUS_CLOSED;
         TaUser user = new TaUser();
         user.setStatus(status);
+        user.setWeight(taUser.getWeight());
 
         QueryWrapper<TaUser> taUserQueryWrapper = new QueryWrapper<>();
         if (CommConstant.LOGIN_TYPE_ADMIN.equals(plat)) {

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

@@ -1,249 +1,263 @@
-package com.huiju.estateagents.controller;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-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 io.swagger.annotations.ApiOperation;
-import com.huiju.estateagents.common.JWTUtils;
-import com.huiju.estateagents.common.StringUtils;
-import com.huiju.estateagents.entity.TaChannel;
-import com.huiju.estateagents.entity.TaPerson;
-import com.huiju.estateagents.mapper.TaChannelMapper;
-import com.huiju.estateagents.service.ITaPersonService;
-import com.huiju.estateagents.service.TaChannelService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import org.apache.http.HttpRequest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-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.HashMap;
-import java.util.List;
-
-
-/**
- * <p>
-    *   前端控制器
-    * </p>
- *
- * @author jobob
- * @since 2019-09-17
- */
-@RestController
-@RequestMapping("/api")
-@Api(value = "渠道管理", tags = "渠道管理")
-public class TaChannelController extends BaseController {
-
-    private final Logger logger = LoggerFactory.getLogger(TaChannelController.class);
-
-    @Autowired
-    public TaChannelService taChannelService;
-
-    @Autowired
-    public ITaPersonService taPersonService;
-
-    @Autowired
-    public TaChannelMapper taChannelMapper;
-
-
-    /**
-     * 渠道管理列表
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @ApiOperation(value = "渠道管理列表", notes = "渠道管理列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
-            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
-            @ApiImplicitParam(dataTypeClass = String.class, name = "channelId", paramType = "query",value = "渠道Id"),
-    })
-    @RequestMapping(value="/admin/channel",method= RequestMethod.GET)
-    public ResponseBean channelList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                    @RequestParam(value ="channelId",required = false) Integer channelId,
-                                    HttpServletRequest request){
-        ResponseBean responseBean = new ResponseBean();
-        Integer orgId = getOrgId(request);
-        try {
-            //使用分页插件
-		    IPage<TaChannel> pg = new Page<>(pageNum, pageSize);
-            IPage<TaChannel> result = taChannelMapper.pageTaChannel(pg,orgId,channelId);
-            HashMap hashMap  = new HashMap<>();
-            hashMap.put("result",result);
-            // 下拉列表的数据 all
-            List<TaChannel> taChannelList = taChannelMapper.selectChannelList(orgId);
-            hashMap.put("channelNmae",taChannelList);
-            responseBean.addSuccess(hashMap);
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("channelList -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-
-    /**
-     * 渠道保存
-     * @param channel 实体对象
-     * @return
-     */
-    @ApiOperation(value = "渠道保存", notes = "渠道保存")
-    @ApiImplicitParams({
-            @ApiImplicitParam(dataTypeClass = TaChannel.class, name = "channel", paramType = "body",value = "当前对象"),
-    })
-    @RequestMapping(value="/admin/channel",method= RequestMethod.POST)
-    public ResponseBean channelAdd(@RequestBody TaChannel channel ,HttpServletRequest request){
-        Integer orgId = getOrgId(request);
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            // 生成6位数的渠道码
-            int channelCode= taChannelMapper.channelCode();
-            channel.setChannelCode(String.valueOf(channelCode));
-            channel.setOrgId(orgId);
-            if (taChannelService.save(channel)){
-                responseBean.addSuccess(channel);
-            }else {
-                responseBean.addError("fail");
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("channelAdd -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-
-    /**
-     * 根据id删除对象
-     * @param id  实体ID
-     */
-    @ApiOperation(value = "根据渠道ID删除", notes = "根据渠道ID删除")
-    @ApiImplicitParams({
-            @ApiImplicitParam(dataTypeClass = Integer.class, name = "id", paramType = "query",value = "渠道id"),
-    })
-    @ResponseBody
-    @RequestMapping(value="/channel/{id}", method= RequestMethod.DELETE)
-    public ResponseBean channelDelete(@PathVariable Integer id){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            if(taChannelService.removeById(id)){
-                responseBean.addSuccess("success");
-            }else {
-                responseBean.addError("fail");
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("channelDelete -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-
-    /**
-     * 修改对象
-     * @param id  实体ID
-     * @param channel 实体对象
-     * @return
-     */
-    @ApiOperation(value = "根据渠道ID修改", notes = "根据渠道ID修改")
-    @ApiImplicitParams({
-            @ApiImplicitParam(dataTypeClass = Integer.class, name = "id", paramType = "query",value = "渠道id"),
-    })
-    @RequestMapping(value="/admin/channel/{id}",method= RequestMethod.PUT)
-    public ResponseBean channelUpdate(@PathVariable Integer id,
-                                        @RequestBody TaChannel channel){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            channel.setChannelId(id);
-            if (taChannelService.updateById(channel)){
-                responseBean.addSuccess(channel);
-            }else {
-                responseBean.addError("fail");
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("channelUpdate -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-
-    /**
-     * 根据id查询对象
-     * @param id  实体ID
-     */
-    @ApiOperation(value = "根据渠道ID查询", notes = "根据渠道ID查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(dataTypeClass = Integer.class, name = "id", paramType = "query",value = "渠道id"),
-    })
-    @RequestMapping(value="/admin/channel/{id}",method= RequestMethod.GET)
-    public ResponseBean channelGet(@PathVariable Integer id){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            responseBean.addSuccess(taChannelService.getById(id));
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("channelDelete -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-
-    /**
-     * 渠道管理下的经纪人
-     */
-    @ApiOperation(value = "渠道管理下的经纪人", notes = "渠道管理下的经纪人")
-    @ApiImplicitParams({
-            @ApiImplicitParam(dataTypeClass = String.class, name = "name", paramType = "query",value = "姓名"),
-            @ApiImplicitParam(dataTypeClass = String.class, name = "phone", paramType = "query",value = "电话"),
-            @ApiImplicitParam(dataTypeClass = Integer.class, name = "channelId", paramType = "query",value = "渠道id"),
-            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "多少页"),
-            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "每页多少条"),
-    })
-    @RequestMapping(value="/admin/channel/broker",method= RequestMethod.GET)
-    public  ResponseBean channelBrokerList(@RequestParam(value="name",required = false) String name,
-                                           @RequestParam(value="phone",required = false) String phone,
-                                           @RequestParam(value="channelId",required = false) Integer channelId,
-                                           @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                           HttpServletRequest request){
-        Integer orgid = getOrgId(request);
-        ResponseBean taPerson =  taPersonService.channelBrokerList(name,phone,pageNum,pageSize,orgid,channelId);
-        return taPerson;
-    }
-
-    /**
-     * 渠道邀请经纪人列表
-     */
-    @ApiOperation(value = "渠道邀请经纪人列表", notes = "渠道邀请经纪人列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(dataTypeClass = String.class, name = "id", paramType = "query",value = "姓名"),
-            @ApiImplicitParam(dataTypeClass = String.class, name = "phone", paramType = "query",value = "电话"),
-            @ApiImplicitParam(dataTypeClass = Integer.class, name = "channelId", paramType = "query",value = "渠道id"),
-            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "多少页"),
-            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "每页多少条"),
-    })
-    @RequestMapping(value="/admin/channel/InviteClientsList",method= RequestMethod.GET)
-    public  ResponseBean InviteClientsList(@RequestParam(value="id",required = false) String id,
-                                           @RequestParam(value="phone",required = false) String phone,
-                                           @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                           HttpServletRequest request){
-        ResponseBean taPerson =  taPersonService.InviteClientsList(id,phone,pageNum,pageSize);
-        return taPerson;
-    }
-}
+package com.huiju.estateagents.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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 io.swagger.annotations.ApiOperation;
+import com.huiju.estateagents.common.JWTUtils;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.TaBuildingReport;
+import com.huiju.estateagents.entity.TaChannel;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.mapper.TaChannelMapper;
+import com.huiju.estateagents.service.ITaPersonService;
+import com.huiju.estateagents.service.TaChannelService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import org.apache.http.HttpRequest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+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.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.List;
+import java.util.stream.Collectors;
+
+
+/**
+ * <p>
+    *   前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-09-17
+ */
+@RestController
+@RequestMapping("/api")
+@Api(value = "渠道管理", tags = "渠道管理")
+public class TaChannelController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaChannelController.class);
+
+    @Autowired
+    public TaChannelService taChannelService;
+
+    @Autowired
+    public ITaPersonService taPersonService;
+
+    @Autowired
+    public TaChannelMapper taChannelMapper;
+
+
+    /**
+     * 渠道管理列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @ApiOperation(value = "渠道管理列表", notes = "渠道管理列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "channelId", paramType = "query",value = "渠道Id"),
+    })
+    @RequestMapping(value="/admin/channel",method= RequestMethod.GET)
+    public ResponseBean channelList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                    @RequestParam(value ="channelId",required = false) Integer channelId,
+                                    HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        Integer orgId = getOrgId(request);
+        try {
+            //使用分页插件
+		    IPage<TaChannel> pg = new Page<>(pageNum, pageSize);
+            IPage<TaChannel> result = taChannelMapper.pageTaChannel(pg,orgId,channelId);
+            List<TaChannel> recommendCount = taChannelMapper.recommendCount(orgId, channelId);
+
+            result.getRecords().stream().forEach(e -> {
+                for(TaChannel channel : recommendCount){
+                    if (channel.getChannelId().equals(e.getChannelId())){
+                        e.setRecommendCount(channel.getRecommendCount());
+                    }
+                }
+            });
+
+            HashMap hashMap  = new HashMap<>();
+            hashMap.put("result",result);
+            // 下拉列表的数据 all
+            List<TaChannel> taChannelList = taChannelMapper.selectChannelList(orgId);
+            hashMap.put("channelNmae",taChannelList);
+            responseBean.addSuccess(hashMap);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("channelList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 渠道保存
+     * @param channel 实体对象
+     * @return
+     */
+    @ApiOperation(value = "渠道保存", notes = "渠道保存")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = TaChannel.class, name = "channel", paramType = "body",value = "当前对象"),
+    })
+    @RequestMapping(value="/admin/channel",method= RequestMethod.POST)
+    public ResponseBean channelAdd(@RequestBody TaChannel channel ,HttpServletRequest request){
+        Integer orgId = getOrgId(request);
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            // 生成6位数的渠道码
+            int channelCode= taChannelMapper.channelCode();
+            channel.setChannelCode(String.valueOf(channelCode));
+            channel.setOrgId(orgId);
+            if (taChannelService.save(channel)){
+                responseBean.addSuccess(channel);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("channelAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ApiOperation(value = "根据渠道ID删除", notes = "根据渠道ID删除")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "id", paramType = "query",value = "渠道id"),
+    })
+    @ResponseBody
+    @RequestMapping(value="/channel/{id}", method= RequestMethod.DELETE)
+    public ResponseBean channelDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(taChannelService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("channelDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param channel 实体对象
+     * @return
+     */
+    @ApiOperation(value = "根据渠道ID修改", notes = "根据渠道ID修改")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "id", paramType = "query",value = "渠道id"),
+    })
+    @RequestMapping(value="/admin/channel/{id}",method= RequestMethod.PUT)
+    public ResponseBean channelUpdate(@PathVariable Integer id,
+                                        @RequestBody TaChannel channel){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            channel.setChannelId(id);
+            if (taChannelService.updateById(channel)){
+                responseBean.addSuccess(channel);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("channelUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @ApiOperation(value = "根据渠道ID查询", notes = "根据渠道ID查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "id", paramType = "query",value = "渠道id"),
+    })
+    @RequestMapping(value="/admin/channel/{id}",method= RequestMethod.GET)
+    public ResponseBean channelGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(taChannelService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("channelDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 渠道管理下的经纪人
+     */
+    @ApiOperation(value = "渠道管理下的经纪人", notes = "渠道管理下的经纪人")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, name = "name", paramType = "query",value = "姓名"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "phone", paramType = "query",value = "电话"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "channelId", paramType = "query",value = "渠道id"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "多少页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "每页多少条"),
+    })
+    @RequestMapping(value="/admin/channel/broker",method= RequestMethod.GET)
+    public  ResponseBean channelBrokerList(@RequestParam(value="name",required = false) String name,
+                                           @RequestParam(value="phone",required = false) String phone,
+                                           @RequestParam(value="channelId",required = false) Integer channelId,
+                                           @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                           HttpServletRequest request){
+        Integer orgid = getOrgId(request);
+        ResponseBean taPerson =  taPersonService.channelBrokerList(name,phone,pageNum,pageSize,orgid,channelId);
+        return taPerson;
+    }
+
+    /**
+     * 渠道邀请经纪人列表
+     */
+    @ApiOperation(value = "渠道邀请经纪人列表", notes = "渠道邀请经纪人列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, name = "id", paramType = "query",value = "姓名"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "phone", paramType = "query",value = "电话"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "channelId", paramType = "query",value = "渠道id"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "多少页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "每页多少条"),
+    })
+    @RequestMapping(value="/admin/channel/InviteClientsList",method= RequestMethod.GET)
+    public  ResponseBean InviteClientsList(@RequestParam(value="id",required = false) String id,
+                                           @RequestParam(value="phone",required = false) String phone,
+                                           @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                           HttpServletRequest request){
+        ResponseBean taPerson =  taPersonService.InviteClientsList(id,phone,pageNum,pageSize);
+        return taPerson;
+    }
+}

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

@@ -5,26 +5,25 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.SMSUtils;
 import com.huiju.estateagents.common.StringUtils;
-import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.entity.TaChannel;
+import com.huiju.estateagents.entity.TaChannelPerson;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.service.ITaPersonBuildingService;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.TaChannelPersonService;
 import com.huiju.estateagents.service.TaChannelService;
 import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
-import org.checkerframework.checker.units.qual.A;
-import org.checkerframework.checker.units.qual.C;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
-import com.huiju.estateagents.base.BaseController;
 import org.springframework.web.client.RestTemplate;
 
 import javax.servlet.http.HttpServletRequest;
@@ -159,11 +158,18 @@ public class TaPersonController extends BaseController {
             return ResponseBean.error("您已经成为置业顾问",ResponseBean.ERROR_UNAVAILABLE);
         }
         QueryWrapper<TaUser>queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("phone",person.getPhone());
+        queryWrapper.nested(query -> query.eq("phone", person.getTel()).or().eq("phone", person.getPhone()));
         queryWrapper.eq("org_id",orgId);
         queryWrapper.eq("status",CommConstant.STATUS_NORMAL);
         queryWrapper.eq("is_consultant",true);
         List<TaUser> users = taUserService.list(queryWrapper);
+
+        TaChannelPerson taChannelPerson = new TaChannelPerson();
+        taChannelPerson.setStatus(CommConstant.STATUS_DELETE);
+        QueryWrapper<TaChannelPerson> taChannelPersonQueryWrapper = new QueryWrapper<>();
+        taChannelPersonQueryWrapper.eq("person_id", person.getPersonId());
+        taChannelPersonService.update(taChannelPerson, taChannelPersonQueryWrapper);
+
         if(users.size()>0){
             TaUser user = users.get(0);
             person.setPersonType(CommConstant.PERSON_REALTY_CONSULTANT);
@@ -208,13 +214,13 @@ public class TaPersonController extends BaseController {
         if(StringUtils.isEmpty(channelCode)){
             person.setPersonType(CommConstant.PERSON_ESTATE_AGENT);
         }else {
-            person.setPersonType(CommConstant.PERSON_ESTATE_CHANNEL);
+            person.setPersonType(CommConstant.PERSON_ESTATE_AGENT);
             QueryWrapper<TaChannel> queryWrapper = new QueryWrapper();
             queryWrapper.eq("channel_code",channelCode);
             queryWrapper.eq("org_id",orgId);
             TaChannel channel = taChannelService.getOne(queryWrapper);
             if (null == channel){
-                return ResponseBean.error("渠道码不存在",ResponseBean.ERROR_UNAVAILABLE);
+                return ResponseBean.error("验证码有误，请确认后重新输入",ResponseBean.ERROR_UNAVAILABLE);
             }
             QueryWrapper<TaChannelPerson>taChannelPersonQueryWrapper = new QueryWrapper<>();
             taChannelPersonQueryWrapper.eq("person_id",person.getPersonId());
@@ -568,7 +574,7 @@ public class TaPersonController extends BaseController {
         }
         if (!StringUtils.isEmpty(phone)){
             person.setTel(phone);
-            person.setPhone(phone);
+//            person.setPhone(phone);
             if(person.getPersonType().equals(CommConstant.PERSON_REALTY_CONSULTANT)){
                 TaUser user = taUserService.getById(person.getUserId());
                 user.setPhone(phone);
@@ -664,17 +670,20 @@ public class TaPersonController extends BaseController {
                     return ResponseBean.error("渠道码错误", ResponseBean.ERROR_UNAVAILABLE);
                 }
 
-            }else {
-                QueryWrapper<TaChannelPerson>channelPersonQueryWrapper = new QueryWrapper<>();
-                channelPersonQueryWrapper.eq("person_id",person.getPersonId());
-                List<TaChannelPerson> taChannelPerson = taChannelPersonService.list(channelPersonQueryWrapper);
-                if (taChannelPerson.size()>0){
-                    for(int i=0;i<taChannelPerson.size();i++){
-                        taChannelPerson.get(i).setStatus(CommConstant.STATUS_DELETE);
-                    }
-                    taChannelPersonService.updateBatchById(taChannelPerson);
-                }
             }
+            //编辑个人信息暂时不修改经纪人类型
+//            else {
+//
+//                QueryWrapper<TaChannelPerson>channelPersonQueryWrapper = new QueryWrapper<>();
+//                channelPersonQueryWrapper.eq("person_id",person.getPersonId());
+//                List<TaChannelPerson> taChannelPerson = taChannelPersonService.list(channelPersonQueryWrapper);
+//                if (taChannelPerson.size()>0){
+//                    for(int i=0;i<taChannelPerson.size();i++){
+//                        taChannelPerson.get(i).setStatus(CommConstant.STATUS_DELETE);
+//                    }
+//                    taChannelPersonService.updateBatchById(taChannelPerson);
+//                }
+//            }
             person.setPersonType(personType);
             if (taPersonService.updateById(person)){
                 responseBean.addSuccess(person);

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

@@ -424,10 +424,11 @@ public class TaRecommendCustomerController extends BaseController {
     public ResponseBean getIndependentAgents(HttpServletRequest request,
                                              @RequestParam(value = "name", required = false) String name,
                                              @RequestParam(value = "tel", required = false) String tel,
+                                             @RequestParam(value = "channelId", required = false) String channelId,
                                              @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
                                              @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
         try {
-            return ResponseBean.success(taRecommendCustomerService.getIndependentAgents(pageNumber, pageSize, name, tel, getOrgId(request)));
+            return ResponseBean.success(taRecommendCustomerService.getIndependentAgents(pageNumber, pageSize, name, tel, channelId, getOrgId(request)));
         } catch (Exception e) {
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
@@ -441,8 +442,7 @@ public class TaRecommendCustomerController extends BaseController {
     public ResponseBean assistConsultant(@RequestBody TaUser taUser, @PathVariable String personId, HttpServletRequest request) {
         try {
             Integer orgId = getOrgId(request);
-            taRecommendCustomerService.consultantAssist(taUser, personId, orgId);
-            return ResponseBean.success("");
+            return taRecommendCustomerService.consultantAssist(taUser, personId, orgId);
         } catch (Exception e) {
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
@@ -454,13 +454,12 @@ public class TaRecommendCustomerController extends BaseController {
      */
     @RequestMapping(value = "/admin/customer/consultant/batchAssist", method = RequestMethod.POST)
     public ResponseBean batchAssistConsultant(@RequestBody TaUser taUser, HttpServletRequest request) {
-        if (CollectionUtils.isEmpty(taUser.getPersonIds())) {
+        if (CollectionUtils.isEmpty(taUser.getCustomerIds())) {
             return ResponseBean.error("请至少选择一条数据", ResponseBean.ERROR_UNAVAILABLE);
         }
         try {
             Integer orgId = getOrgId(request);
-            taRecommendCustomerService.batchConsultantAssist(taUser, orgId);
-            return ResponseBean.success("");
+            return taRecommendCustomerService.batchConsultantAssist(taUser, orgId);
         } catch (Exception e) {
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
@@ -672,7 +671,6 @@ public class TaRecommendCustomerController extends BaseController {
                     if (null != realtyConsultant) {
                         List<TaBuilding> taBuildings = taPersonBuildingMapper.getBuildingsOf(realtyConsultant);
                         taRecommendCustomer.setRealtyConsultant(realtyConsultant);
-                        taRecommendCustomer.setCreateDate(LocalDateTime.now());
                         if (taBuildings != null && taBuildings.size() > 0) {
                             TaBuilding taBuilding = taBuildings.get(0);
                             taRecommendCustomer.setBuildingId(taBuilding.getBuildingId());
@@ -681,6 +679,7 @@ public class TaRecommendCustomerController extends BaseController {
                     }
                 }
 
+                taRecommendCustomer.setVerifyDate(LocalDateTime.now());
                 if (taRecommendCustomerService.updateById(taRecommendCustomer)) {
 
                     // 审核通过增加积分
@@ -782,7 +781,10 @@ public class TaRecommendCustomerController extends BaseController {
      * 导出数据(经纪人)
      */
     @GetMapping("/admin/customer/recommend/agents/export")
-    public void agentsExport(HttpServletRequest request, HttpServletResponse response) throws IOException {
+    public void agentsExport(@RequestParam(value = "name", required = false) String name,
+                             @RequestParam(value = "tel", required = false) String tel,
+                             @RequestParam(value = "channelId", required = false) String channelId,
+                             HttpServletRequest request, HttpServletResponse response) throws IOException {
 //        response.setContentType("application/vnd.ms-excel");
         response.setContentType("application/octet-stream");
         response.setCharacterEncoding("utf-8");
@@ -800,7 +802,7 @@ public class TaRecommendCustomerController extends BaseController {
         WriteSheet writeSheet = EasyExcel.writerSheet("经纪人").build();
         List<AgentsRecommendCustomer> recCustomerExport = null;
         do {
-            recCustomerExport = taRecommendCustomerService.getIndependentAgentsExport(getOrgId(request), pageCode * pageSize, pageSize);
+            recCustomerExport = taRecommendCustomerService.getIndependentAgentsExport(name, tel, channelId, getOrgId(request), pageCode * pageSize, pageSize);
             excelWriter.write(recCustomerExport, writeSheet);
 
             pageCode++;

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

@@ -1,9 +1,5 @@
 package com.huiju.estateagents.entity;
 
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.List;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -12,6 +8,10 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
 /**
  * <p>
  * 人员表

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

@@ -149,6 +149,8 @@ public class TaRecommendCustomer implements Serializable {
 
     private LocalDateTime arrivalDate;
 
+    private LocalDateTime verifyDate;
+
     @DateTimeFormat("yyyy年MM月dd日")
     private LocalDateTime createDate;
 

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

@@ -1,40 +1,42 @@
-package com.huiju.estateagents.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.huiju.estateagents.entity.TaChannel;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- *   Mapper 接口
- * </p>
- *
- * @author jobob
- * @since 2019-09-17
- */
-@Mapper
-public interface TaChannelMapper extends BaseMapper<TaChannel> {
-
-    /**
-     * 渠道码
-     * @return
-     */
-    int channelCode();
-
-    /**
-     * 渠道页面下拉列表的所有数据
-     * @return
-     */
-    List<TaChannel> selectChannelList(@Param("orgId")Integer orgId);
-
-    /**
-     * 渠道列表
-     * @param pg
-     * @return
-     */
-    IPage<TaChannel> pageTaChannel(IPage<TaChannel> pg,@Param("orgId")Integer orgId,@Param("channelId")Integer channelId);
-}
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.entity.TaChannel;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *   Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-17
+ */
+@Mapper
+public interface TaChannelMapper extends BaseMapper<TaChannel> {
+
+    /**
+     * 渠道码
+     * @return
+     */
+    int channelCode();
+
+    /**
+     * 渠道页面下拉列表的所有数据
+     * @return
+     */
+    List<TaChannel> selectChannelList(@Param("orgId")Integer orgId);
+
+    /**
+     * 渠道列表
+     * @param pg
+     * @return
+     */
+    IPage<TaChannel> pageTaChannel(IPage<TaChannel> pg,@Param("orgId")Integer orgId,@Param("channelId")Integer channelId);
+
+    List<TaChannel> recommendCount(@Param("orgId")Integer orgId,@Param("channelId")Integer channelId);
+}

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

@@ -256,4 +256,6 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
     Integer selectTodayRecentlyCount(@Param("orgId") Integer orgId, @Param("nowDate") LocalDateTime nowDate);
 
     List<Map<String, Object>> selectCityPerson(@Param("orgId") Integer orgId);
+
+    Integer cancelConsulatant(@Param("personId") String personId);
 }

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

@@ -36,7 +36,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
     IPage<TaRecommendCustomer> getCustomerList(IPage<TaRecommendCustomer> page,@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("status")Integer status, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList,@Param("sceneType") String sceneType, @Param("startCreateDate") String startCreateDate, @Param("endCreateDate") String endCreateDate, @Param("sharePersonName") String sharePersonName);
     IPage<TaRecommendCustomer> getRecCustomerList(IPage<TaRecommendCustomer> page,@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);
     IPage<TaRecommendCustomer> getRepCustomerList(IPage<TaRecommendCustomer> page,@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);
-    IPage<TaPerson> getIndependentAgents(IPage<TaPerson>page, @Param("name") String name, @Param("tel") String tel, @Param("orgId") Integer orgId);
+    IPage<TaPerson> getIndependentAgents(IPage<TaPerson>page, @Param("name") String name, @Param("tel") String tel, @Param("channelId") String channelId, @Param("orgId") Integer orgId);
 
     /**
      * 公客
@@ -107,7 +107,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param pageSize
      * @return
      */
-    List<AgentsRecommendCustomer> getIndependentAgentsExport(@Param("orgId") Integer orgId, @Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize);
+    List<AgentsRecommendCustomer> getIndependentAgentsExport(@Param("name")String name, @Param("tel")String tel, @Param("channelId")String channelId, @Param("orgId") Integer orgId, @Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize);
 
     /**
      * 导出数据 公客总数
@@ -226,6 +226,17 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
                                                            @Param("endDate") LocalDateTime endDate,
                                                            @Param("personId") String personId);
 
+    /**
+     * 查询 person 对应 楼盘 的客户
+     * 如果对应的楼盘没有客户, 则返回无楼盘的, 小程序级别的客户信息
+     * 如果没有无小程序级别客户, 则返回最早的一条
+     * @param orgId
+     * @param personId
+     * @param buildingId
+     * @return
+     */
+    TaRecommendCustomer getCustomerByProjectOrOrg(@Param("orgId") Integer orgId, @Param("personId") String personId, @Param("buildingId") String buildingId);
+
     /**
      * 获取置业福问下的客户
      * @param userId
@@ -235,4 +246,5 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @return
      */
     List<TaRecommendCustomer> getConsultantCustomerList(@Param("userId") Integer userId,@Param("personId") String personId,@Param("buildingId") String buildingId,@Param("orgId") Integer orgId);
+
 }

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

@@ -24,6 +24,7 @@ public interface TsConsultantKpiMapper extends BaseMapper<TsConsultantKpi> {
 
     /**
      * 置业KPI 汇总
+     * bug #6929 要求跟时间没关系
      * @param page
      * @param orgId
      * @param buildingIds
@@ -53,6 +54,7 @@ public interface TsConsultantKpiMapper extends BaseMapper<TsConsultantKpi> {
 
     /**
      * 统计当前时间段内的, 已经固化的置业数据的所有客户
+     * bug #6929 要求跟时间没关系
      * @param orgId
      * @param buildingIds
      * @param startDate

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

@@ -44,7 +44,7 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
 
     IPage<TaRecommendCustomer> getRepCustomerList(int pageNumber, int pageSize, String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, Integer orgId, List<TaPersonBuilding> taPersonBuildingList);
 
-    IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize, String name, String tel, Integer orgId);
+    IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize, String name, String tel, String channelId, Integer orgId);
 
 
     TaRecommendCustomer getCustomerDetail(String customerId, int pageNumber, int pageSize, List<TaPersonBuilding> taPersonBuildingList, String buildingId);
@@ -57,7 +57,7 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
 
     TaRecommendCustomer newByPerson(TaPerson person);
 
-    ResponseBean consultantAssist(TaUser taUser, String personId, Integer orgId);
+    ResponseBean consultantAssist(TaUser taUser, String customerId, Integer orgId);
 
     ResponseBean batchConsultantAssist(TaUser taUser, Integer orgId);
 
@@ -111,7 +111,7 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
      * @param pageSize
      * @return
      */
-    List<AgentsRecommendCustomer> getIndependentAgentsExport(Integer orgId, Integer pageCode, Integer pageSize);
+    List<AgentsRecommendCustomer> getIndependentAgentsExport(String name, String tel, String channelId, Integer orgId, Integer pageCode, Integer pageSize);
 
     /**
      * 查询我的客户人数集合

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

@@ -21,6 +21,7 @@ import com.huiju.estateagents.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
+import org.checkerframework.checker.units.qual.C;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
@@ -72,6 +73,12 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     @Autowired
     private TaSaveMapper taSaveMapper;
 
+    @Autowired
+    private TaChannelPersonMapper taChannelPersonMapper;
+
+    @Autowired
+    private TaChannelMapper taChannelMapper;
+
     @Autowired
     private TaBuildingMapper taBuildingMapper;
 
@@ -437,6 +444,19 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         result.put("personType",taPerson.getPersonType());
         result.put("userId", taPerson.getUserId());
 
+        //经纪人所属渠道
+        QueryWrapper<TaChannelPerson> taChannelPersonQueryWrapper = new QueryWrapper<>();
+        taChannelPersonQueryWrapper.eq("person_id", taPerson.getPersonId());
+        taChannelPersonQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+        TaChannelPerson taChannelPerson = taChannelPersonMapper.selectOne(taChannelPersonQueryWrapper);
+
+        if (taChannelPerson != null){
+            QueryWrapper<TaChannel> taChannelQueryWrapper = new QueryWrapper<>();
+            taChannelQueryWrapper.eq("channel_id", taChannelPerson.getChannelId());
+            TaChannel taChannel = taChannelMapper.selectOne(taChannelQueryWrapper);
+            result.put("channelName", taChannel.getChannelName());
+        }
+
         return ResponseBean.success(result);
     }
 
@@ -748,7 +768,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         for (TaPerson taPerson:taPersonList){
             QueryWrapper<TaRecommendCustomer> taRecommendCustomerQuery= new QueryWrapper<>();
             taRecommendCustomerQuery.eq("recommend_person",taPerson.getPersonId());
-            taRecommendCustomerQuery.eq("status",1);
+//            taRecommendCustomerQuery.eq("status",1);
             taRecommendCustomerQuery.eq("org_id", orgid);
             /*推荐客户总数*/
             int recommendCount= taRecommendCustomerMapper.selectCount(taRecommendCustomerQuery);
@@ -874,14 +894,12 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         //
         LocalDateTime now = LocalDateTime.now();
 
-        // 1. 更新当前人员
+        // 更新人员手机号
         List<TaPerson> persons = getPersonsByOpenId(openid);
         if (null == persons || persons.size() != 1) {
             throw new Exception("当前人员 openid 异常");
         }
         TaPerson person = persons.get(0);
-
-        // 更新人员手机号
         person.setPhone(phone);
         person.setAuthPhoneTime(now);
         if (StringUtils.isEmpty(person.getBuildingId())) {
@@ -891,143 +909,154 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
             person.setPersonType(CommConstant.PERSON_ESTATE_CUSTOMER);
         }
         updateById(person);
-        fixCustomerPersonId(person);
 
-        // 2. 发放积分
+        // 只要授权手机号, 就是客户
+        // 或者 依据手机号反更新推荐客户中 person_id
+        // 默认场景, 普通人推荐
+        TaRecommendCustomer customer = newOrFixCustomerBy(person, promoter, buildingId);
+
+        // 发放积分
         applicationContext.publishEvent(new EventBus(person, EventBus.EventType.SignUpAgent, orgId));
 
         //授权手机给推广人加积分
         String sharePersonId = getSharePersonFrom(person);
-
         if (validateSceneId(sceneId) && !StringUtils.isEmpty(sharePersonId)){
             applicationContext.publishEvent(new EventBus(promoter != null ? promoter : sharePersonId, EventBus.EventType.SharePosterAll, orgId));
         }
 
-        // 3. 处理推广人
-        TaPerson recPerson = taPersonMapper.getById(promoter);
-        if (recPerson != null && CommConstant.STATUS_DELETE.equals(recPerson.getStatus())) {
-            recPerson = null;
-        }
-
-        TaUser taUser = null;
-        List<String> withBuildings = null;  // 推广人授权的楼盘
-        boolean isAssociated = false;       // 传入的楼盘与推广人是否有关联关系
-        boolean isConsultant = false;       // 是否置业顾问
-        if (!StringUtils.isEmpty(promoter)) {
-            taUser = taUserMapper.getUserByPerson(orgId, promoter);
-            if (null != taUser) {
-                isConsultant = taUser != null && taUser.getIsConsultant() != null && taUser.getIsConsultant();
-                List<TaPerson> userPerons = new ArrayList<>();
-                userPerons.add(recPerson);
-                taUser.setPersonIds(userPerons);
-
-                withBuildings = taUserMapper.getBuildingIdsOf(taUser.getUserId(), null);
-
-                if (null != taUser.getIsAdmin() && taUser.getIsAdmin()) {
-                    isAssociated = true;
-                } else {
-                    if (null != withBuildings && withBuildings.size() > 0 && !StringUtils.isEmpty(buildingId)) {
-                        isAssociated = withBuildings.contains(buildingId);
-                    }
-                }
-            }
-        }
-
-        // 楼盘
-        TaBuilding taBuilding = null;
-        if (!StringUtils.isEmpty(buildingId)) {
-            taBuilding = taBuildingMapper.selectById(buildingId);
-            if (taBuilding.getStatus().equals(CommConstant.STATUS_DELETE)) {
-                taBuilding = null;
-            }
-        }
-
-        // 没有置业, 也没楼盘
-        if ((recPerson == null || !isConsultant) && taBuilding == null) {
-            TaCustomerFrom customerFrom = new TaCustomerFrom();
-            customerFrom.setPersonId(person.getPersonId());
-            customerFrom.setPersonName(StringUtils.ifNull(person.getName(), person.getNickname()));
-            customerFrom.setTargetType(targetType);
-            customerFrom.setTargetId(targetId);
-            customerFrom.setTargetName(targetName);
-            customerFrom.setOrgId(orgId);
-            customerFrom.setSceneId(sceneId);
-            customerFrom.setIsOrgFirst(true);   // 授权手机号, 肯定是第一次
-            customerFrom.setIsProjectFirst(false);
-            customerFrom.setCreateDate(now);
-            if (null != recPerson) {
-                customerFrom.setSharePersonId(recPerson.getPersonId());
-                customerFrom.setSharePersonName(StringUtils.ifNull(recPerson.getName(), recPerson.getNickname()));
-            }
-
-            taCustomerFromMapper.insert(customerFrom);
-
-
-            TaRecommendCustomer customer = copyByPerosn(person, new TaRecommendCustomer());
-            customer.setVerifyStatus(CommConstant.VERIFY_READY);
-            customer.setStatus(CommConstant.CUSTOMER_REPORT);
-            customer.setEntryType(CommConstant.ENTRY_INPUT);
-            customer.setCreateDate(now);
-            customer.setReportDate(now);
-            customer.setRecommendPerson(promoter);
-            taRecommendCustomerMapper.insert(customer);
-
-            return ;
-        }
-
-        // 3. 修正客户信息
-        List<TaBuilding> withBuildingList = null;
-        if (null != withBuildings && withBuildings.size() > 0) {
-            QueryWrapper<TaBuilding> queryBuilding = new QueryWrapper<>();
-            queryBuilding.in("building_id", withBuildings);
-            withBuildingList = taBuildingMapper.selectList(queryBuilding);
-        }
-        List<TaRecommendCustomer> customers = mergeCustomerByPhone(person, taUser, taBuilding, withBuildingList, isAssociated, now);
-        if (null == customers || customers.size() == 0) {
-            throw new Exception("生成客户信息异常, 请联系技术人员");
-        }
-
-        // 4. 客户来源, 注意不是用户来源
+        // 客户来源
         TaCustomerFrom customerFrom = new TaCustomerFrom();
         customerFrom.setPersonId(person.getPersonId());
         customerFrom.setPersonName(StringUtils.ifNull(person.getName(), person.getNickname()));
+        customerFrom.setCustomerId(customer.getCustomerId());
         customerFrom.setTargetType(targetType);
         customerFrom.setTargetId(targetId);
         customerFrom.setTargetName(targetName);
         customerFrom.setOrgId(orgId);
         customerFrom.setSceneId(sceneId);
         customerFrom.setIsOrgFirst(true);   // 授权手机号, 肯定是第一次
+        customerFrom.setIsProjectFirst(false);
         customerFrom.setCreateDate(now);
 
-        if (null != taBuilding) {
+        // 推广人
+        TaPerson recPerson = StringUtils.isEmpty(promoter) ? null : taPersonMapper.getById(promoter);
+        // 是否置业顾问
+        boolean isConsultant = null != recPerson && CommConstant.PERSON_REALTY_CONSULTANT.equals(recPerson.getPersonType());
+        // 推广人授权的楼盘
+        List<String> withBuildings = isConsultant ? taUserMapper.getBuildingIdsOf(recPerson.getUserId(), null) : null;
+        // 推荐楼盘
+        TaBuilding recBuilding = StringUtils.isEmpty(buildingId) ? null : taBuildingMapper.selectById(buildingId);
+
+        // 传入的楼盘与推广人是否有关联关系
+        boolean isAssociated = null != withBuildings && withBuildings.contains(buildingId);
+
+        // 如果有推荐楼盘
+        if (null != recBuilding) {
             customerFrom.setBuildingId(buildingId);
-            customerFrom.setBuildingName(taBuilding.getBuildingName());
-            QueryWrapper<TaCustomerFrom> queryWrapper = new QueryWrapper<TaCustomerFrom>();
-            queryWrapper.eq("person_id", person.getPersonId());
-            queryWrapper.eq("org_id", orgId);
-            queryWrapper.eq("building_id", buildingId);
-            if (taCustomerFromMapper.selectList(queryWrapper).size() < 1){
-                customerFrom.setIsProjectFirst(true);
-            }
+            customerFrom.setBuildingName(recBuilding.getBuildingName());
+            customerFrom.setIsProjectFirst(true);
 
-            for (TaRecommendCustomer cust : customers) {
-                if (buildingId.equals(cust.getBuildingId())) {
-                    customerFrom.setCustomerId(cust.getCustomerId());
+            // 客户没楼盘 - 小程序级别公客, 则变成项目级别公客
+            if (StringUtils.isEmpty(customer.getBuildingId())) {
+                customer.setBuildingId(buildingId);
+
+                // 如果项目跟推广人是关联关系, 那么就是私客
+                if (isAssociated) {
+                    customer.setRealtyConsultant(recPerson.getUserId().toString());
                 }
+
+                taRecommendCustomerMapper.updateById(customer);
             }
-        } else if (isConsultant && null != withBuildingList && withBuildingList.size() > 0) {
-            // 没有楼盘则使用置业授权的楼盘
-            customerFrom.setBuildingId(withBuildingList.get(0).getBuildingId());
-            customerFrom.setBuildingName(withBuildingList.get(0).getBuildingName());
         }
+
+        // 推荐人不为空
         if (null != recPerson) {
             customerFrom.setSharePersonId(recPerson.getPersonId());
-            customerFrom.setSharePersonName(StringUtils.ifNull(recPerson.getName(), recPerson.getNickname()));
+            customerFrom.setSharePersonName(recPerson.getNickname());
+
+            // 如果没有关联关系
+            // 置业顾问推荐其他楼盘, 那么需要生成该置业的私客
+            if (isConsultant && !isAssociated) {
+                String consultantBuildingId = null != withBuildings ? withBuildings.get(0) : null;
+                if (!StringUtils.isEmpty(consultantBuildingId)) {
+                    TaBuilding onsultantBuilding = taBuildingMapper.selectById(consultantBuildingId);
+                    TaRecommendCustomer newCustomer = copyByPerosn(person, new TaRecommendCustomer());
+                    newCustomer.setBuildingId(onsultantBuilding.getBuildingId());
+                    newCustomer.setRealtyConsultant(recPerson.getUserId().toString());
+                    newCustomer.setRecommendPerson(recPerson.getPersonId());
+                    newCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
+                    newCustomer.setStatus(CommConstant.CUSTOMER_REPORT);
+                    newCustomer.setEntryType(CommConstant.ENTRY_INPUT);
+                    newCustomer.setCreateDate(now);
+                    newCustomer.setReportDate(now);
+                    taRecommendCustomerMapper.insert(newCustomer);
+
+                    TaCustomerFrom customerFrom2 = new TaCustomerFrom();
+                    customerFrom2.setPersonId(person.getPersonId());
+                    customerFrom2.setPersonName(StringUtils.ifNull(person.getName(), person.getNickname()));
+                    customerFrom2.setCustomerId(newCustomer.getCustomerId());
+                    customerFrom2.setBuildingId(onsultantBuilding.getBuildingId());
+                    customerFrom2.setBuildingName(onsultantBuilding.getBuildingName());
+                    customerFrom2.setSharePersonId(recPerson.getPersonId());
+                    customerFrom2.setSharePersonName(recPerson.getNickname());
+                    customerFrom2.setTargetType(targetType);
+                    customerFrom2.setTargetId(targetId);
+                    customerFrom2.setTargetName(targetName);
+                    customerFrom2.setOrgId(orgId);
+                    customerFrom2.setSceneId(sceneId);
+                    customerFrom2.setIsOrgFirst(true);
+                    customerFrom2.setIsProjectFirst(true);
+                    customerFrom2.setCreateDate(now);
+                    taCustomerFromMapper.insert(customerFrom2);
+                }
+            }
         }
 
         taCustomerFromMapper.insert(customerFrom);
     }
 
+    private TaRecommendCustomer newOrFixCustomerBy(TaPerson person, String promoter, String buildingId) {
+        QueryWrapper<TaRecommendCustomer> query = new QueryWrapper<>();
+        query.eq("org_id", person.getOrgId());
+        query.eq("phone", person.getPhone());
+        query.orderByAsc("create_date");
+        List<TaRecommendCustomer> customers = taRecommendCustomerMapper.selectList(query);
+
+        TaRecommendCustomer customer = null;
+        if (null != customers && customers.size() > 0) {
+            for (TaRecommendCustomer cust: customers) {
+                if (null == customer && StringUtils.isEmpty(cust.getBuildingId())) {
+                    customer = cust;
+                }
+
+                if (!StringUtils.isEmpty(buildingId) && buildingId.equals(cust.getBuildingId())) {
+                    customer = cust;
+                }
+
+                // 先更新之前的数据, 有一种可能的情况, 客户是推荐的，之前未进入过小程序
+                // 后面所有的查询就可以不需要 phone , 改用 person_id 了
+                if (StringUtils.isEmpty(cust.getPersonId())) {
+                    cust = copyByPerosn(person, cust);
+                    taRecommendCustomerMapper.updateById(cust);
+                }
+            }
+        }
+
+        if (null == customer) {
+            LocalDateTime now = LocalDateTime.now();
+            customer = copyByPerosn(person, new TaRecommendCustomer());
+            customer.setVerifyStatus(CommConstant.VERIFY_AGREE);
+            customer.setStatus(CommConstant.CUSTOMER_REPORT);
+            customer.setEntryType(StringUtils.isEmpty(promoter) ? CommConstant.ENTRY_VOLUNTEER : CommConstant.ENTRY_INPUT);
+            customer.setCreateDate(now);
+            customer.setReportDate(now);
+            customer.setRecommendPerson(promoter);
+            taRecommendCustomerMapper.insert(customer);
+        }
+
+        return customer;
+    }
+
     private String getSharePersonFrom(TaPerson person){
         QueryWrapper<TaSharePersonFrom> taSharePersonFromQueryWrapper = new QueryWrapper<>();
         taSharePersonFromQueryWrapper.eq("person_id", person.getPersonId());
@@ -1073,7 +1102,6 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         }
     }
 
-
     /**
      * 此处逻辑按照复杂流程处理
      * 除了新增客户外，还有修正原有数据的目的

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

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -25,6 +26,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.statistic.entity.TaCustomerFollowUpRecord;
 import com.huiju.estateagents.statistic.mapper.TaCustomerFollowUpRecordMapper;
 import org.apache.commons.collections.CollectionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -44,6 +47,8 @@ import java.util.Map;
 @Service
 public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCustomerMapper, TaRecommendCustomer> implements ITaRecommendCustomerService {
 
+    private Logger logger = LoggerFactory.getLogger(TaRecommendCustomerServiceImpl.class);
+
     @Autowired
     TaPersonMapper taPersonMapper;
 
@@ -160,7 +165,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
      */
     @Override
     public List<TaRecommendCustomer> getConsultantCustomerList(Integer userId, String personId, String buildingId, Integer orgId, List<TaPersonBuilding> taPersonBuildingListByUserId) {
-        return taRecommendCustomerMapper.getConsultantCustomerList(userId,personId,buildingId,orgId);
+        return taRecommendCustomerMapper.getConsultantCustomerList(userId, personId, buildingId, orgId);
     }
 
     @Override
@@ -503,7 +508,18 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
                 }
             }
-            return ResponseBean.error("您在当前项目的置业顾问是:" + conName, ResponseBean.ERROR_ILLEGAL_PARAMS);
+            TaRecommendCustomer oldRecomendCustomer = result.get(0);
+            if (!StringUtils.isEmpty(oldRecomendCustomer.getRealtyConsultant())) {
+                return ResponseBean.error("您在当前项目的置业顾问是:" + conName, ResponseBean.ERROR_ILLEGAL_PARAMS);
+            } else {
+                oldRecomendCustomer.setRealtyConsultant(consultantUser.getUserId().toString());
+                taRecommendCustomerMapper.updateById(oldRecomendCustomer);
+                if (null != customerFrom) {
+                    customerFrom.setCustomerId(oldRecomendCustomer.getCustomerId());
+                    taCustomerFromMapper.updateById(customerFrom);
+                }
+                return ResponseBean.success(oldRecomendCustomer);
+            }
         }
 
         int row = taRecommendCustomerMapper.insert(taRecommendCustomer);
@@ -574,9 +590,9 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
     @Override
-    public IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize, String name, String tel, Integer orgId) {
+    public IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize, String name, String tel, String channelId, Integer orgId) {
         IPage<TaPerson> page = new Page<>(pageNumber, pageSize);
-        return taRecommendCustomerMapper.getIndependentAgents(page, name, tel, orgId);
+        return taRecommendCustomerMapper.getIndependentAgents(page, name, tel, channelId, orgId);
     }
 
     @Override
@@ -824,30 +840,83 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
     @Override
     public ResponseBean batchConsultantAssist(TaUser taUser, Integer orgId) {
-        if (CollectionUtils.isNotEmpty(taUser.getPersonIds())) {
-            for (TaPerson taPerson : taUser.getPersonIds()) {
-                consultantAssist(taUser, taPerson.getPersonId(), orgId);
+        Integer failNum = 0;
+        if (CollectionUtils.isNotEmpty(taUser.getCustomerIds())) {
+            for (TaRecommendCustomer taRecommendCustomer : taUser.getCustomerIds()) {
+                ResponseBean responseBean = consultantAssist(taUser, taRecommendCustomer.getCustomerId(), orgId);
+                if (responseBean.getCode() != 1000) {
+                    failNum++;
+                }
             }
         }
-        return ResponseBean.success("操作成功");
+        JSONObject obj = new JSONObject();
+        obj.put("failNum", failNum);
+        obj.put("totalNum", taUser.getCustomerIds().size());
+        return ResponseBean.success(obj);
     }
 
     @Override
-    public ResponseBean consultantAssist(TaUser taUser, String personId, Integer orgId) {
-        TaPerson taPerson = taPersonMapper.getById(personId);
+    public ResponseBean consultantAssist(TaUser taUser, String customerId, Integer orgId) {
+        logger.info("公客分配置业顾问 接收参数，taUser={}，customerId={}，orgId={}",
+                JSONObject.toJSONString(taUser), customerId, orgId);
 
-        TaPerson recommendPerson = taPersonMapper.selectById(personId);
+        ResponseBean responseBean = new ResponseBean();
 
+        // 1.校验置业顾问
         QueryWrapper<TaUser> queryWrapper = new QueryWrapper();
         queryWrapper.eq("user_id", taUser.getUserId());
         TaUser userInfo = taUserMapper.selectOne(queryWrapper);
 
         QueryWrapper<TaPersonBuilding> taPersonBuildingQueryWrapper = new QueryWrapper();
         taPersonBuildingQueryWrapper.eq("user_id", taUser.getUserId());
+        taPersonBuildingQueryWrapper.eq(!StringUtils.isEmpty(taUser.getBuildingId()), "building_id", taUser.getBuildingId());
         TaPersonBuilding taPersonBuilding = taPersonBuildingMapper.selectOne(taPersonBuildingQueryWrapper);
 
-        if (null == userInfo || userInfo.getStatus() != CommConstant.STATUS_NORMAL) {
-            return ResponseBean.error("置业顾问不存在或已被注销", ResponseBean.ERROR_UNAVAILABLE);
+        if (null == userInfo || CommConstant.STATUS_NORMAL != userInfo.getStatus()) {
+            responseBean.addError("置业顾问不存在或已被注销");
+            return responseBean;
+        }
+
+        // 2.根据customerId获取personId
+        QueryWrapper<TaRecommendCustomer> customerQueryWrapper = new QueryWrapper<>();
+        customerQueryWrapper.eq("customer_id", customerId);
+        customerQueryWrapper.isNull("realty_consultant");
+        TaRecommendCustomer customerInfo = taRecommendCustomerMapper.selectOne(customerQueryWrapper);
+        if (customerInfo == null) {
+            logger.info("公客分配置业顾问 customerInfo为空");
+            responseBean.addError("分配客户失败");
+            return responseBean;
+        }
+
+        // 3.判断是否有buildingId,有则直接更新数据
+        if (!StringUtils.isEmpty(customerInfo.getBuildingId())) {
+            logger.info("公客分配置业顾问 customer={}", JSONObject.toJSONString(customerInfo));
+            customerInfo.setRealtyConsultant(userInfo.getUserId().toString());
+            responseBean.addSuccess(taRecommendCustomerMapper.updateById(customerInfo));
+            return responseBean;
+        }
+
+        // 4.校验公客是否已经是分配项目下的私客
+        QueryWrapper<TaRecommendCustomer> customerQueryWrapper2 = new QueryWrapper<>();
+        customerQueryWrapper2.eq("org_id", orgId);
+        customerQueryWrapper2.eq("person_id", customerInfo.getPersonId());
+        customerQueryWrapper2.eq("building_id", taPersonBuilding.getBuildingId());
+        customerQueryWrapper2.eq("status", CommConstant.CUSTOMER_REPORT);
+        customerQueryWrapper2.eq("verify_status", CommConstant.VERIFY_AGREE);
+        customerQueryWrapper2.isNotNull("realty_consultant");
+        TaRecommendCustomer customerInfo2 = taRecommendCustomerMapper.selectOne(customerQueryWrapper2);
+        if (customerInfo2 != null) {
+            logger.info("客户已在当前项目私客中，可以继续分配给其他项目");
+            responseBean.addError("客户已在当前项目私客中，可以继续分配给其他项目");
+            return responseBean;
+        }
+
+        // 5.无buildingId，新增一条私客数据
+        TaPerson taPerson = taPersonMapper.getById(customerInfo.getPersonId());
+        if (taPerson == null) {
+            logger.info("公客分配置业顾问 taPerson为空");
+            responseBean.addError("分配客户失败");
+            return responseBean;
         }
 
         TaRecommendCustomer taRecommendCustomer = new TaRecommendCustomer();
@@ -867,16 +936,16 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         taRecommendCustomer.setEntryType(CommConstant.ENTRY_VERIFY);
         taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
         taRecommendCustomer.setStatus(CommConstant.CUSTOMER_REPORT);
-        taRecommendCustomer.setPersonId(personId);
-        taRecommendCustomer.setRecommendPerson(recommendPerson == null ? "" : recommendPerson.getRecommendPerson());
+        taRecommendCustomer.setPersonId(taPerson.getPersonId());
+        taRecommendCustomer.setRecommendPerson(taPerson.getRecommendPerson());
 
         int row = taRecommendCustomerMapper.insert(taRecommendCustomer);
         if (row < 1) {
-            return ResponseBean.error("分配客户失败", ResponseBean.ERROR_UNAVAILABLE);
+            responseBean.addError("分配客户失败");
+            return responseBean;
         }
-
-        return ResponseBean.success(taRecommendCustomer);
-
+        responseBean.addSuccess(taRecommendCustomer);
+        return responseBean;
     }
 
     private List<TaRecommendCustomer> getCustomerByPhone(String phone, Integer orgId) {
@@ -931,8 +1000,8 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
     @Override
-    public List<AgentsRecommendCustomer> getIndependentAgentsExport(Integer orgId, Integer pageCode, Integer pageSize) {
-        return taRecommendCustomerMapper.getIndependentAgentsExport(orgId, pageCode, pageSize);
+    public List<AgentsRecommendCustomer> getIndependentAgentsExport(String name, String tel, String channelId, Integer orgId, Integer pageCode, Integer pageSize) {
+        return taRecommendCustomerMapper.getIndependentAgentsExport(name, tel, channelId, orgId, pageCode, pageSize);
     }
 
     /**

src/main/resources/mapper/ActivityManageMapper.xml

@@ -49,7 +49,7 @@
         ) as visit_num,
 
         -- 分享新增用户
-        (select count(*) from ta_share_person_from f
+        (select count(DISTINCT f.person_id) from ta_share_person_from f
         where	f.org_id = a.org_id
         <choose>
             <when test=" type == 'live'">
@@ -65,7 +65,7 @@
         ) as new_persons,
 
         -- 分享新增客户
-        (select count(*) from ta_share_person_from g
+        (select count(DISTINCT g.person_id) from ta_share_person_from g
         inner join ta_person h on h.person_id = g.person_id
         where	g.org_id = a.org_id
         <choose>
@@ -80,7 +80,8 @@
         AND g.`status` > 0
         AND g.is_first_time = 1
         AND h.phone is not null
-        ) as new_customers
+        ) as new_customers,
+        a.activityName
 
         from (
             <if test=" type == 'activity' ">
@@ -90,7 +91,8 @@
                     s.building_name,
                     t.dynamic_id AS target_id,
                     t.title AS target_name,
-                    'activity' AS target_type
+                    'activity' AS target_type,
+                    t.title as activityName
                 FROM
                     ta_building_dynamic t
                 LEFT JOIN ta_building s ON s.building_id = t.building_id
@@ -106,7 +108,8 @@
                     s.building_name,
                     t.drainage_id AS target_id,
                     t.`name` AS target_name,
-                    'h5' AS target_type
+                    'h5' AS target_type,
+                    t.name as activityName
                 FROM
                   ta_drainage t
                 LEFT JOIN ta_building s ON s.building_id = t.building_id
@@ -122,7 +125,8 @@
                     s.building_name,
                     t.help_activity_id AS target_id,
                     t.title AS target_name,
-                    'help' AS target_type
+                    'help' AS target_type,
+                    t.title as activityName
                 FROM
                     ta_help_activity t
                 LEFT JOIN ta_building s ON s.building_id = t.building_id
@@ -138,7 +142,8 @@
                     s.building_name,
                     t.group_activity_id AS target_id,
                     t.activity_name AS target_name,
-                    'group' AS target_type
+                    'group' AS target_type,
+                    t.activity_name as activityName
                 FROM
                     ta_share_activity t
                 LEFT JOIN ta_building s ON s.building_id = t.building_id
@@ -154,7 +159,8 @@
                     s.building_name,
                     t.live_activity_id AS target_id,
                     t.live_activity_title AS target_name,
-                    'live' AS target_type
+                    'live' AS target_type,
+                    t.live_activity_title as activityName
                 FROM
                     ta_live_activity t
                 LEFT JOIN ta_building s ON s.building_id = t.building_id

src/main/resources/mapper/TaChannelMapper.xml

@@ -31,14 +31,13 @@
     <select id="pageTaChannel" resultType="com.huiju.estateagents.entity.TaChannel">
         SELECT
         c.*,
-        COUNT(cp.person_id) AS brokerCount,
-        COUNT(rc.person_id) AS recommendCount,
+        count(tp.person_id) AS brokerCount,
         (SELECT COUNT(p.recommend_agent ) from ta_person p WHERE cp.person_id = p.recommend_agent) AS inviteCount,
         cp.person_id
         FROM
         ta_channel c
         LEFT JOIN ta_channel_person cp ON c.channel_id = cp.channel_id
-        LEFT JOIN ta_recommend_customer rc ON cp.person_id = rc.person_id AND rc.`status` = 1
+        LEFT JOIN ta_person tp ON cp.person_id = tp.person_id 	AND tp.person_type = 'estate agent' 	AND cp.STATUS = 1
         <where>
             <if test="channelId != null and channelId != ''">
                 c.channel_id = #{channelId}
@@ -47,4 +46,23 @@
         </where>
         GROUP BY c.channel_id
     </select>
+
+    <select id="recommendCount" resultType="com.huiju.estateagents.entity.TaChannel">
+        SELECT
+            c.channel_id,
+            COUNT( rc.recommend_person ) AS recommendCount
+        FROM
+        ta_channel c
+        LEFT JOIN ta_channel_person cp ON c.channel_id = cp.channel_id and cp.`status` = 1
+        LEFT JOIN ta_person t on cp.person_id = t.person_id and t.person_type = 'estate agent'
+        LEFT JOIN ta_recommend_customer rc ON t.person_id = rc.recommend_person AND rc.verify_status = 1
+        <where>
+            <if test="channelId != null and channelId != ''">
+                c.channel_id = #{channelId}
+            </if>
+            and c.org_id = #{orgId}
+        </where>
+        GROUP BY c.channel_id
+    </select>
+
 </mapper>

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -1,446 +1,446 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.huiju.estateagents.mapper.TaPersonVisitRecordMapper">
-
-    <sql id="columnSql">
-        <trim suffixOverrides=",">
-            t.record_id,
-            t.person_id,
-            c.person_type,
-            t.visit_time,
-            t.leave_time,
-            t.visit_duration,
-            t.event,
-            t.data,
-            t.activity,
-            t.org_id,
-            t.building_id,
-            t.event_type,
-            t.target_id,
-            t.consultant_id,
-            t.share_person_id,
-        </trim>
-    </sql>
-
-    <select id="visitRecordByPersonId" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
-        select
-            t.* ,
-            b.parent_type_id from ta_person_visit_record t
-        left join td_biz_event_type b on t.event_type = b.type_id
-        where t.person_id = #{personId}
-        <if test="personBuildingList != null and personBuildingList.size > 0">
-            AND (b.parent_type_id = 'public' or t.building_id in
-            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
-                #{personBuilding.buildingId}
-            </foreach>
-            )
-        </if>
-        <if test="buildingId != null and buildingId != ''">
-            AND (b.parent_type_id = 'public' or t.building_id = #{buildingId} )
-        </if>
-        order by t.visit_time desc
-    </select>
-
-    <select id="selectAll" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
-        SELECT
-            tpvr.record_id as recordId,
-            tpvr.person_id as personId,
-            tpvr.person_type as personType,
-            tpvr.building_id as buildingId,
-            tpvr.activity as activity,
-            tpvr.event as event,
-            tpvr.event_type as eventType,
-            tpvr.visit_duration as visitDuration,
-            (SELECT MIN(t.visit_time) FROM ta_person_visit_record t WHERE t.person_id = tpvr.person_id and t.event = tpvr.event and t.org_id = #{orgId} ) as visitTime,
-            (SELECT MAX(t.leave_time) FROM ta_person_visit_record t WHERE t.person_id = tpvr.person_id and t.event = tpvr.event and t.org_id = #{orgId} ) as leaveTime,
-            ifnull(tp.name, tp.nickname) as userName,
-            tbe.event_name as eventName,
-            COUNT(1) as accessCount
-        FROM
-            ta_person_visit_record tpvr
-            LEFT JOIN ta_person tp ON tpvr.person_id = tp.person_id
-            LEFT JOIN td_biz_event tbe on tpvr.event = tbe.event_code
-            <trim prefix="where" prefixOverrides="and | or">
-                tpvr.org_id = #{orgId}
-                and tp.org_id = #{orgId}
-                <if test="startDate != null and endDate != null">
-                    and tpvr.visit_time between #{startDate} and #{endDate}
-                </if>
-                <if test="buildingId != null and buildingId != ''">
-                    and tpvr.building_id = #{buildingId}
-                </if>
-                <if test="eventType != null and eventType != ''">
-                    and tpvr.event_type = #{eventType}
-                </if>
-                <if test="event != null and event != ''">
-                    and tpvr.event = #{event}
-                </if>
-                <if test="activity != null and activity != ''">
-                    and tpvr.activity = #{activity}
-                </if>
-            </trim>
-
-        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>
-
-    <select id="getDurationByPersonId" resultType="java.lang.Integer">
-        select SUM(visit_duration) from ta_person_visit_record where person_id = #{personId}
-    </select>
-
-    <select id="getFirstVisitTimeByPersonId" resultType="java.time.LocalDateTime">
-        select visit_time from ta_person_visit_record where person_id = #{personId} order by visit_time asc limit 1
-    </select>
-    <select id="getWxVisitRecordList" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
-        SELECT
-            t.* ,
-	        p.`name` as user_name,
-	        p.`nickname` as nickname,
-	        p.avatarurl,
-	        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
-            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
-            t.person_id
-        ORDER BY
-	        t.visit_time DESC
-    </select>
-
-    <select id="getWxActivityVisitRecordList" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
-        SELECT
-            t.share_from_id, t.share_person as consultant_id, t.share_person_type, t.person_id, t.target_type, t.target_id, t.create_date as visit_time, t.org_id ,t.building_id, t.status, t.is_first_time,
-	        p.`name` as user_name,
-	        p.`nickname` as nickname,
-	        p.avatarurl
-        FROM
-            ( SELECT * FROM ta_share_person_from WHERE org_id = #{orgId} and target_id = #{targetId} AND (share_person = #{userId} or share_person = #{personId}) and target_type = #{eventType} ORDER BY create_date DESC LIMIT 999) t
-            left JOIN ta_person p on t.person_id = p.person_id
-            where t.person_id != #{personId}
-        GROUP BY
-            t.person_id
-        ORDER BY
-	        t.create_date DESC
-    </select>
-
-
-    <select id="getWxVisitRecordActivityList" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
-            SELECT
-                t.*,
-                d.NAME AS activity_name,
-                d.create_date
-            FROM
-                ( SELECT * FROM ta_person_visit_record WHERE event_type = #{eventType} AND consultant_id = #{userId} AND person_id = #{personId} ORDER BY visit_time DESC ) t
-                LEFT JOIN ta_drainage d ON t.target_id = d.drainage_id
-            GROUP BY
-                t.target_id
-            ORDER BY
-	            t.visit_time DESC
-    </select>
-
-    <select id="getDrainageVisitRecord" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
-        select * from (
-            select
-            t.share_person as share_person_id,
-            t.person_id,
-            c.person_type,
-            t.create_date as visit_time,
-            t.target_type as event_type,
-            t.target_id as target_id,
-            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_share_person_from t
-            left join ta_drainage b on t.target_id = b.drainage_id
-            left join ta_building d on t.target_id = d.building_id
-            left join ta_news tn on t.target_id = tn.news_id
-            left join ta_help_activity tha on t.target_id = tha.help_activity_id
-            left join ta_share_activity tsa on t.target_id = tsa.group_activity_id
-            left join ta_building_dynamic tbd on t.target_id = tbd.dynamic_id
-            left join ta_person c on t.org_id = c.org_id and (t.share_person = c.person_id or t.share_person = c.user_id)
-            where t.org_id = #{orgId}
-            and t.target_type in ('h5_share','group_share','help_share','news_share','dynamic_share','building_share')
-            <if test="eventType !=null and eventType != ''">
-                and t.target_type = #{eventType}
-            </if>
-            <if test="activityName !=null and activityName != ''">
-                and (
-                (b.name like concat('%',#{activityName},'%') and t.target_type = 'h5_share')or (d.name like concat('%',#{activityName},'%') and t.target_type = 'building_share') or (tn.news_name like concat('%',#{activityName},'%') and t.target_type = 'news_share')
-                or (tha.title like concat( '%', #{activityName}, '%' ) and t.target_type = 'help_share')  or (tsa.activity_name like concat('%',#{activityName},'%') and t.target_type = 'group_share') or (tbd.title like concat('%',#{activityName},'%') and t.target_type = 'dynamic_share')
-                )
-            </if>
-            <if test="shareName !=null and shareName != ''">
-                and c.nickname like concat('%',#{shareName},'%')
-            </if>
-            <if test="shareTel !=null and shareTel != ''">
-                and c.phone = #{shareTel}
-            </if>
-            <if test="personType == 'Realty Consultant'">
-                and c.person_type = 'Realty Consultant'
-            </if>
-            <if test="personType == 'customer'">
-                and c.person_type != 'Realty Consultant'
-            </if>
-            <if test="buildingId !=null and buildingId != ''">
-                and d.building_id = #{buildingId}
-            </if>
-            <if test="personBuildingList != null and personBuildingList.size > 0">
-                AND d.building_id in
-                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
-                    #{personBuilding.buildingId}
-                </foreach>
-            </if>
-            order by t.create_date desc
-        ) t
-        group by t.person_id, t.target_id,t.event_type, t.share_person_id
-        order by t.visit_time desc
-    </select>
-
-    <select id="getConsultantShareInfoList" resultType="com.huiju.estateagents.entity.TaConsultantInfo">
-        select * From (
-            select * from (
-                select
-                t.be_share as target_id,
-                a.url as activity_img,
-                a.building_name as activity_name,
-                a.building_name,
-                a.address,
-                a.price,
-                a.building_type_id,
-                t.tagert_type as eventType,
-				t.create_date as visit_time
-                from ta_share t
-                left join (select b.url, a.building_name,a.address,a.price,a.building_id,a.building_type_id from ta_building a left join ta_building_img b on a.building_id = b.building_id where b.img_type = 'list') a on t.be_share = a.building_id
-                where t.tagert_type = 'project'
-                and t.person_id = #{personId} order by t.create_date desc limit 9999
-            ) t
-            group by t.target_id
-
-        union all
-
-        select * from (
-        select
-        t.be_share as target_id,
-        b.list_img_url as activity_img,
-        b.title as activity_name,
-        '1' as price,
-        '2' as building_name,
-        '3' as address,
-        1 as building_type_id,
-        t.tagert_type as eventType,
-		t.create_date as visit_time
-        from ta_share t
-        left join ta_building_dynamic b on t.be_share = b.dynamic_id
-        where t.tagert_type = 'activity'
-        and t.person_id = #{personId} order by t.create_date desc limit 9999
-        ) t
-        group by t.target_id
-
-        union all
-
-        select * from (
-        select
-        t.be_share as target_id,
-        c.list_img as activity_img,
-        c.title as activity_name,
-        '1' as price,
-        '2' as building_name,
-        '3' as address,
-        1 as building_type_id,
-        t.tagert_type as eventType,
-		t.create_date as visit_time
-        from ta_share t
-        left join ta_help_activity c on t.be_share = c.help_activity_id
-        where t.tagert_type = 'help'
-        and t.person_id = #{personId} order by t.create_date desc limit 9999
-        ) t
-        group by t.target_id
-
-        union all
-
-        select * from (
-        select
-        t.be_share as target_id,
-        d.list_img as activity_img,
-        d.activity_name as activity_name,
-        '1' as price,
-        '2' as building_name,
-        '3' as address,
-        1 as building_type_id,
-        t.tagert_type as eventType,
-		t.create_date as visit_time
-        from ta_share t
-        left join ta_share_activity d on t.be_share = d.group_activity_id
-        where t.tagert_type = 'group'
-        and t.person_id = #{personId} order by t.create_date desc limit 9999
-        ) t
-		group by t.target_id
-
-        union all
-
-        select * from (
-        select
-        t.be_share as target_id,
-        e.news_img as activity_img,
-        e.news_name as activity_name,
-        '1' as price,
-        '2' as building_name,
-        '3' as address,
-        1 as building_type_id,
-        t.tagert_type as eventType,
-		t.create_date as visit_time
-        from ta_share t
-        left join ta_news e on t.be_share = e.news_id
-        where t.tagert_type = 'news'
-        and t.person_id = #{personId} order by t.create_date desc limit 9999
-        ) t
-        group by t.target_id
-
-        union all
-
-        select * from (
-            select
-            t.be_share as target_id,
-            f.share_img as activity_img,
-            f.`name` as activity_name,
-            '1' as price,
-            '2' as building_name,
-            '3' as address,
-            1 as building_type_id,
-			t.tagert_type as eventType,
-			t.create_date as visit_time
-            from ta_share t
-            left join ta_drainage f on t.be_share = f.drainage_id
-            where t.tagert_type = 'h5'
-            and t.person_id = #{personId} order by t.create_date desc limit 9999
-            ) t
-            group by t.target_id
-         union all
-
-        select * from (
-            select
-            t.be_share as target_id,
-            g.aerial_view_img as activity_img,
-            g.sales_batch_name as activity_name,
-            '1' as price,
-            '2' as building_name,
-            '3' as address,
-            1 as building_type_id,
-			left(t.tagert_type,5) as eventType,
-			t.create_date as visit_time
-            from ta_share t
-            left join ta_sales_batch g on t.be_share = g.sales_batch_id
-            where t.tagert_type like CONCAT('house' , '%')
-            and t.person_id = #{personId} order by t.create_date desc limit 9999
-            ) t
-            group by t.target_id
-
-			union all
-				select * from (
-					SELECT
-						t.be_share AS target_id,
-						g.list_img AS activity_img,
-						g.live_activity_title AS activity_name,
-						'1' AS price,
-						'2' AS building_name,
-						'3' AS address,
-						1 AS building_type_id,
-						LEFT ( t.tagert_type, 4 ) AS eventType,
-						t.create_date AS visit_time
-					FROM
-						ta_share t
-						LEFT JOIN ta_live_activity g ON t.be_share = g.live_activity_id
-					WHERE
-						t.tagert_type LIKE CONCAT( 'live', '%' )
-							AND t.person_id = #{personId}
-						ORDER BY
-							t.create_date DESC
-							LIMIT 9999
-					) t
-				group by t.target_id
-        ) t
-        order by t.visit_time desc
-    </select>
-
-    <select id="countShareNumByEventType" resultType="java.lang.Integer">
-        select count(DISTINCT t.person_id)  from ta_share_person_from t
-        left join ta_person a on t.person_id = a.person_id
-        where
-        (t.share_person = #{personId}
-        <if test="userId != null and userId != ''">
-            or t.share_person = #{userId}
-        </if>
-        )
-        and t.org_id = #{orgId}
-        and t.target_type = #{eventType}
-        and t.target_id = #{targetId}
-        and t.status = 1
-        and t.person_id != #{personId}
-        group by t.target_type
-    </select>
-
-    <select id="selectData" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
-		select t.share_person_id, t.target_id,
-		if(t.target_type = 'help' and t.event_type = 'activity', 'help', if(t.target_type = 'group' and t.event_type = 'activity' , 'group', t.event_type)) as target_type,
-		a.nickname, a.avatarurl FROM
-        ta_person_visit_record t
-        LEFT JOIN ta_person a ON t.share_person_id = a.person_id
-        LEFT JOIN ta_share_person_from b ON t.target_id = b.target_id  and t.event_type = b.target_type + '_share'
-        WHERE
-        (
-            ( t.consultant_id IS NOT NULL AND t.consultant_id != '' )
-            OR ( t.share_person_id IS NOT NULL AND t.share_person_id != '' )
-        )
-        AND t.person_id != t.share_person_id
-        AND t.`event` = 'detail'
-        AND ( t.share_person_id != b.share_person OR t.consultant_id != b.share_person )
-        GROUP BY
-        t.target_id, t.event_type;
-    </select>
-
-    <select id="selectTapersonFromShare" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
-        select t.share_person_id, if (t.consultant_id != '' and t.consultant_id is not null, 'Realty Consultant', 'customer') as person_type, t.person_id, b.target_type, t.target_id,t.org_id, t.building_id  From ta_person_visit_record t
-        left join ta_person a on t.share_person_id = a.person_id
-        LEFT JOIN ta_share_person_from b ON t.target_id = b.target_id  and t.event_type = b.target_type + '_share'
-        where
-        (
-            ( t.consultant_id IS NOT NULL AND t.consultant_id != '' )
-            OR ( t.share_person_id IS NOT NULL AND t.share_person_id != '' )
-            )
-            AND t.person_id != t.share_person_id
-            AND t.`event` = 'detail'
-            AND ( t.share_person_id != b.share_person OR t.consultant_id != b.share_person )
-        GROUP BY
-            t.target_id, t.event_type;
-    </select>
-
-    <select id="selectTodayVisitCount" resultType="java.lang.Integer">
-        SELECT
-        COUNT(1) as visit_count
-        FROM
-        ta_person_visit_record tp
-        where tp.org_id = #{orgId} AND
-        tp.event  = 'index'
-        AND DATE_FORMAT(tp.visit_time,'%Y-%m-%d') = DATE_FORMAT(#{nowDate},'%Y-%m-%d')
-    </select>
-
-
-</mapper>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.mapper.TaPersonVisitRecordMapper">
+
+    <sql id="columnSql">
+        <trim suffixOverrides=",">
+            t.record_id,
+            t.person_id,
+            c.person_type,
+            t.visit_time,
+            t.leave_time,
+            t.visit_duration,
+            t.event,
+            t.data,
+            t.activity,
+            t.org_id,
+            t.building_id,
+            t.event_type,
+            t.target_id,
+            t.consultant_id,
+            t.share_person_id,
+        </trim>
+    </sql>
+
+    <select id="visitRecordByPersonId" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
+        select
+            t.* ,
+            b.parent_type_id from ta_person_visit_record t
+        left join td_biz_event_type b on t.event_type = b.type_id
+        where t.person_id = #{personId}
+        <if test="personBuildingList != null and personBuildingList.size > 0">
+            AND (b.parent_type_id = 'public' or t.building_id in
+            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                #{personBuilding.buildingId}
+            </foreach>
+            )
+        </if>
+        <if test="buildingId != null and buildingId != ''">
+            AND (b.parent_type_id = 'public' or t.building_id = #{buildingId} )
+        </if>
+        order by t.visit_time desc
+    </select>
+
+    <select id="selectAll" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
+        SELECT
+            tpvr.record_id as recordId,
+            tpvr.person_id as personId,
+            tpvr.person_type as personType,
+            tpvr.building_id as buildingId,
+            tpvr.activity as activity,
+            tpvr.event as event,
+            tpvr.event_type as eventType,
+            tpvr.visit_duration as visitDuration,
+            (SELECT MIN(t.visit_time) FROM ta_person_visit_record t WHERE t.person_id = tpvr.person_id and t.event = tpvr.event and t.org_id = #{orgId} ) as visitTime,
+            (SELECT MAX(t.leave_time) FROM ta_person_visit_record t WHERE t.person_id = tpvr.person_id and t.event = tpvr.event and t.org_id = #{orgId} ) as leaveTime,
+            ifnull(tp.name, tp.nickname) as userName,
+            tbe.event_name as eventName,
+            COUNT(1) as accessCount
+        FROM
+            ta_person_visit_record tpvr
+            LEFT JOIN ta_person tp ON tpvr.person_id = tp.person_id
+            LEFT JOIN td_biz_event tbe on tpvr.event = tbe.event_code
+            <trim prefix="where" prefixOverrides="and | or">
+                tpvr.org_id = #{orgId}
+                and tp.org_id = #{orgId}
+                <if test="startDate != null and endDate != null">
+                    and tpvr.visit_time between #{startDate} and #{endDate}
+                </if>
+                <if test="buildingId != null and buildingId != ''">
+                    and tpvr.building_id = #{buildingId}
+                </if>
+                <if test="eventType != null and eventType != ''">
+                    and tpvr.event_type = #{eventType}
+                </if>
+                <if test="event != null and event != ''">
+                    and tpvr.event = #{event}
+                </if>
+                <if test="activity != null and activity != ''">
+                    and tpvr.activity = #{activity}
+                </if>
+            </trim>
+
+        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>
+
+    <select id="getDurationByPersonId" resultType="java.lang.Integer">
+        select SUM(visit_duration) from ta_person_visit_record where person_id = #{personId}
+    </select>
+
+    <select id="getFirstVisitTimeByPersonId" resultType="java.time.LocalDateTime">
+        select visit_time from ta_person_visit_record where person_id = #{personId} order by visit_time asc limit 1
+    </select>
+    <select id="getWxVisitRecordList" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
+        SELECT
+            t.* ,
+	        p.`name` as user_name,
+	        p.`nickname` as nickname,
+	        p.avatarurl,
+	        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
+            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
+            t.person_id
+        ORDER BY
+	        t.visit_time DESC
+    </select>
+
+    <select id="getWxActivityVisitRecordList" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
+        SELECT
+            t.share_from_id, t.share_person as consultant_id, t.share_person_type, t.person_id, t.target_type, t.target_id, t.create_date as visit_time, t.org_id ,t.building_id, t.status, t.is_first_time,
+	        p.`name` as user_name,
+	        p.`nickname` as nickname,
+	        p.avatarurl
+        FROM
+            ( SELECT * FROM ta_share_person_from WHERE org_id = #{orgId} and target_id = #{targetId} AND (share_person = #{userId} or share_person = #{personId}) and target_type = #{eventType} ORDER BY create_date DESC LIMIT 999) t
+            left JOIN ta_person p on t.person_id = p.person_id
+            where t.person_id != #{personId}
+        GROUP BY
+            t.person_id
+        ORDER BY
+	        t.create_date DESC
+    </select>
+
+
+    <select id="getWxVisitRecordActivityList" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
+            SELECT
+                t.*,
+                d.NAME AS activity_name,
+                d.create_date
+            FROM
+                ( SELECT * FROM ta_person_visit_record WHERE event_type = #{eventType} AND consultant_id = #{userId} AND person_id = #{personId} ORDER BY visit_time DESC ) t
+                LEFT JOIN ta_drainage d ON t.target_id = d.drainage_id
+            GROUP BY
+                t.target_id
+            ORDER BY
+	            t.visit_time DESC
+    </select>
+
+    <select id="getDrainageVisitRecord" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
+        select * from (
+            select
+            t.share_person as share_person_id,
+            t.person_id,
+            c.person_type,
+            t.create_date as visit_time,
+            t.target_type as event_type,
+            t.target_id as target_id,
+            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_share_person_from t
+            left join ta_drainage b on t.target_id = b.drainage_id
+            left join ta_building d on t.target_id = d.building_id
+            left join ta_news tn on t.target_id = tn.news_id
+            left join ta_help_activity tha on t.target_id = tha.help_activity_id
+            left join ta_share_activity tsa on t.target_id = tsa.group_activity_id
+            left join ta_building_dynamic tbd on t.target_id = tbd.dynamic_id
+            left join ta_person c on t.org_id = c.org_id and (t.share_person = c.person_id or t.share_person = c.user_id)
+            where t.org_id = #{orgId}
+            and t.target_type in ('h5_share','group_share','help_share','news_share','dynamic_share','building_share')
+            <if test="eventType !=null and eventType != ''">
+                and t.target_type = #{eventType}
+            </if>
+            <if test="activityName !=null and activityName != ''">
+                and (
+                (b.name like concat('%',#{activityName},'%') and t.target_type = 'h5_share')or (d.name like concat('%',#{activityName},'%') and t.target_type = 'building_share') or (tn.news_name like concat('%',#{activityName},'%') and t.target_type = 'news_share')
+                or (tha.title like concat( '%', #{activityName}, '%' ) and t.target_type = 'help_share')  or (tsa.activity_name like concat('%',#{activityName},'%') and t.target_type = 'group_share') or (tbd.title like concat('%',#{activityName},'%') and t.target_type = 'dynamic_share')
+                )
+            </if>
+            <if test="shareName !=null and shareName != ''">
+                and c.nickname like concat('%',#{shareName},'%')
+            </if>
+            <if test="shareTel !=null and shareTel != ''">
+                and c.phone = #{shareTel}
+            </if>
+            <if test="personType == 'Realty Consultant'">
+                and c.person_type = 'Realty Consultant'
+            </if>
+            <if test="personType == 'customer'">
+                and c.person_type != 'Realty Consultant'
+            </if>
+            <if test="buildingId !=null and buildingId != ''">
+                and d.building_id = #{buildingId}
+            </if>
+            <if test="personBuildingList != null and personBuildingList.size > 0">
+                AND d.building_id in
+                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                    #{personBuilding.buildingId}
+                </foreach>
+            </if>
+            order by t.create_date desc
+        ) t
+        group by t.person_id, t.target_id,t.event_type, t.share_person_id
+        order by t.visit_time desc
+    </select>
+
+    <select id="getConsultantShareInfoList" resultType="com.huiju.estateagents.entity.TaConsultantInfo">
+        select * From (
+            select * from (
+                select
+                t.be_share as target_id,
+                a.url as activity_img,
+                a.building_name as activity_name,
+                a.building_name,
+                a.address,
+                a.price,
+                a.building_type_id,
+                t.tagert_type as eventType,
+				t.create_date as visit_time
+                from ta_share t
+                left join (select b.url, a.building_name,a.address,a.price,a.building_id,a.building_type_id from ta_building a left join ta_building_img b on a.building_id = b.building_id where b.img_type = 'list') a on t.be_share = a.building_id
+                where t.tagert_type = 'project'
+                and t.person_id = #{personId} order by t.create_date desc limit 9999
+            ) t
+            group by t.target_id
+
+        union all
+
+        select * from (
+        select
+        t.be_share as target_id,
+        b.list_img_url as activity_img,
+        b.title as activity_name,
+        '1' as price,
+        '2' as building_name,
+        '3' as address,
+        1 as building_type_id,
+        t.tagert_type as eventType,
+		t.create_date as visit_time
+        from ta_share t
+        left join ta_building_dynamic b on t.be_share = b.dynamic_id
+        where t.tagert_type = 'activity'
+        and t.person_id = #{personId} order by t.create_date desc limit 9999
+        ) t
+        group by t.target_id
+
+        union all
+
+        select * from (
+        select
+        t.be_share as target_id,
+        c.list_img as activity_img,
+        c.title as activity_name,
+        '1' as price,
+        '2' as building_name,
+        '3' as address,
+        1 as building_type_id,
+        t.tagert_type as eventType,
+		t.create_date as visit_time
+        from ta_share t
+        left join ta_help_activity c on t.be_share = c.help_activity_id
+        where t.tagert_type = 'help'
+        and t.person_id = #{personId} order by t.create_date desc limit 9999
+        ) t
+        group by t.target_id
+
+        union all
+
+        select * from (
+        select
+        t.be_share as target_id,
+        d.list_img as activity_img,
+        d.activity_name as activity_name,
+        '1' as price,
+        '2' as building_name,
+        '3' as address,
+        1 as building_type_id,
+        t.tagert_type as eventType,
+		t.create_date as visit_time
+        from ta_share t
+        left join ta_share_activity d on t.be_share = d.group_activity_id
+        where t.tagert_type = 'group'
+        and t.person_id = #{personId} order by t.create_date desc limit 9999
+        ) t
+		group by t.target_id
+
+        union all
+
+        select * from (
+        select
+        t.be_share as target_id,
+        e.news_img as activity_img,
+        e.news_name as activity_name,
+        '1' as price,
+        '2' as building_name,
+        '3' as address,
+        1 as building_type_id,
+        t.tagert_type as eventType,
+		t.create_date as visit_time
+        from ta_share t
+        left join ta_news e on t.be_share = e.news_id
+        where t.tagert_type = 'news'
+        and t.person_id = #{personId} order by t.create_date desc limit 9999
+        ) t
+        group by t.target_id
+
+        union all
+
+        select * from (
+            select
+            t.be_share as target_id,
+            f.share_img as activity_img,
+            f.`name` as activity_name,
+            '1' as price,
+            '2' as building_name,
+            '3' as address,
+            1 as building_type_id,
+			t.tagert_type as eventType,
+			t.create_date as visit_time
+            from ta_share t
+            left join ta_drainage f on t.be_share = f.drainage_id
+            where t.tagert_type = 'h5'
+            and t.person_id = #{personId} order by t.create_date desc limit 9999
+            ) t
+            group by t.target_id
+         union all
+
+        select * from (
+            select
+            t.be_share as target_id,
+            g.aerial_view_img as activity_img,
+            g.sales_batch_name as activity_name,
+            '1' as price,
+            '2' as building_name,
+            '3' as address,
+            1 as building_type_id,
+			left(t.tagert_type,5) as eventType,
+			t.create_date as visit_time
+            from ta_share t
+            left join ta_sales_batch g on t.be_share = g.sales_batch_id
+            where t.tagert_type like CONCAT('house' , '%')
+            and t.person_id = #{personId} order by t.create_date desc limit 9999
+            ) t
+            group by t.target_id
+
+			union all
+				select * from (
+					SELECT
+						t.be_share AS target_id,
+						g.list_img AS activity_img,
+						g.live_activity_title AS activity_name,
+						'1' AS price,
+						'2' AS building_name,
+						'3' AS address,
+						1 AS building_type_id,
+						LEFT ( t.tagert_type, 4 ) AS eventType,
+						t.create_date AS visit_time
+					FROM
+						ta_share t
+						LEFT JOIN ta_live_activity g ON t.be_share = g.live_activity_id
+					WHERE
+						t.tagert_type LIKE CONCAT( 'live', '%' )
+							AND t.person_id = #{personId}
+						ORDER BY
+							t.create_date DESC
+							LIMIT 9999
+					) t
+				group by t.target_id
+        ) t
+        order by t.visit_time desc
+    </select>
+
+    <select id="countShareNumByEventType" resultType="java.lang.Integer">
+        select count(DISTINCT t.person_id)  from ta_share_person_from t
+        left join ta_person a on t.person_id = a.person_id
+        where
+        (t.share_person = #{personId}
+        <if test="userId != null and userId != ''">
+            or t.share_person = #{userId}
+        </if>
+        )
+        and t.org_id = #{orgId}
+        and t.target_type = #{eventType}
+        and t.target_id = #{targetId}
+        and t.status = 1
+        and t.person_id != #{personId}
+        group by t.target_type
+    </select>
+
+    <select id="selectData" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
+		select t.share_person_id, t.target_id,
+		if(t.target_type = 'help' and t.event_type = 'activity', 'help', if(t.target_type = 'group' and t.event_type = 'activity' , 'group', t.event_type)) as target_type,
+		a.nickname, a.avatarurl FROM
+        ta_person_visit_record t
+        LEFT JOIN ta_person a ON t.share_person_id = a.person_id
+        LEFT JOIN ta_share_person_from b ON t.target_id = b.target_id  and t.event_type = b.target_type + '_share'
+        WHERE
+        (
+            ( t.consultant_id IS NOT NULL AND t.consultant_id != '' )
+            OR ( t.share_person_id IS NOT NULL AND t.share_person_id != '' )
+        )
+        AND t.person_id != t.share_person_id
+        AND t.`event` = 'detail'
+        AND ( t.share_person_id != b.share_person OR t.consultant_id != b.share_person )
+        GROUP BY
+        t.target_id, t.event_type;
+    </select>
+
+    <select id="selectTapersonFromShare" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
+        select t.share_person_id, if (t.consultant_id != '' and t.consultant_id is not null, 'Realty Consultant', 'customer') as person_type, t.person_id, b.target_type, t.target_id,t.org_id, t.building_id  From ta_person_visit_record t
+        left join ta_person a on t.share_person_id = a.person_id
+        LEFT JOIN ta_share_person_from b ON t.target_id = b.target_id  and t.event_type = b.target_type + '_share'
+        where
+        (
+            ( t.consultant_id IS NOT NULL AND t.consultant_id != '' )
+            OR ( t.share_person_id IS NOT NULL AND t.share_person_id != '' )
+            )
+            AND t.person_id != t.share_person_id
+            AND t.`event` = 'detail'
+            AND ( t.share_person_id != b.share_person OR t.consultant_id != b.share_person )
+        GROUP BY
+            t.target_id, t.event_type;
+    </select>
+
+    <select id="selectTodayVisitCount" resultType="java.lang.Integer">
+        SELECT
+        COUNT(1) as visit_count
+        FROM
+        ta_person_visit_record tp
+        where tp.org_id = #{orgId} AND
+        tp.event  = 'start'
+        AND DATE_FORMAT(tp.visit_time,'%Y-%m-%d') = DATE_FORMAT(#{nowDate},'%Y-%m-%d')
+    </select>
+
+
+</mapper>

src/main/resources/mapper/TaUserMapper.xml

@@ -1,158 +1,158 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.huiju.estateagents.center.taUser.mapper.TaUserMapper">
-
-    <select id="getPageList" resultType="map">
-        SELECT
-            t.user_id AS userId,
-            t.org_id AS orgId,
-            t.user_name AS userName,
-            t.login_name AS loginName,
-            t.phone,
-            t.avatar,
-            t.create_date AS createDate,
-            t.status,
-            o.NAME AS orgName,
-            o.address,
-            o.logo,
-            o.remark,
-            m.miniapp_id AS miniappId,
-            m.secret,
-            m.token,
-            m.NAME AS miniappName,
-            m.qr_code AS qrCode,
-            t.exp_date as expire_date,
-            m.org_id
-        FROM
-            ta_user t
-            LEFT JOIN ta_org o ON t.org_id = o.org_id
-            LEFT JOIN ta_miniapp m ON o.org_id = m.org_id
-            left join ta_channel_app_relation n on o.org_id = n.org_id
-            left join ta_channel_proxy z on z.channel_id = n.channel_id
-        WHERE
-            t.is_admin =1
-            <if test="channelId != null and channelId != ''">
-                and n.channel_id = #{channelId}
-            </if>
-            <if test="miniAppName != null and miniAppName != ''">
-                and m.name like CONCAT('%', #{miniAppName}, '%')
-            </if>
-    </select>
-
-    <select id="getTagsList" resultType="com.huiju.estateagents.center.taUser.entity.TaTags">
-        SELECT
-            t.*
-        FROM
-            ta_tag_user u
-            LEFT JOIN ta_tags t ON u.tag_id = t.tag_id
-            AND t.org_id = #{orgId}
-        WHERE
-            u.user_id = #{userId}
-    </select>
-
-    <select id="getUserList" resultType="com.huiju.estateagents.center.taUser.entity.TaUser">
-    SELECT
-        *
-    FROM
-        ta_user
-    WHERE
-        org_id = #{orgId}
-        and phone = #{phone}
-    </select>
-    <select id="seleUserList" resultType="com.huiju.estateagents.center.taUser.entity.TaUser">
-        SELECT
-            t.*,
-            b.building_id,
-            d.person_id as consultant_person_id,
-            if(d.person_id,1,0) as mini_status
-        FROM
-            ta_user t
-            LEFT JOIN ta_person_building b ON t.user_id = b.user_id
-            LEFT JOIN ta_person d on t.user_id = d.user_id
-        WHERE
-            t.org_id = #{taUser.orgId} AND (t.is_admin != 1 or t.is_admin is null)
-            <if test="taUser.userName != null and taUser.userName != ''">
-                and t.user_name like CONCAT('%', #{taUser.userName}, '%')
-            </if>
-            <if test="taUser.phone != null and taUser.phone != ''">
-                and t.phone like CONCAT('%', #{taUser.phone}, '%')
-            </if>
-            <if test="taUser.status != null and taUser.status != ''">
-                and t.status = #{taUser.status}
-            </if>
-            <if test="taUser.isConsultant == 0">
-                and t.is_consultant = #{taUser.isConsultant}
-            </if>
-            <if test="taUser.miniStatus == 0">
-                and d.person_id is null
-            </if>
-            <if test="taUser.miniStatus != null and taUser.miniStatus != '' and taUser.miniStatus == 1">
-                and d.person_id is not null
-            </if>
-            <if test="taUser.buildingId != null and taUser.buildingId != ''">
-                and b.building_id = #{taUser.buildingId}
-            </if>
-            <if test="personBuildingList != null and personBuildingList.size > 0">
-                AND b.building_id in
-                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
-                    #{personBuilding.buildingId}
-                </foreach>
-            </if>
-            GROUP BY user_id
-            order by t.weight desc, create_date desc
-    </select>
-
-    <select id="validateWeight" resultType="integer">
-      select count(*) from ta_user t
-      LEFT JOIN ta_person_building a on t.user_id = a.user_id
-      where 1=1
-      <if test="weight != null and weight != ''">
-          and t.weight = #{weight}
-      </if>
-      <if test="buildingIds != null and buildingIds.size() > 0 ">
-          and a.building_id in
-          <foreach collection="buildingIds" item="item" index="index" open="(" close=")" separator=",">
-              #{item}
-          </foreach>
-      </if>
-      <if test="buildingId != null and buildingId != '' ">
-          and a.building_id = #{buildingId}
-      </if>
-      <if test="userId != null and userId != ''">
-          and t.user_id != #{userId}
-      </if>
-    </select>
-
-    <select id="getAdminByAppID" resultType="com.huiju.estateagents.center.taUser.entity.TaUser">
-        SELECT
-        m.*
-        FROM
-        ta_miniapp t
-        JOIN ta_user m USING (org_id)
-        WHERE
-        t.miniapp_id = #{appid}
-        AND m.is_admin = 1
-    </select>
-
-    <select id="getBuildingIdsOf" resultType="java.lang.String">
-        select building_id from ta_person_building
-        where user_id = #{userId}
-        <if test="buildingId != null and buildingId != ''">
-            and building_id = #{buildingId}
-        </if>
-    </select>
-
-    <select id="getUserByPerson" resultType="com.huiju.estateagents.center.taUser.entity.TaUser">
-        SELECT
-            t.*
-        FROM
-            ta_user t
-        INNER JOIN ta_person s ON s.org_id = #{orgId} AND s.user_id = t.user_id
-        WHERE
-            t.org_id = #{orgId}
-        AND s.person_id = #{personId}
-        AND t.status &gt; -1
-        Limit 1
-    </select>
-
-</mapper>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.center.taUser.mapper.TaUserMapper">
+
+    <select id="getPageList" resultType="map">
+        SELECT
+            t.user_id AS userId,
+            t.org_id AS orgId,
+            t.user_name AS userName,
+            t.login_name AS loginName,
+            t.phone,
+            t.avatar,
+            t.create_date AS createDate,
+            t.status,
+            o.NAME AS orgName,
+            o.address,
+            o.logo,
+            o.remark,
+            m.miniapp_id AS miniappId,
+            m.secret,
+            m.token,
+            m.NAME AS miniappName,
+            m.qr_code AS qrCode,
+            t.exp_date as expire_date,
+            m.org_id
+        FROM
+            ta_user t
+            LEFT JOIN ta_org o ON t.org_id = o.org_id
+            LEFT JOIN ta_miniapp m ON o.org_id = m.org_id
+            left join ta_channel_app_relation n on o.org_id = n.org_id
+            left join ta_channel_proxy z on z.channel_id = n.channel_id
+        WHERE
+            t.is_admin =1
+            <if test="channelId != null and channelId != ''">
+                and n.channel_id = #{channelId}
+            </if>
+            <if test="miniAppName != null and miniAppName != ''">
+                and m.name like CONCAT('%', #{miniAppName}, '%')
+            </if>
+    </select>
+
+    <select id="getTagsList" resultType="com.huiju.estateagents.center.taUser.entity.TaTags">
+        SELECT
+            t.*
+        FROM
+            ta_tag_user u
+            LEFT JOIN ta_tags t ON u.tag_id = t.tag_id
+            AND t.org_id = #{orgId}
+        WHERE
+            u.user_id = #{userId}
+    </select>
+
+    <select id="getUserList" resultType="com.huiju.estateagents.center.taUser.entity.TaUser">
+    SELECT
+        *
+    FROM
+        ta_user
+    WHERE
+        org_id = #{orgId}
+        and phone = #{phone}
+    </select>
+    <select id="seleUserList" resultType="com.huiju.estateagents.center.taUser.entity.TaUser">
+        SELECT
+            t.*,
+            b.building_id,
+            d.person_id as consultant_person_id,
+            if(d.person_id is not null,1,0) as mini_status
+        FROM
+            ta_user t
+            LEFT JOIN ta_person_building b ON t.user_id = b.user_id
+            LEFT JOIN ta_person d on t.user_id = d.user_id
+        WHERE
+            t.org_id = #{taUser.orgId} AND (t.is_admin != 1 or t.is_admin is null)
+            <if test="taUser.userName != null and taUser.userName != ''">
+                and t.user_name like CONCAT('%', #{taUser.userName}, '%')
+            </if>
+            <if test="taUser.phone != null and taUser.phone != ''">
+                and t.phone like CONCAT('%', #{taUser.phone}, '%')
+            </if>
+            <if test="taUser.status != null and taUser.status != ''">
+                and t.status = #{taUser.status}
+            </if>
+            <if test="taUser.isConsultant != null">
+                and t.is_consultant = #{taUser.isConsultant}
+            </if>
+            <if test="taUser.miniStatus == 0">
+                and d.person_id is null
+            </if>
+            <if test="taUser.miniStatus != null and taUser.miniStatus != '' and taUser.miniStatus == 1">
+                and d.person_id is not null
+            </if>
+            <if test="taUser.buildingId != null and taUser.buildingId != ''">
+                and b.building_id = #{taUser.buildingId}
+            </if>
+            <if test="personBuildingList != null and personBuildingList.size > 0">
+                AND b.building_id in
+                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                    #{personBuilding.buildingId}
+                </foreach>
+            </if>
+            GROUP BY user_id
+            order by t.weight desc, create_date desc
+    </select>
+
+    <select id="validateWeight" resultType="integer">
+      select count(*) from ta_user t
+      LEFT JOIN ta_person_building a on t.user_id = a.user_id
+      where 1=1
+      <if test="weight != null and weight != ''">
+          and t.weight = #{weight}
+      </if>
+      <if test="buildingIds != null and buildingIds.size() > 0 ">
+          and a.building_id in
+          <foreach collection="buildingIds" item="item" index="index" open="(" close=")" separator=",">
+              #{item}
+          </foreach>
+      </if>
+      <if test="buildingId != null and buildingId != '' ">
+          and a.building_id = #{buildingId}
+      </if>
+      <if test="userId != null and userId != ''">
+          and t.user_id != #{userId}
+      </if>
+    </select>
+
+    <select id="getAdminByAppID" resultType="com.huiju.estateagents.center.taUser.entity.TaUser">
+        SELECT
+        m.*
+        FROM
+        ta_miniapp t
+        JOIN ta_user m USING (org_id)
+        WHERE
+        t.miniapp_id = #{appid}
+        AND m.is_admin = 1
+    </select>
+
+    <select id="getBuildingIdsOf" resultType="java.lang.String">
+        select building_id from ta_person_building
+        where user_id = #{userId}
+        <if test="buildingId != null and buildingId != ''">
+            and building_id = #{buildingId}
+        </if>
+    </select>
+
+    <select id="getUserByPerson" resultType="com.huiju.estateagents.center.taUser.entity.TaUser">
+        SELECT
+            t.*
+        FROM
+            ta_user t
+        INNER JOIN ta_person s ON s.org_id = #{orgId} AND s.user_id = t.user_id
+        WHERE
+            t.org_id = #{orgId}
+        AND s.person_id = #{personId}
+        AND t.status &gt; -1
+        Limit 1
+    </select>
+
+</mapper>

src/main/resources/mapper/TsConsultantKpiMapper.xml

@@ -27,8 +27,9 @@
                  where s.org_id = t.org_id and (s.realty_consultant = t.user_id or s.realty_consultant = m.person_id)
                  and (s.building_id = t.building_id or IFNULL(t.building_id, '') = '')
                  and s.status > 0
-                 AND s.create_date BETWEEN STR_TO_DATE( #{startDate}, '%Y%m%d' )
-                 AND  STR_TO_DATE(concat(#{endDate}, '235959'), '%Y%m%d%H%i%s')) as total_persons
+<!--                 AND s.create_date BETWEEN STR_TO_DATE( #{startDate}, '%Y%m%d' )-->
+<!--                 AND  STR_TO_DATE(concat(#{endDate}, '235959'), '%Y%m%d%H%i%s')-->
+                ) as total_persons
             FROM
                 ts_consultant_kpi t
             LEFT JOIN ta_person m on m.org_id = #{orgId} and m.user_id = t.user_id
@@ -145,8 +146,8 @@
         WHERE
             p.org_id = #{orgId}
             AND p.`status` > 0
-            AND p.create_date BETWEEN STR_TO_DATE( #{startDate}, '%Y%m%d')
-            AND  STR_TO_DATE(concat(#{endDate}, '235959'), '%Y%m%d%H%i%s')
+<!--            AND p.create_date BETWEEN STR_TO_DATE( #{startDate}, '%Y%m%d')-->
+<!--            AND  STR_TO_DATE(concat(#{endDate}, '235959'), '%Y%m%d%H%i%s')-->
         <if test="buildingIds != null">
             AND t.building_id in
             <foreach item="buildingId" index="index" collection="buildingIds"

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

@@ -529,6 +529,7 @@
                 #{taPersonBuilding.buildingId}
             </foreach>
         </if>
+        group by t.person_id
         ) AS temp4
         GROUP BY
         DATE_FORMAT( temp4.create_date, '%Y-%m-%d' )
@@ -681,7 +682,7 @@
             and t.building_id = #{buildingId}
         </if>
         <if test="targetType != null and targetType != ''">
-            and (case when #{targetType} = 'activity' then t.target_type = 'dynamic' else t.target_type = #{targetType}
+            and (case when #{targetType} = 'activity' then t.target_type = 'dynamic' when #{targetType} = 'h5' then t.event_type = 'h5' else t.target_type = #{targetType}
             end)
         </if>
         <if test="startDate != null">
@@ -715,7 +716,7 @@
             and t.building_id = #{buildingId}
         </if>
         <if test="targetType != null and targetType != ''">
-            and (case when #{targetType} = 'activity' then t.target_type = 'dynamic' else t.target_type = #{targetType}
+            and (case when #{targetType} = 'activity' then t.target_type = 'dynamic' when #{targetType} = 'h5' then t.event_type = 'h5' else t.target_type = #{targetType}
             end)
         </if>
         <if test="startDate != null">
@@ -1448,8 +1449,8 @@
         from (
         SELECT t.*, f.nickname, f.phone, f.person_type
         FROM ta_share_count t
-        LEFT JOIN ta_help_activity a ON t.be_share = a.help_activity_id
         LEFT JOIN ta_share_activity b ON t.be_share = b.share_id
+        LEFT JOIN ta_help_activity a ON t.be_share = a.help_activity_id
         LEFT JOIN ta_live_activity c ON t.be_share = c.live_activity_id
         LEFT JOIN ta_drainage d ON t.be_share = d.drainage_id
         LEFT JOIN ta_building_dynamic e ON t.be_share = e.dynamic_id