Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

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

@@ -7,14 +7,15 @@ import com.alibaba.excel.write.metadata.WriteSheet;
 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.fasterxml.jackson.annotation.JsonFormat;
+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.StringUtils;
-import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.entity.TaBuilding;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaRecommendCustomer;
 import com.huiju.estateagents.event.EventBus;
 import com.huiju.estateagents.excel.*;
 import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
@@ -29,22 +30,16 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
 
-import com.huiju.estateagents.base.BaseController;
-
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -640,6 +635,7 @@ 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());

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

@@ -197,5 +197,6 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
                                                            @Param("userId") String userId,
                                                            @Param("buildingId") String buildingId,
                                                            @Param("startDate") LocalDateTime startDate,
-                                                           @Param("endDate") LocalDateTime endDate);
+                                                           @Param("endDate") LocalDateTime endDate,
+                                                           @Param("personId") String personId);
 }

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

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.service.impl;
 
+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.center.taUser.entity.TaUser;
@@ -7,6 +8,7 @@ import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.excel.ConsultantKPIExport;
+import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.mapper.TaRecommendCustomerMapper;
 import com.huiju.estateagents.mapper.TsConsultantKpiMapper;
 import com.huiju.estateagents.service.ITsConsultantKpiService;
@@ -36,6 +38,9 @@ public class TsConsultantKpiServiceImpl extends ServiceImpl<TsConsultantKpiMappe
 
     @Autowired
     TaRecommendCustomerMapper taRecommendCustomerMapper;
+    
+    @Autowired
+    private TaPersonMapper taPersonMapper;
 
     /**
      * 获取用户授权楼盘
@@ -101,7 +106,12 @@ public class TsConsultantKpiServiceImpl extends ServiceImpl<TsConsultantKpiMappe
 
     @Override
     public IPage<TaRecommendCustomer> getCustomerListOfConsultant(IPage<TaRecommendCustomer> page, Integer orgId, String userId, String buildingId, LocalDateTime startDate, LocalDateTime endDate) {
-        return taRecommendCustomerMapper.getCustomerListOfConsultant(page, orgId, userId, buildingId, startDate, endDate);
+        String personId = null;
+        TaPerson taPerson = taPersonMapper.selectOne(new QueryWrapper<TaPerson>().eq("user_id", userId).eq("org_id", orgId));
+        if (null != taPerson){
+            personId = taPerson.getPersonId();
+        }
+        return taRecommendCustomerMapper.getCustomerListOfConsultant(page, orgId, userId, buildingId, startDate, endDate, personId);
     }
 
     @Override

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -842,7 +842,11 @@ FROM
         from ta_recommend_customer s
         left join ta_person t on t.person_id = s.person_id
         where s.org_id = #{orgId}
-        and s.realty_consultant = #{userId}
+        and (s.realty_consultant = #{userId}
+        <if test="personId != null">
+            or s.realty_consultant = #{personId}
+        </if>
+        )
         <if test="startDate != null">
             and s.create_date BETWEEN #{startDate} and #{endDate}
         </if>

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

@@ -1979,7 +1979,7 @@
         left join ta_person a on t.person_id = a.person_id
         left join ta_person_from_record b on a.person_id = b.person_id and b.org_id = #{orgId} and b.is_first_time =1
         left join td_wx_dict b1 on b.scene_id = b1.scene_id
-        left join ta_recommend_customer c on c.person_id = t.person_id
+        left join ta_recommend_customer c on c.person_id = t.person_id and c.realty_consultant is not null
         LEFT JOIN ta_user d ON c.realty_consultant = d.user_id
         LEFT JOIN ta_person e ON t.share_person_id = e.person_id
         WHERE t.target_type in ('dynamic','h5','help','live', 'group','activity') and t.org_id =