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

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

@@ -316,7 +316,8 @@ public class TaRecommendCustomerController extends BaseController {
                                          @RequestParam(value = "status",required = false) Integer status,
                                          @RequestParam(value = "sceneType",required = false) String sceneType,
                                          @RequestParam(value = "startCreateDate",required = false) String startCreateDate,
-                                         @RequestParam(value = "endCreateDate",required = false) String endCreateDate){
+                                         @RequestParam(value = "endCreateDate",required = false) String endCreateDate,
+                                         @RequestParam(value = "sharePersonName",required = false) String sharePersonName){
         try{
 
             // TODO 目前如果是公客，就取当前操作人员的 buildingId
@@ -330,7 +331,7 @@ public class TaRecommendCustomerController extends BaseController {
 //                TaPersonBuilding personBuilding = taPersonBuildingMapper.selectOne(queryWrapper);
 //                buildingId = personBuilding.getBuildingId();
 //            }
-            return ResponseBean.success(taRecommendCustomerService.getCustomerList(status,pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, customerType, getOrgId(request),getTaPersonBuildingListByUserId(request),sceneType, startCreateDate, endCreateDate));
+            return ResponseBean.success(taRecommendCustomerService.getCustomerList(status,pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, customerType, getOrgId(request),getTaPersonBuildingListByUserId(request),sceneType, startCreateDate, endCreateDate, sharePersonName));
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);

src/main/java/com/huiju/estateagents/excel/IntentionUser.java

@@ -76,4 +76,19 @@ public class IntentionUser {
     @ColumnWidth(15)
     @ExcelProperty(value = "性别", index = 9)
     private String gender;
+
+    /**
+     * 来源
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "用户来源", index = 10)
+    private String personFrom;
+
+    /**
+     * 推广人
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "推广人", index =11)
+    private String recommendPerson;
+
 }

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

@@ -33,7 +33,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
 
     TaRecommendCustomer getCustomerById(@Param("customerId")String customerId);
 
-    IPage<TaRecommendCustomer> getCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId,@Param("status")Integer status, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList,@Param("sceneType") String sceneType, @Param("startCreateDate") String startCreateDate, @Param("endCreateDate") String endCreateDate);
+    IPage<TaRecommendCustomer> getCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId,@Param("status")Integer status, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList,@Param("sceneType") String sceneType, @Param("startCreateDate") String startCreateDate, @Param("endCreateDate") String endCreateDate, @Param("sharePersonName") String sharePersonName);
     IPage<TaRecommendCustomer> getRecCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
     IPage<TaRecommendCustomer> getRepCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
     IPage<TaPerson> getIndependentAgents(IPage<TaPerson>page, @Param("name") String name, @Param("tel") String tel, @Param("orgId") Integer orgId);
@@ -49,7 +49,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param personBuildingList
      * @return
      */
-    IPage<TaPerson> getPublicCustomerList(IPage<TaPerson> page, @Param("name") String name, @Param("tel") String tel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("consultTel") String consultTel, @Param("sceneType") String sceneType,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList,@Param("buildingId") String buildingId, @Param("startCreateDate") String startCreateDate, @Param("endCreateDate") String endCreateDate);
+    IPage<TaPerson> getPublicCustomerList(IPage<TaPerson> page, @Param("name") String name, @Param("tel") String tel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("consultTel") String consultTel, @Param("sceneType") String sceneType,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList,@Param("buildingId") String buildingId, @Param("startCreateDate") String startCreateDate, @Param("endCreateDate") String endCreateDate, @Param("sharePersonName") String sharePersonName);
 
     /**
      * 导出数据 获取推荐用户数据

src/main/java/com/huiju/estateagents/service/ITaRecommendCustomerService.java

@@ -37,7 +37,7 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
 
     IPage<TaRecommendCustomer> getUnSignedCustomerList(int pageNumber, int pageSize, String building,String personId);
 
-    IPage getCustomerList(Integer status,int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, String customerType, Integer orgId,List<TaPersonBuilding> taPersonBuildingList,String sceneType, String startCreateDate, String endCreateDate);
+    IPage getCustomerList(Integer status,int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, String customerType, Integer orgId,List<TaPersonBuilding> taPersonBuildingList,String sceneType, String startCreateDate, String endCreateDate, String sharePersonName);
 
     IPage<TaRecommendCustomer> getRecCustomerList(int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, Integer orgId,List<TaPersonBuilding> taPersonBuildingList);
 

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaBuilding;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaPersonVisitRecord;
@@ -461,6 +462,10 @@ public class StatisticalServiceImpl implements IStatisticalService {
         }else if ("ascend".equals(sortOrder)){
             orderType = "asc";
         }
+        if(StringUtils.isEmpty(sortField)){
+            sortField = "kh_num";
+            orderType = "desc";
+        }
         IPage<StatsBuilding> pg = new Page<>(pageNum, pageSize);
         IPage<StatsBuilding> page = taBuildingMapper.getStatsTableList(pg, orgId, startDate, endDate, buildingId, personBuildingList,sortField,orderType);
         return ResponseBean.success(page);

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

@@ -531,17 +531,17 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
     @Override
-    public IPage getCustomerList(Integer status, int pageNumber, int pageSize, String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, String customerType, Integer orgId, List<TaPersonBuilding> taPersonBuildingList, String sceneType, String startCreateDate, String endCreateDate) {
+    public IPage getCustomerList(Integer status, int pageNumber, int pageSize, String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, String customerType, Integer orgId, List<TaPersonBuilding> taPersonBuildingList, String sceneType, String startCreateDate, String endCreateDate, String sharePersonName) {
 
         if (CommConstant.CUTOMER_TYPE_PUBLIC.equals(customerType)) {
             // 公客
             IPage<TaPerson> page = new Page<>(pageNumber, pageSize);
             // 公客就不用 buildingId 进行查询
-            return taRecommendCustomerMapper.getPublicCustomerList(page, name, tel, entryType, verifyStatus, sex, orgId, consultTel, sceneType, taPersonBuildingList, building, startCreateDate, endCreateDate);
+            return taRecommendCustomerMapper.getPublicCustomerList(page, name, tel, entryType, verifyStatus, sex, orgId, consultTel, sceneType, taPersonBuildingList, building, startCreateDate, endCreateDate, sharePersonName);
         } else {
             // 私客
             IPage<TaRecommendCustomer> page = new Page<>(pageNumber, pageSize);
-            return taRecommendCustomerMapper.getCustomerList(page, building, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId, status, taPersonBuildingList, sceneType, startCreateDate, endCreateDate);
+            return taRecommendCustomerMapper.getCustomerList(page, building, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId, status, taPersonBuildingList, sceneType, startCreateDate, endCreateDate, sharePersonName);
         }
 
     }

src/main/resources/mapper/TaPersonIntentionRecordMapper.xml

@@ -43,7 +43,8 @@
         ORDER BY SUM(tpir.intention) DESC
     </select>
     <select id="selectExportIntentionUser" resultType="com.huiju.estateagents.excel.IntentionUser">
-        select t.*, IFNULL(b.nickname, c.user_name) as sharePersonName, ifnull(b.phone, c.phone) as sharePersonPhone From (
+        select t.*, IFNULL(b.nickname, c.user_name) as sharePersonName, ifnull(b.phone, c.phone) as sharePersonPhone, b1.scene_alias as personFrom, e.nickname as recommendPerson
+        From (
 
         SELECT
         tpir.person_name as person_name,
@@ -73,6 +74,9 @@
         left join ta_share_person_from a on t.person_id = a.person_id
         left join ta_user c on a.share_person = c.user_id
         left join ta_person b on a.share_person = b.person_id
+        left join ta_person_from_record d on t.person_id = d.share_person_id and d.is_first_time = 1 and d.org_id = #{orgId}
+        left join td_wx_dict b1 on d.scene_id = b1.scene_id
+        left join ta_person e on d.person_id = e.person_id
 
         <trim prefix="where" prefixOverrides="and | or">
             <if test="buildingId != null and buildingId != ''">

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -218,6 +218,9 @@ FROM
             <if test="endCreateDate != null and endCreateDate !=''">
                 and a.create_Date  &lt;= #{endCreateDate}
             </if>
+            <if test="sharePersonName != null and sharePersonName !=''">
+                and (c.nickName like CONCAT('%',#{sharePersonName}, '%') or c.name like CONCAT('%',#{sharePersonName}, '%'))
+            </if>
             <if test="personBuildingList != null and personBuildingList.size > 0">
                 AND a.building_id in
                 <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
@@ -281,6 +284,9 @@ FROM
             <if test="buildingId != null and buildingId !=''">
                 AND b.building_id = #{buildingId}
             </if>
+            <if test="sharePersonName != null and sharePersonName !=''">
+                and (c.nickName like CONCAT('%',#{sharePersonName}, '%') or c.name like CONCAT('%',#{sharePersonName}, '%'))
+            </if>
 <!--            and NOT EXISTS ( select * from ta_recommend_customer a where a.org_id = #{orgId} and a.recommend_person = b.person_id)-->
             <if test="personBuildingList != null and personBuildingList.size > 0">
                 AND b.building_id in
@@ -670,12 +676,13 @@ FROM
         t.building_name,
         z.intention,
         a.create_date,
-        concat(a.country,a.province) as province,
+        concat(tp.country, tp.province) as province,
         w.scene_alias as scene_type,
         IFNULL( c.NAME, c.nickname ) AS sharePersonName,
         s.points
         FROM
         ta_recommend_customer a
+        left join ta_person tp on tp.person_id = a.person_id
         LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
         LEFT JOIN ta_user d on d.user_id = a.realty_consultant
         LEFT JOIN ta_person_from_record p ON a.person_id = p.person_id AND p.is_first_time = 1 and p.org_id = #{orgId}

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

@@ -2280,7 +2280,7 @@
         GROUP BY
         t.person_id ) as t
         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}
+        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_user d on c.realty_consultant = d.user_id