提交

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

         ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), ExcelRecommendCustomer.class).registerWriteHandler(new CustomCellWriteHandler()).build();
         // 设置 sheet, 同一个sheet只需要设置一次
         WriteSheet writeSheet = EasyExcel.writerSheet("推荐客户").build();
-        List<ExcelRecommendCustomer> recCustomerExport = null;
         do {
-            recCustomerExport = taRecommendCustomerService.getRecCustomerExport(getOrgId(request), pageCode, pageSize);
+            List<ExcelRecommendCustomer> recCustomerExport = taRecommendCustomerService.getRecCustomerExport(getOrgId(request), pageCode, pageSize);
             excelWriter.write(recCustomerExport, writeSheet);
 
             pageCode ++;
         // 总页数
         Integer pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
         // 设置读取的class
-        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), ExcelRecommendCustomer.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), ReporRecommendCustomer.class).registerWriteHandler(new CustomCellWriteHandler()).build();
         // 设置 sheet, 同一个sheet只需要设置一次
         WriteSheet writeSheet = EasyExcel.writerSheet("报备客户").build();
         List<ReporRecommendCustomer> recCustomerExport = null;
         // 总页数
         Integer pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
         // 设置读取的class
-        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), ExcelRecommendCustomer.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), AgentsRecommendCustomer.class).registerWriteHandler(new CustomCellWriteHandler()).build();
         // 设置 sheet, 同一个sheet只需要设置一次
         WriteSheet writeSheet = EasyExcel.writerSheet("经纪人").build();
         List<AgentsRecommendCustomer> recCustomerExport = null;

src/main/resources/mapper/TaRecommendCustomerMapper.xml

         </where>
 
         ORDER BY
-        create_date DESC
+        a.create_date DESC
     </select>
 
     <select id="getIndependentAgentsExport" resultType="com.huiju.estateagents.excel.AgentsRecommendCustomer">
         a.nickname as nickname,
         a.phone as phone,
         if(a.gender = '1', '男', if(a.gender = '2', '女', '未知')) as gender,
-        a.personType as personType,
-        if(ifnull(tc.channel_name, '') != '', '渠道经纪人', '独立经纪人')  as channelName
+        if(ifnull(tc.channel_name, '') != '', '渠道经纪人', '独立经纪人') as personType,
+        tc.channel_name  as channelName
         FROM
         ta_person a
         left join ta_channel_person tcp on a.person_id = tcp.person_id