客户信息修改

src/main/java/com/yunzhi/marketing/xlk/controller/ChannelCustomerController.java

@@ -54,6 +54,7 @@ public class ChannelCustomerController extends BaseController {
                                             @RequestParam(value ="recommendPersonName", required = false) String recommendPersonName,
                                             @RequestParam(value ="recommendPhone", required = false) String recommendPhone,
                                             @RequestParam(value ="status", required = false) String status,
+                                            @RequestParam(value ="type") String type,
                                             HttpServletRequest request){
         Integer orgId = getOrgId(request);
         ResponseBean responseBean = new ResponseBean();
@@ -68,7 +69,7 @@ public class ChannelCustomerController extends BaseController {
                     phone,
                     recommendPersonName,
                     recommendPhone,
-                    status);
+                    status,type);
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();
@@ -86,7 +87,7 @@ public class ChannelCustomerController extends BaseController {
      */
     @ApiOperation(value = "admin-渠道报备客户审核", notes = "admin-渠道报备客户审核")
     @RequestMapping(value="/admin/channelCustomer/{id}",method= RequestMethod.PUT)
-    public ResponseBean channelCustomerUpdate(@PathVariable Integer id,
+    public ResponseBean channelCustomerUpdate(@PathVariable String id,
                                         @RequestBody ChannelCustomerDTO channelCustomerDTO){
         return iChannelCustomerService.auditCustomer(id,channelCustomerDTO);
     }
@@ -122,7 +123,7 @@ public class ChannelCustomerController extends BaseController {
      * @param id  实体ID
      */
     @RequestMapping(value="/admin/channelCustomer/{id}",method= RequestMethod.GET)
-    public ResponseBean channelCustomerGet(@PathVariable Integer id){
+    public ResponseBean channelCustomerGet(@PathVariable String id){
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(iChannelCustomerService.getById(id));

src/main/java/com/yunzhi/marketing/xlk/controller/CustomerInfoController.java

@@ -0,0 +1,191 @@
+package com.yunzhi.marketing.xlk.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.yunzhi.marketing.base.BaseController;
+import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.entity.TaPerson;
+import com.yunzhi.marketing.service.ITaPersonService;
+import com.yunzhi.marketing.xlk.entity.CustomerInfo;
+import com.yunzhi.marketing.xlk.entity.CustomerInfoModifyRecord;
+import com.yunzhi.marketing.xlk.service.ICustomerInfoModifyRecordService;
+import com.yunzhi.marketing.xlk.service.ICustomerInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+    * 客户基本信息表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2021-07-29
+ */
+@RestController
+@RequestMapping("/api")
+@Api(value = "客户基本信息表", tags = "xlk-客户基本信息表")
+public class CustomerInfoController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(CustomerInfoController.class);
+
+    @Autowired
+    public ICustomerInfoService iCustomerInfoService;
+
+    @Autowired
+    private ICustomerInfoModifyRecordService customerInfoModifyRecordService;
+
+    @Autowired
+    public ITaPersonService taPersonService;
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/customerInfo",method= RequestMethod.GET)
+    public ResponseBean customerInfoList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<CustomerInfo> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<CustomerInfo> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<CustomerInfo> result = iCustomerInfoService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("customerInfoList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param customerInfo 实体对象
+     * @return
+     */
+    @ApiOperation(value = "wx-保存客户信息", notes = "wx-保存客户信息")
+    @RequestMapping(value="/wx/customerInfo",method= RequestMethod.POST)
+    public ResponseBean customerInfoAdd(@RequestBody CustomerInfo customerInfo, @RequestHeader("authorization") String token, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        String openid = getOpenId(request);
+        Integer orgId = getOrgId(request);
+        List<TaPerson> persons = taPersonService.getPersonsByOpenId(openid);
+        if (null == persons || persons.size() == 0) {
+            return ResponseBean.error("当前账户信息异常, 清除缓存重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = persons.get(0);
+        try {
+            customerInfo.setCreateDate(LocalDateTime.now());
+            customerInfo.setCretePerson(person.getPersonId());
+            customerInfo.setOrgId(orgId);
+            if (iCustomerInfoService.save(customerInfo)){
+                responseBean.addSuccess(customerInfo);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("customerInfoAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/customerInfo/{id}", method= RequestMethod.DELETE)
+    public ResponseBean customerInfoDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iCustomerInfoService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("customerInfoDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param customerInfo 实体对象
+     * @return
+     */
+    @RequestMapping(value="/customerInfo/{id}",method= RequestMethod.PUT)
+    public ResponseBean customerInfoUpdate(@PathVariable String id,
+                                        @RequestBody CustomerInfo customerInfo, @RequestHeader("authorization") String token,HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        String openid = getOpenId(request);
+        Integer orgId = getOrgId(request);
+        List<TaPerson> persons = taPersonService.getPersonsByOpenId(openid);
+        if (null == persons || persons.size() == 0) {
+            return ResponseBean.error("当前账户信息异常, 清除缓存重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = persons.get(0);
+        try {
+            customerInfo.setCustomerInfoId(id);
+            if (iCustomerInfoService.updateById(customerInfo)){
+                // 记录到修改记录表中
+                CustomerInfoModifyRecord customerInfoModifyRecord = new CustomerInfoModifyRecord();
+                customerInfoModifyRecord.setCreateDate(LocalDateTime.now());
+                customerInfoModifyRecord.setCustomerInfoId(id);
+                customerInfoModifyRecord.setModifyPersonId(person.getPersonId());
+                customerInfoModifyRecord.setOrgId(orgId);
+                customerInfoModifyRecord.setContent(JSONObject.toJSONString(customerInfo));
+                customerInfoModifyRecordService.save(customerInfoModifyRecord);
+                responseBean.addSuccess(customerInfo);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("customerInfoUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param
+     */
+    @ApiOperation(value = "wx-查询客户信息", notes = "wx-查询客户信息")
+    @RequestMapping(value="/wx/customerInfo/{customerId}",method= RequestMethod.GET)
+    public ResponseBean customerInfoGet(@PathVariable Integer customerId, @RequestHeader("authorization") String token){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            LambdaQueryWrapper<CustomerInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+            lambdaQueryWrapper.eq(CustomerInfo::getCustomerId,customerId);
+            responseBean.addSuccess(iCustomerInfoService.getOne(lambdaQueryWrapper));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("customerInfoDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/yunzhi/marketing/xlk/controller/CustomerInfoModifyRecordController.java

@@ -0,0 +1,143 @@
+package com.yunzhi.marketing.xlk.controller;
+
+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.yunzhi.marketing.base.BaseController;
+import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.xlk.entity.CustomerInfoModifyRecord;
+import com.yunzhi.marketing.xlk.service.ICustomerInfoModifyRecordService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+    * 客户信息修改记录表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2021-07-29
+ */
+@RestController
+@RequestMapping("/")
+public class CustomerInfoModifyRecordController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(CustomerInfoModifyRecordController.class);
+
+    @Autowired
+    public ICustomerInfoModifyRecordService iCustomerInfoModifyRecordService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/customerInfoModifyRecord",method= RequestMethod.GET)
+    public ResponseBean customerInfoModifyRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                                     @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<CustomerInfoModifyRecord> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<CustomerInfoModifyRecord> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<CustomerInfoModifyRecord> result = iCustomerInfoModifyRecordService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("customerInfoModifyRecordList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param customerInfoModifyRecord 实体对象
+     * @return
+     */
+    @RequestMapping(value="/customerInfoModifyRecord",method= RequestMethod.POST)
+    public ResponseBean customerInfoModifyRecordAdd(@RequestBody CustomerInfoModifyRecord customerInfoModifyRecord){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iCustomerInfoModifyRecordService.save(customerInfoModifyRecord)){
+                responseBean.addSuccess(customerInfoModifyRecord);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("customerInfoModifyRecordAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/customerInfoModifyRecord/{id}", method= RequestMethod.DELETE)
+    public ResponseBean customerInfoModifyRecordDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iCustomerInfoModifyRecordService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("customerInfoModifyRecordDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param customerInfoModifyRecord 实体对象
+     * @return
+     */
+    @RequestMapping(value="/customerInfoModifyRecord/{id}",method= RequestMethod.PUT)
+    public ResponseBean customerInfoModifyRecordUpdate(@PathVariable Integer id,
+                                        @RequestBody CustomerInfoModifyRecord customerInfoModifyRecord){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iCustomerInfoModifyRecordService.updateById(customerInfoModifyRecord)){
+                responseBean.addSuccess(customerInfoModifyRecord);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("customerInfoModifyRecordUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/customerInfoModifyRecord/{id}",method= RequestMethod.GET)
+    public ResponseBean customerInfoModifyRecordGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iCustomerInfoModifyRecordService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("customerInfoModifyRecordDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/yunzhi/marketing/xlk/entity/CustomerInfo.java

@@ -0,0 +1,145 @@
+package com.yunzhi.marketing.xlk.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 客户基本信息表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-07-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("xlk_customer_info")
+public class CustomerInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户基本信息id
+     */
+    @TableId(type = IdType.UUID)
+    private String customerInfoId;
+
+    /**
+     * 客户id
+     */
+    private String customerId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 性别
+     */
+    private Integer sex;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 昵称
+     */
+    private String nickname;
+
+    /**
+     * 手机号码
+     */
+    private String phone;
+
+    /**
+     * 家庭住址
+     */
+    private String homeAddress;
+
+    /**
+     * 工作地址
+     */
+    private String firmAddress;
+
+    /**
+     * 年龄段
+     */
+    private String age;
+
+    /**
+     * 职业
+     */
+    private String career;
+
+    /**
+     * 家庭年收入范围
+     */
+    private String householdIncome;
+
+    /**
+     * 家庭成员数
+     */
+    private Integer familyNumber;
+
+    /**
+     * 已有房产数
+     */
+    private Integer houseNumber;
+
+    /**
+     * 已有车辆数
+     */
+    private Integer carNumber;
+
+    /**
+     * 预计购房时间
+     */
+    private String estimatedPurchaseTime;
+
+    /**
+     * 客户咨询重点
+     */
+    private String consultation;
+
+    /**
+     * 购房动机
+     */
+    private String motivation;
+
+    /**
+     * 客户抗性分析
+     */
+    private String resistanceAnalysis;
+
+    /**
+     * 客户对项目认可点
+     */
+    private String approval;
+
+    /**
+     * 其他备注
+     */
+    private String remark;
+
+
+    /**
+     * 创建person
+     */
+    private String cretePerson;
+}

src/main/java/com/yunzhi/marketing/xlk/entity/CustomerInfoModifyRecord.java

@@ -0,0 +1,61 @@
+package com.yunzhi.marketing.xlk.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 客户信息修改记录表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-07-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("xlk_customer_info_modify_record")
+public class CustomerInfoModifyRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.UUID)
+    private String customerInfoModifyRecordId;
+
+    /**
+     * 修改人的信息id主键
+     */
+    private String customerInfoId;
+
+    /**
+     * 修改人的personid
+     */
+    private String modifyPersonId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 修改的内容
+     */
+    private String content;
+
+
+}

src/main/java/com/yunzhi/marketing/xlk/mapper/ChannelCustomerMapper.java

@@ -24,6 +24,6 @@ public interface ChannelCustomerMapper extends BaseMapper<ChannelCustomer> {
                                           @Param("phone") String phone,
                                           @Param("recommendPersonName") String recommendPersonName,
                                           @Param("recommendPhone") String recommendPhone,
-                                          @Param("status") String status);
+                                          @Param("status") String status,@Param("type") String type);
 
 }

src/main/java/com/yunzhi/marketing/xlk/mapper/CustomerInfoMapper.java

@@ -0,0 +1,18 @@
+package com.yunzhi.marketing.xlk.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhi.marketing.xlk.entity.CustomerInfo;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 客户基本信息表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-07-29
+ */
+@Mapper
+public interface CustomerInfoMapper extends BaseMapper<CustomerInfo> {
+
+}

src/main/java/com/yunzhi/marketing/xlk/mapper/CustomerInfoModifyRecordMapper.java

@@ -0,0 +1,18 @@
+package com.yunzhi.marketing.xlk.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhi.marketing.xlk.entity.CustomerInfoModifyRecord;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 客户信息修改记录表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-07-29
+ */
+@Mapper
+public interface CustomerInfoModifyRecordMapper extends BaseMapper<CustomerInfoModifyRecord> {
+
+}

src/main/java/com/yunzhi/marketing/xlk/service/IChannelCustomerService.java

@@ -23,7 +23,7 @@ public interface IChannelCustomerService extends IService<ChannelCustomer> {
      * @param channelCustomerDTO
      * @return
      */
-    ResponseBean auditCustomer(Integer id, ChannelCustomerDTO channelCustomerDTO);
+    ResponseBean auditCustomer(String id, ChannelCustomerDTO channelCustomerDTO);
 
     /**
      * 驻场确认到访
@@ -47,5 +47,6 @@ public interface IChannelCustomerService extends IService<ChannelCustomer> {
                                           String phone,
                                           String recommendPersonName,
                                           String recommendPhone,
-                                          String status);
+                                          String status,
+                                          String type);
 }

src/main/java/com/yunzhi/marketing/xlk/service/ICustomerInfoModifyRecordService.java

@@ -0,0 +1,16 @@
+package com.yunzhi.marketing.xlk.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.marketing.xlk.entity.CustomerInfoModifyRecord;
+
+/**
+ * <p>
+ * 客户信息修改记录表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-07-29
+ */
+public interface ICustomerInfoModifyRecordService extends IService<CustomerInfoModifyRecord> {
+
+}

src/main/java/com/yunzhi/marketing/xlk/service/ICustomerInfoService.java

@@ -0,0 +1,16 @@
+package com.yunzhi.marketing.xlk.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.marketing.xlk.entity.CustomerInfo;
+
+/**
+ * <p>
+ * 客户基本信息表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-07-29
+ */
+public interface ICustomerInfoService extends IService<CustomerInfo> {
+
+}

src/main/java/com/yunzhi/marketing/xlk/service/impl/ChannelCustomerServiceImpl.java

@@ -43,7 +43,7 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
      * @return
      */
     @Override
-    public ResponseBean auditCustomer(Integer id, ChannelCustomerDTO channelCustomerDTO) {
+    public ResponseBean auditCustomer(String id, ChannelCustomerDTO channelCustomerDTO) {
         ChannelCustomer customer = channelCustomerMapper.selectById(id);
         if ("fail".equals(channelCustomerDTO.getAuditResult())){
             // 审核不通过
@@ -209,7 +209,7 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
                                                  String phone,
                                                  String recommendPersonName,
                                                  String recommendPhone,
-                                                 String status) {
-        return channelCustomerMapper.getProfileList(pg, orgId, buildingId, name, phone, recommendPersonName, recommendPhone, status);
+                                                 String status,String type) {
+        return channelCustomerMapper.getProfileList(pg, orgId, buildingId, name, phone, recommendPersonName, recommendPhone, status, type);
     }
 }

src/main/java/com/yunzhi/marketing/xlk/service/impl/CustomerInfoModifyRecordServiceImpl.java

@@ -0,0 +1,20 @@
+package com.yunzhi.marketing.xlk.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yunzhi.marketing.xlk.entity.CustomerInfoModifyRecord;
+import com.yunzhi.marketing.xlk.mapper.CustomerInfoModifyRecordMapper;
+import com.yunzhi.marketing.xlk.service.ICustomerInfoModifyRecordService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 客户信息修改记录表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-07-29
+ */
+@Service
+public class CustomerInfoModifyRecordServiceImpl extends ServiceImpl<CustomerInfoModifyRecordMapper, CustomerInfoModifyRecord> implements ICustomerInfoModifyRecordService {
+
+}

src/main/java/com/yunzhi/marketing/xlk/service/impl/CustomerInfoServiceImpl.java

@@ -0,0 +1,20 @@
+package com.yunzhi.marketing.xlk.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yunzhi.marketing.xlk.entity.CustomerInfo;
+import com.yunzhi.marketing.xlk.mapper.CustomerInfoMapper;
+import com.yunzhi.marketing.xlk.service.ICustomerInfoService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 客户基本信息表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-07-29
+ */
+@Service
+public class CustomerInfoServiceImpl extends ServiceImpl<CustomerInfoMapper, CustomerInfo> implements ICustomerInfoService {
+
+}

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -959,6 +959,7 @@ FROM
 --         INNER JOIN ta_person p ON t.recommend_person = p.person_id
         WHERE
             t.building_id = #{buildingId}
+        and t.entry_type = "verify"
         <if test="keywords != null and keywords !=''">
             and t.name like CONCAT('%',#{keywords}, '%')
         </if>

src/main/resources/mapper/xlk/ChannelCustomerMapper.xml

@@ -35,6 +35,12 @@
           <if test="status == null or status == ''">
             AND t.`status` &gt; -1
           </if>
+            <if test="type == 'customer'">
+                AND t.channel_id is null
+            </if>
+            <if test="type == 'channel'">
+                AND t.channel_id is not null
+            </if>
             ORDER BY
                 t.create_date DESC
     </select>

src/main/resources/mapper/xlk/CustomerInfoMapper.xml

@@ -0,0 +1,5 @@
+<?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.yunzhi.marketing.xlk.mapper.CustomerInfoMapper">
+
+</mapper>

src/main/resources/mapper/xlk/CustomerInfoModifyRecordMapper.xml

@@ -0,0 +1,5 @@
+<?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.yunzhi.marketing.xlk.mapper.CustomerInfoModifyRecordMapper">
+
+</mapper>