bug

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

@@ -7,15 +7,11 @@ 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.center.taUser.entity.TaUser;
+import com.yunzhi.marketing.center.taUser.service.ITaUserService;
 import com.yunzhi.marketing.common.StringUtils;
-import com.yunzhi.marketing.entity.TaChannel;
-import com.yunzhi.marketing.entity.TaChannelPerson;
-import com.yunzhi.marketing.entity.TaPerson;
-import com.yunzhi.marketing.entity.TaRecommendCustomer;
-import com.yunzhi.marketing.service.ITaPersonService;
-import com.yunzhi.marketing.service.ITaRecommendCustomerService;
-import com.yunzhi.marketing.service.TaChannelPersonService;
-import com.yunzhi.marketing.service.TaChannelService;
+import com.yunzhi.marketing.entity.*;
+import com.yunzhi.marketing.service.*;
 import com.yunzhi.marketing.xlk.entity.CustomerInfo;
 import com.yunzhi.marketing.xlk.entity.CustomerInfoModifyRecord;
 import com.yunzhi.marketing.xlk.service.ICustomerInfoModifyRecordService;
@@ -31,7 +27,9 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
+import java.util.Collection;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -66,6 +64,14 @@ public class CustomerInfoController extends BaseController {
     @Autowired
     private TaChannelService taChannelService;
 
+    @Autowired
+    private ITaPersonBuildingService taPersonBuildingService;
+
+    @Autowired
+    private ITaUserService taUserService;
+
+    @Autowired
+    private ITaBuildingService taBuildingService;
     /**
      * 分页查询列表
      * @param pageNum
@@ -266,6 +272,19 @@ public class CustomerInfoController extends BaseController {
             if (!StringUtils.isEmpty(customer.getRealtyConsultant())) {
                 TaPerson realtyPerson = taPersonService.getById(customer.getRealtyConsultant());
                 customerInfoVO.setRealtyConsultantPerson(realtyPerson);
+                // 所属楼盘和 用户信息
+                LambdaQueryWrapper<TaPersonBuilding> taPersonBuildingLambdaQueryWrapper = new LambdaQueryWrapper<>();
+                taPersonBuildingLambdaQueryWrapper.eq(TaPersonBuilding::getPersonId,customer.getRealtyConsultant());
+                List<TaPersonBuilding> list = taPersonBuildingService.list(taPersonBuildingLambdaQueryWrapper);
+                if (list.size() > 0) {
+                    TaUser taUser = taUserService.getById(list.get(0).getUserId());
+                    customerInfoVO.setTaUser(taUser);
+                    // 获取楼盘相关信息
+                    LambdaQueryWrapper<TaBuilding> taBuildingLambdaQueryWrapper = new LambdaQueryWrapper<>();
+                    taBuildingLambdaQueryWrapper.in(TaBuilding::getBuildingId,list.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList()));
+                    List<TaBuilding> taBuildingList = taBuildingService.list(taBuildingLambdaQueryWrapper);
+                    customerInfoVO.setTaBuildingList(taBuildingList);
+                }
             }
 
             // 获取渠道名字

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

@@ -60,8 +60,8 @@ public class CustomerInfoServiceImpl extends ServiceImpl<CustomerInfoMapper, Cus
 
         // 获取person用户信息
         String personId = customerInfoVO.getTaRecommendCustomer().getPersonId();
-        TaPerson taPerson = taPersonMapper.getById(personId);
-        customerInfoVO.setAvatarurl(taPerson.getAvatarurl());
+//        TaPerson taPerson = taPersonMapper.getById(personId);
+//        customerInfoVO.setAvatarurl(taPerson.getAvatarurl());
         if (!StringUtils.isEmpty(personId)) {
             List<TaPersonVisitRecord> records = taPersonVisitRecordMapper.visitRecordByPersonIdNew(personId);
             records.forEach(e -> {

src/main/java/com/yunzhi/marketing/xlk/vo/CustomerInfoVO.java

@@ -1,9 +1,7 @@
 package com.yunzhi.marketing.xlk.vo;
 
-import com.yunzhi.marketing.entity.PersonIntention;
-import com.yunzhi.marketing.entity.TaPerson;
-import com.yunzhi.marketing.entity.TaPersonVisitRecord;
-import com.yunzhi.marketing.entity.TaRecommendCustomer;
+import com.yunzhi.marketing.center.taUser.entity.TaUser;
+import com.yunzhi.marketing.entity.*;
 import com.yunzhi.marketing.xlk.entity.CustomerInfo;
 import lombok.Data;
 
@@ -32,4 +30,11 @@ public class CustomerInfoVO {
      */
     private String avatarurl;
 
+    /**
+     * 置业顾问用户相关信息
+     */
+    private TaUser taUser;
+
+    private List<TaBuilding> taBuildingList;
+
 }

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

@@ -14,7 +14,7 @@
             ta_save t
                 LEFT JOIN xlk_curriculum x ON t.save_id = x.curriculum_id
         WHERE
-            t.saved_target = "curriculum"
+            t.tagert_type = "curriculum"
           AND t.person_id = #{personId}
     </select>