傅行帆 5 年之前
父節點
當前提交
a60be50396

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java 查看文件

819
 //            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
819
 //            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
820
 //            List<PublicCustomerExport> publicList = null;
820
 //            List<PublicCustomerExport> publicList = null;
821
 //            do {
821
 //            do {
822
-                List<PublicCustomerExport> publicList = taRecommendCustomerMapper.getPublicCustomerExportList(pageCode * pageSize, pageSize, buildingId, name, tel,  entryType, verifyStatus, sex, orgId,consultTel,sceneType);
822
+                List<PublicCustomerExport> publicList = taRecommendCustomerMapper.getPublicCustomerExportList(pageCode * pageSize, pageSize, buildingId, name, tel,  entryType, verifyStatus, sex, orgId,consultTel,sceneType,getTaPersonBuildingListByUserId(request));
823
                 excelWriter.write(publicList, writeSheet);
823
                 excelWriter.write(publicList, writeSheet);
824
 
824
 
825
 //                pageCode ++;
825
 //                pageCode ++;

+ 3
- 4
src/main/java/com/huiju/estateagents/entity/ExtendContent.java 查看文件

1
 package com.huiju.estateagents.entity;
1
 package com.huiju.estateagents.entity;
2
 
2
 
3
-import com.baomidou.mybatisplus.annotation.TableField;
4
-import com.baomidou.mybatisplus.annotation.TableName;
5
-import com.baomidou.mybatisplus.annotation.IdType;
6
-import com.baomidou.mybatisplus.annotation.TableId;
3
+import com.baomidou.mybatisplus.annotation.*;
4
+
7
 import java.time.LocalDateTime;
5
 import java.time.LocalDateTime;
8
 import java.io.Serializable;
6
 import java.io.Serializable;
9
 import lombok.Data;
7
 import lombok.Data;
104
     /**
102
     /**
105
      * 排序
103
      * 排序
106
      */
104
      */
105
+    @TableField(strategy = FieldStrategy.IGNORED)
107
     private Integer orderNo;
106
     private Integer orderNo;
108
 }
107
 }

+ 1
- 1
src/main/java/com/huiju/estateagents/mapper/TaRecommendCustomerMapper.java 查看文件

119
      * @param consultTel
119
      * @param consultTel
120
      * @return
120
      * @return
121
      */
121
      */
122
-    List<PublicCustomerExport> getPublicCustomerExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("buildingId")String buildingId, @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);
122
+    List<PublicCustomerExport> getPublicCustomerExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("buildingId")String buildingId, @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);
123
 
123
 
124
     /**
124
     /**
125
      * 导出数据 私客总数
125
      * 导出数据 私客总数

+ 6
- 0
src/main/resources/mapper/TaRecommendCustomerMapper.xml 查看文件

567
             <if test="buildingId != null and buildingId !=''">
567
             <if test="buildingId != null and buildingId !=''">
568
                 AND r.building_id = #{buildingId}
568
                 AND r.building_id = #{buildingId}
569
             </if>
569
             </if>
570
+            <if test="personBuildingList != null and personBuildingList.size > 0">
571
+                AND r.building_id in
572
+                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
573
+                    #{personBuilding.buildingId}
574
+                </foreach>
575
+            </if>
570
             <if test="tel != null and tel!=''">
576
             <if test="tel != null and tel!=''">
571
                 and b.phone like CONCAT('%',#{tel}, '%')
577
                 and b.phone like CONCAT('%',#{tel}, '%')
572
             </if>
578
             </if>