1111

src/main/java/com/yunzhi/marketing/service/impl/TaPersonServiceImpl.java

@@ -322,6 +322,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         result.put("personType",person.getPersonType());
         result.put("name", user.getUserName());
         result.put("company", user.getOrgName());
+        result.put("description", user.getDescription());
         result.put("department", user.getDepartment());
         result.put("picture", user.getPhoto());
         result.put("hotNum", person.getHotNum());
@@ -336,6 +337,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         result.put("projects", buildings);
         result.put("address", taBuilding.getAddress());
         result.put("buildingName", taBuilding.getBuildingName());
+        result.put("buildingId", taBuilding.getBuildingId());
         result.put("coordinate", taBuilding.getCoordinate());
         result.put("personTags",person.getPersonTags());
         result.put("posters",taPosterService.getPostersForTarget(user.getUserId().toString(),CommConstant.POSTER_CONTENT_TYPE_PERSON));

src/main/java/com/yunzhi/marketing/statistic/controller/TaCustomerFollowUpRecordController.java

@@ -215,7 +215,7 @@ public class TaCustomerFollowUpRecordController extends BaseController {
             queryWrapper.eq("follower_id",person.getPersonId());
             queryWrapper.eq("org_id",orgId);
             queryWrapper.eq("customer_id",customerId);
-            queryWrapper.like(!StringUtils.isEmpty(recordType), "record_type","%"+recordType+"%");
+            queryWrapper.like(!StringUtils.isEmpty(recordType), "record_type",recordType);
             queryWrapper.orderByDesc("create_date");
             
             IPage<TaCustomerFollowUpRecord> result = iTaCustomerFollowUpRecordService.page(pg, queryWrapper);

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

@@ -228,17 +228,16 @@ public class CustomerInfoController extends BaseController {
             lambdaQueryWrapper.eq(CustomerInfo::getCustomerId,customerId);
 
             CustomerInfo customerInfo = iCustomerInfoService.getOne(lambdaQueryWrapper);
+            TaRecommendCustomer customer = iTaRecommendCustomerService.getById(customerId);
+            if (null == customer) {
+                return ResponseBean.error("请求客户不存在", ResponseBean.ERROR_UNAVAILABLE);
+            }
             if (null == customerInfo) {
                 customerInfo = new CustomerInfo();
-                TaRecommendCustomer customer = iTaRecommendCustomerService.getById(customerId);
-                if (null == customer) {
-                    return ResponseBean.error("请求客户不存在", ResponseBean.ERROR_UNAVAILABLE);
-                }
-
-                customerInfo.setName(customer.getName());
-                customerInfo.setSex(customer.getSex());
-                customerInfo.setPhone(customer.getPhone());
             }
+            customerInfo.setName(customer.getName());
+            customerInfo.setSex(customer.getSex());
+            customerInfo.setPhone(customer.getPhone());
 
             responseBean.addSuccess(customerInfo);
         }catch (Exception e){

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

@@ -1,6 +1,7 @@
 package com.yunzhi.marketing.xlk.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -50,21 +51,25 @@ public class CustomerInfo implements Serializable {
     /**
      * 性别
      */
+    @TableField(exist = false)
     private Integer sex;
 
     /**
      * 姓名
      */
+    @TableField(exist = false)
     private String name;
 
     /**
      * 昵称
      */
+    @TableField(exist = false)
     private String nickname;
 
     /**
      * 手机号码
      */
+    @TableField(exist = false)
     private String phone;
 
     /**

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -1006,7 +1006,8 @@ FROM
             t.verify_status as channelStatus,
             t.recommend_person,
             null as channel_id,
-            p.name as channelName
+            p.name as channelName,
+            t.create_date
         FROM
             ta_recommend_customer t
          left JOIN ta_person p ON t.realty_consultant = p.person_id
@@ -1030,7 +1031,8 @@ FROM
         t.status as channelStatus,
         t.recommend_person,
         t.channel_id,
-        c.channel_name as channelName
+        c.channel_name as channelName,
+        t.create_date
         FROM
             xlk_channel_customer t
         Left join ta_channel c on t.channel_id = c.channel_id