bug fix

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

@@ -767,7 +767,8 @@ public class TaRecommendCustomerController extends BaseController {
                                          @RequestParam(value ="verifyStatus",required = false) String verifyStatus,
                                          @RequestParam(value = "sex",required = false)Integer sex,
                                          @RequestParam(value = "customerType") String customerType,
-                                         @RequestParam(value = "status",required = false) Integer status) throws IOException { // public 公  private 私
+                                         @RequestParam(value = "status",required = false) Integer status,
+                                       @RequestParam(value = "sceneType",required = false) String sceneType) throws IOException { // public 公  private 私
 
         //        response.setContentType("application/vnd.ms-excel");
         response.setContentType("application/octet-stream");
@@ -795,7 +796,7 @@ public class TaRecommendCustomerController extends BaseController {
 //            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
 //            List<PublicCustomerExport> publicList = null;
 //            do {
-                List<PublicCustomerExport> publicList = taRecommendCustomerMapper.getPublicCustomerExportList(pageCode * pageSize, pageSize, name, tel,  entryType, verifyStatus, sex, orgId,consultTel);
+                List<PublicCustomerExport> publicList = taRecommendCustomerMapper.getPublicCustomerExportList(pageCode * pageSize, pageSize, buildingId, name, tel,  entryType, verifyStatus, sex, orgId,consultTel,sceneType);
                 excelWriter.write(publicList, writeSheet);
 
 //                pageCode ++;
@@ -817,7 +818,7 @@ public class TaRecommendCustomerController extends BaseController {
 //            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
 //            List<PrivateCustomerExport> privateList = null;
 //            do {
-                List<PrivateCustomerExport> privateList = taRecommendCustomerMapper.getCustomerExportList(pageCode *  pageSize, pageSize, buildingId, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,status,getTaPersonBuildingListByUserId(request));
+                List<PrivateCustomerExport> privateList = taRecommendCustomerMapper.getCustomerExportList(pageCode *  pageSize, pageSize, buildingId, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,status,sceneType,getTaPersonBuildingListByUserId(request));
                 excelWriter.write(privateList, writeSheet);
 
 //                pageCode ++;

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

@@ -8,6 +8,7 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.service.ITaSharePersonFromService;
+import com.huiju.estateagents.service.ITdLiveDictService;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -22,6 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -40,6 +42,9 @@ public class TaSharePersonFromController extends BaseController {
     @Autowired
     public ITaSharePersonFromService iTaSharePersonFromService;
 
+    @Autowired
+    public ITdLiveDictService tdLiveDictService;
+
 
     /**
      * 分页查询列表
@@ -202,4 +207,27 @@ public class TaSharePersonFromController extends BaseController {
         }
         return responseBean;
     }
+
+    /**
+     * 查询直播平台列表
+     * @param pageNum
+     * @param pageSize
+     * @param request
+     * @return
+     */
+    @RequestMapping(value="api/admin/livePlatList",method= RequestMethod.GET)
+    public ResponseBean taLivePlatList (@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            QueryWrapper<TdLiveDict> tdLiveDictQueryWrapper = new QueryWrapper<>();
+            tdLiveDictQueryWrapper.eq("status", 1);
+            List<TdLiveDict> tdLiveDictList = tdLiveDictService.list(tdLiveDictQueryWrapper);
+            responseBean.addSuccess(tdLiveDictList);
+        }catch (Exception e){
+            e.printStackTrace();
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

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

@@ -118,7 +118,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param consultTel
      * @return
      */
-    List<PublicCustomerExport> getPublicCustomerExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @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);
+    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);
 
     /**
      * 导出数据 私客总数
@@ -152,7 +152,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param status
      * @return
      */
-    List<PrivateCustomerExport> getCustomerExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("building") String buildingId, @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);
+    List<PrivateCustomerExport> getCustomerExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("building") String buildingId, @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("sceneType") String sceneType,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
     
     /**
      * 获取我的客户的人数统计

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -537,15 +537,23 @@ FROM
           if(b.gender = 1, '男', if(b.gender = 2, '女', '未知')) as sex
         FROM
         ta_person b
+        LEFT JOIN ta_person_from_record r ON b.person_id = r.person_id AND r.is_first_time = 1 and r.org_id = #{orgId}
+        left join td_wx_dict d on r.scene_id = d.scene_id
         <where>
             b.status > 0
             AND IFNULL(b.person_type, '') in ('estate agent', 'customer')
             <if test="name != null and name !=''">
                 and b.nickname like CONCAT('%',#{name}, '%')
             </if>
+            <if test="buildingId != null and buildingId !=''">
+                AND r.building_id = #{buildingId}
+            </if>
             <if test="tel != null and tel!=''">
                 and b.phone like CONCAT('%',#{tel}, '%')
             </if>
+            <if test="sceneType !=null and sceneType !=''">
+                and d.scene_type = #{sceneType}
+            </if>
             <if test="entryType != null and entryType !=''">
                 and b.entry_type = #{entryType}
             </if>
@@ -636,8 +644,9 @@ FROM
         LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
         LEFT JOIN ta_person c ON a.realty_consultant = c.user_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
+        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}
         left join ta_building t on a.building_id = t.building_id
+        LEFT JOIN td_wx_dict w ON p.scene_id = w.scene_id
         <where>
             a.status > 0
             and a.verify_status = 1
@@ -679,6 +688,9 @@ FROM
                     #{personBuilding.buildingId}
                 </foreach>
             </if>
+            <if test="sceneType !=null and sceneType !=''">
+                and p.scene_type = #{sceneType}
+            </if>
         </where>
         group by a.customer_id,a.building_id
         order by a.create_date desc