傅行帆 3 anni fa
parent
commit
de58964f19

+ 2
- 0
src/main/java/com/yunzhi/marketing/service/impl/TaPersonServiceImpl.java Vedi File

322
         result.put("personType",person.getPersonType());
322
         result.put("personType",person.getPersonType());
323
         result.put("name", user.getUserName());
323
         result.put("name", user.getUserName());
324
         result.put("company", user.getOrgName());
324
         result.put("company", user.getOrgName());
325
+        result.put("description", user.getDescription());
325
         result.put("department", user.getDepartment());
326
         result.put("department", user.getDepartment());
326
         result.put("picture", user.getPhoto());
327
         result.put("picture", user.getPhoto());
327
         result.put("hotNum", person.getHotNum());
328
         result.put("hotNum", person.getHotNum());
336
         result.put("projects", buildings);
337
         result.put("projects", buildings);
337
         result.put("address", taBuilding.getAddress());
338
         result.put("address", taBuilding.getAddress());
338
         result.put("buildingName", taBuilding.getBuildingName());
339
         result.put("buildingName", taBuilding.getBuildingName());
340
+        result.put("buildingId", taBuilding.getBuildingId());
339
         result.put("coordinate", taBuilding.getCoordinate());
341
         result.put("coordinate", taBuilding.getCoordinate());
340
         result.put("personTags",person.getPersonTags());
342
         result.put("personTags",person.getPersonTags());
341
         result.put("posters",taPosterService.getPostersForTarget(user.getUserId().toString(),CommConstant.POSTER_CONTENT_TYPE_PERSON));
343
         result.put("posters",taPosterService.getPostersForTarget(user.getUserId().toString(),CommConstant.POSTER_CONTENT_TYPE_PERSON));

+ 1
- 1
src/main/java/com/yunzhi/marketing/statistic/controller/TaCustomerFollowUpRecordController.java Vedi File

215
             queryWrapper.eq("follower_id",person.getPersonId());
215
             queryWrapper.eq("follower_id",person.getPersonId());
216
             queryWrapper.eq("org_id",orgId);
216
             queryWrapper.eq("org_id",orgId);
217
             queryWrapper.eq("customer_id",customerId);
217
             queryWrapper.eq("customer_id",customerId);
218
-            queryWrapper.like(!StringUtils.isEmpty(recordType), "record_type","%"+recordType+"%");
218
+            queryWrapper.like(!StringUtils.isEmpty(recordType), "record_type",recordType);
219
             queryWrapper.orderByDesc("create_date");
219
             queryWrapper.orderByDesc("create_date");
220
             
220
             
221
             IPage<TaCustomerFollowUpRecord> result = iTaCustomerFollowUpRecordService.page(pg, queryWrapper);
221
             IPage<TaCustomerFollowUpRecord> result = iTaCustomerFollowUpRecordService.page(pg, queryWrapper);

+ 7
- 8
src/main/java/com/yunzhi/marketing/xlk/controller/CustomerInfoController.java Vedi File

228
             lambdaQueryWrapper.eq(CustomerInfo::getCustomerId,customerId);
228
             lambdaQueryWrapper.eq(CustomerInfo::getCustomerId,customerId);
229
 
229
 
230
             CustomerInfo customerInfo = iCustomerInfoService.getOne(lambdaQueryWrapper);
230
             CustomerInfo customerInfo = iCustomerInfoService.getOne(lambdaQueryWrapper);
231
+            TaRecommendCustomer customer = iTaRecommendCustomerService.getById(customerId);
232
+            if (null == customer) {
233
+                return ResponseBean.error("请求客户不存在", ResponseBean.ERROR_UNAVAILABLE);
234
+            }
231
             if (null == customerInfo) {
235
             if (null == customerInfo) {
232
                 customerInfo = new CustomerInfo();
236
                 customerInfo = new CustomerInfo();
233
-                TaRecommendCustomer customer = iTaRecommendCustomerService.getById(customerId);
234
-                if (null == customer) {
235
-                    return ResponseBean.error("请求客户不存在", ResponseBean.ERROR_UNAVAILABLE);
236
-                }
237
-
238
-                customerInfo.setName(customer.getName());
239
-                customerInfo.setSex(customer.getSex());
240
-                customerInfo.setPhone(customer.getPhone());
241
             }
237
             }
238
+            customerInfo.setName(customer.getName());
239
+            customerInfo.setSex(customer.getSex());
240
+            customerInfo.setPhone(customer.getPhone());
242
 
241
 
243
             responseBean.addSuccess(customerInfo);
242
             responseBean.addSuccess(customerInfo);
244
         }catch (Exception e){
243
         }catch (Exception e){

+ 5
- 0
src/main/java/com/yunzhi/marketing/xlk/entity/CustomerInfo.java Vedi File

1
 package com.yunzhi.marketing.xlk.entity;
1
 package com.yunzhi.marketing.xlk.entity;
2
 
2
 
3
 import com.baomidou.mybatisplus.annotation.IdType;
3
 import com.baomidou.mybatisplus.annotation.IdType;
4
+import com.baomidou.mybatisplus.annotation.TableField;
4
 import com.baomidou.mybatisplus.annotation.TableId;
5
 import com.baomidou.mybatisplus.annotation.TableId;
5
 import com.baomidou.mybatisplus.annotation.TableName;
6
 import com.baomidou.mybatisplus.annotation.TableName;
6
 import lombok.Data;
7
 import lombok.Data;
50
     /**
51
     /**
51
      * 性别
52
      * 性别
52
      */
53
      */
54
+    @TableField(exist = false)
53
     private Integer sex;
55
     private Integer sex;
54
 
56
 
55
     /**
57
     /**
56
      * 姓名
58
      * 姓名
57
      */
59
      */
60
+    @TableField(exist = false)
58
     private String name;
61
     private String name;
59
 
62
 
60
     /**
63
     /**
61
      * 昵称
64
      * 昵称
62
      */
65
      */
66
+    @TableField(exist = false)
63
     private String nickname;
67
     private String nickname;
64
 
68
 
65
     /**
69
     /**
66
      * 手机号码
70
      * 手机号码
67
      */
71
      */
72
+    @TableField(exist = false)
68
     private String phone;
73
     private String phone;
69
 
74
 
70
     /**
75
     /**

+ 4
- 2
src/main/resources/mapper/TaRecommendCustomerMapper.xml Vedi File

1006
             t.verify_status as channelStatus,
1006
             t.verify_status as channelStatus,
1007
             t.recommend_person,
1007
             t.recommend_person,
1008
             null as channel_id,
1008
             null as channel_id,
1009
-            p.name as channelName
1009
+            p.name as channelName,
1010
+            t.create_date
1010
         FROM
1011
         FROM
1011
             ta_recommend_customer t
1012
             ta_recommend_customer t
1012
          left JOIN ta_person p ON t.realty_consultant = p.person_id
1013
          left JOIN ta_person p ON t.realty_consultant = p.person_id
1030
         t.status as channelStatus,
1031
         t.status as channelStatus,
1031
         t.recommend_person,
1032
         t.recommend_person,
1032
         t.channel_id,
1033
         t.channel_id,
1033
-        c.channel_name as channelName
1034
+        c.channel_name as channelName,
1035
+        t.create_date
1034
         FROM
1036
         FROM
1035
             xlk_channel_customer t
1037
             xlk_channel_customer t
1036
         Left join ta_channel c on t.channel_id = c.channel_id
1038
         Left join ta_channel c on t.channel_id = c.channel_id