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

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

@@ -128,6 +128,9 @@ public class TaPointsRecordsController extends BaseController {
                     case CommConstant.POINTS_CHANGE_ACTIVITY_CHECKIN:
                         result.getRecords().get(i).setRecordName("活动签到");
                         break;
+                    case CommConstant.POINTS_CHANGE_DOCUMENT_VERIFY:
+                        result.getRecords().get(i).setRecordName("资料审核");
+                        break;
                 }
             }
             responseBean.addSuccess(result);

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

@@ -578,13 +578,22 @@ public class TaRecommendCustomerController extends BaseController {
      * 导出数据(报备客户)
      */
     @GetMapping("/admin/customer/recommend/report/export")
-    public void reportExport(HttpServletRequest request, HttpServletResponse response) throws IOException {
+    public void reportExport(HttpServletRequest request,
+                             HttpServletResponse response,
+                             @RequestParam(value ="name",required = false) String name,
+                             @RequestParam(value ="tel",required = false) String tel,
+                             @RequestParam(value ="buildingId",required = false) String buildingId,
+                             @RequestParam(value ="consultName",required = false) String consultName,
+                             @RequestParam(value ="consultTel",required = false) String consultTel,
+                             @RequestParam(value ="entryType",required = false) String entryType,
+                             @RequestParam(value ="verifyStatus",required = false) String verifyStatus,
+                             @RequestParam(value = "sex",required = false)Integer sex) throws IOException {
 //        response.setContentType("application/vnd.ms-excel");
         response.setContentType("application/octet-stream");
         response.setCharacterEncoding("utf-8");
         response.setHeader("Content-disposition", "attachment;filename=报备客户.xlsx");
 
-        Integer count = taRecommendCustomerService.getRepCustomerReportCount(getOrgId(request));
+        Integer count = taRecommendCustomerService.getRepCustomerReportCount(buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex,getOrgId(request));
 
         Integer pageCode = 0;
         Integer pageSize = 100;
@@ -596,7 +605,7 @@ public class TaRecommendCustomerController extends BaseController {
         WriteSheet writeSheet = EasyExcel.writerSheet("报备客户").build();
         List<ReporRecommendCustomer> recCustomerExport = null;
         do {
-            recCustomerExport = taRecommendCustomerService.getRepCustomerReportExport(getOrgId(request), pageCode * pageSize, pageSize);
+            recCustomerExport = taRecommendCustomerService.getRepCustomerReportExport(buildingId, name, tel, consultName, consultTel, entryType, verifyStatus, sex, getOrgId(request), pageCode * pageSize, pageSize);
             excelWriter.write(recCustomerExport, writeSheet);
 
             pageCode ++;

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

@@ -39,7 +39,7 @@ public class ReporRecommendCustomer {
      */
     @ColumnWidth(15)
     @ExcelProperty(value = "意向项目", index = 3)
-    private String intention;
+    private String intentionName;
 
     /**
      * 置业顾问

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

@@ -65,14 +65,14 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param orgId
      * @return
      */
-    Integer getRepCustomerReportCount(@Param("orgId")Integer orgId);
+    Integer getRepCustomerReportCount(@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 orgId
      * @return
      */
-    List<ReporRecommendCustomer> getRepCustomerReportExport(@Param("orgId") Integer orgId, @Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize);
+    List<ReporRecommendCustomer> getRepCustomerReportExport(@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("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize);
 
     /**
      * 导出数据 获取经纪人数据 总数

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

@@ -69,7 +69,7 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
      * @param orgId
      * @return
      */
-    Integer getRepCustomerReportCount(Integer orgId);
+    Integer getRepCustomerReportCount(String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, Integer orgId);
 
     /**
      * 导出数据(报备客户)
@@ -78,7 +78,7 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
      * @param pageSize
      * @return
      */
-    List<ReporRecommendCustomer> getRepCustomerReportExport(Integer orgId, Integer pageCode, Integer pageSize);
+    List<ReporRecommendCustomer> getRepCustomerReportExport(String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, Integer orgId, Integer pageCode, Integer pageSize);
 
     /**
      * 导出数据(经纪人) 总数

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

@@ -547,13 +547,13 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
 
     @Override
-    public Integer getRepCustomerReportCount(Integer orgId) {
-        return taRecommendCustomerMapper.getRepCustomerReportCount(orgId);
+    public Integer getRepCustomerReportCount(String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex,Integer orgId) {
+        return taRecommendCustomerMapper.getRepCustomerReportCount(building, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId);
     }
 
     @Override
-    public List<ReporRecommendCustomer> getRepCustomerReportExport(Integer orgId, Integer pageCode, Integer pageSize) {
-        return taRecommendCustomerMapper.getRepCustomerReportExport(orgId, pageCode, pageSize);
+    public List<ReporRecommendCustomer> getRepCustomerReportExport(String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, Integer orgId, Integer pageCode, Integer pageSize) {
+        return taRecommendCustomerMapper.getRepCustomerReportExport(building, name, tel, consultName, consultTel, entryType,verifyStatus,sex, orgId, pageCode, pageSize);
     }
 
 

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -282,32 +282,85 @@ FROM
         FROM
         ta_recommend_customer a
         LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
+        LEFT JOIN ta_building c ON a.building_id = c.building_id
         <where>
             a.status > 0
             and a.report_recommend_status = 1
             <if test="orgId != null">
                 and a.org_id = #{orgId}
             </if>
+            <if test="building != null and building !=''">
+                and a.building_id = #{building}
+            </if>
+            <if test="name != null and name !=''">
+                and a.name = #{name}
+            </if>
+            <if test="tel != null and tel!=''">
+                and a.phone like concat(concat("%",#{tel}),"%")
+            </if>
+            <if test="consultName != null and consultName !=''">
+                and b.name like CONCAT('%',#{consultName}, '%')
+            </if>
+            <if test="consultTel != null and consultTel !=''">
+                and b.tel = #{consultTel}
+            </if>
+            <if test="entryType != null and entryType !=''">
+                and a.entry_type = #{entryType}
+            </if>
+            <if test="verifyStatus != null and verifyStatus !=''">
+                and a.verify_status = #{verifyStatus}
+            </if>
+            <if test="sex != null and sex !=''">
+                and a.sex = #{sex}
+                and a.org_id = #{orgid}
+            </if>
         </where>
+        order by a.create_date desc
     </select>
 
     <select id="getRepCustomerReportExport" resultType="com.huiju.estateagents.excel.ReporRecommendCustomer" >
         SELECT
         a.name as name,
         a.phone as phone,
-        a.intention as intention,
+        c.building_name as intentionName,
         if(a.sex = 1, '男',if(a.sex = 2, '女', '未知')) as sex,
         b.NAME AS consultantName,
         b.tel AS consultTel
         FROM
         ta_recommend_customer a
         LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
+        LEFT JOIN ta_building c ON a.building_id = c.building_id
         <where>
             a.status > 0
             and a.report_recommend_status = 1
             <if test="orgId != null">
                 and a.org_id = #{orgId}
             </if>
+            <if test="building != null and building !=''">
+                and a.building_id = #{building}
+            </if>
+            <if test="name != null and name !=''">
+                and a.name = #{name}
+            </if>
+            <if test="tel != null and tel!=''">
+                and a.phone like concat(concat("%",#{tel}),"%")
+            </if>
+            <if test="consultName != null and consultName !=''">
+                and b.name like CONCAT('%',#{consultName}, '%')
+            </if>
+            <if test="consultTel != null and consultTel !=''">
+                and b.tel = #{consultTel}
+            </if>
+            <if test="entryType != null and entryType !=''">
+                and a.entry_type = #{entryType}
+            </if>
+            <if test="verifyStatus != null and verifyStatus !=''">
+                and a.verify_status = #{verifyStatus}
+            </if>
+            <if test="sex != null and sex !=''">
+                and a.sex = #{sex}
+                and a.org_id = #{orgid}
+            </if>
         </where>
         order by a.create_date desc
         limit #{pageCode}, #{pageSize}