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

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -24,7 +24,7 @@ public class CommConstant {
     public final static String PERSON_ESTATE_CUSTOMER = "customer";
 
     /**
-     * 人员类型: 客户
+     * 人员类型: 渠道经纪人
      */
     public final static String PERSON_ESTATE_CHANNEL = "channel agent";
 
@@ -363,4 +363,9 @@ public class CommConstant {
     public static final Integer NOT_PUBLISH = 0;
     // ------- 政策发布状态 end -------
 
+    // 公客
+    public static final String CUTOMER_TYPE_PUBLIC = "public";
+    // 私客
+    public static final String CUTOMER_TYPE_PRIVATE = "private";
+
 }

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

@@ -77,8 +77,8 @@ public class TaBuildingDynamicController extends BaseController {
                                              @RequestParam(required = false)String buildingId,
                                              @RequestParam(required = false)String title,
                                              @RequestParam(required = false)String isEnlist,
-                                             @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime time){
-        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize,name,buildingId,cityId,isEnlist,time,title);
+                                             @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime time,HttpServletRequest request){
+        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize,name,buildingId,cityId,isEnlist,time,title,getOrgId(request));
         return responseBean;
     }
 
@@ -216,8 +216,7 @@ public class TaBuildingDynamicController extends BaseController {
     public  ResponseBean buildingDynamicUpdate(@RequestBody String parameter,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         TaBuildingDynamic dynamic = JSONObject.parseObject(parameter, TaBuildingDynamic.class);
-        Map map = JWTUtils.getUserIdAndOrgId(request);
-        dynamic.setOrgId(Integer.valueOf(map.get("orgId").toString()));
+        dynamic.setOrgId(getOrgId(request));
         QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
         Integer cityId = iTaBuildingService.getCityById(dynamic.getBuildingId());
         dynamic.setCityId(cityId);
@@ -227,10 +226,11 @@ public class TaBuildingDynamicController extends BaseController {
     }
 
     @RequestMapping(value = "/admin/buildingDynamic/weight" ,method =RequestMethod.PUT)
-    public  ResponseBean buildingDynamicWeight(@RequestParam String dynamicId,@RequestParam Integer weight){
+    public  ResponseBean buildingDynamicWeight(@RequestParam String dynamicId,@RequestParam Integer weight,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         TaBuildingDynamic dynamic = iBuildingDynamicService.getById(dynamicId);
         dynamic.setWeight(weight);
+        dynamic.setOrgId(getOrgId(request));
         QueryWrapper<TaBuildingDynamic> dynamicQueryWrapper = new QueryWrapper<>();
         dynamicQueryWrapper.eq("dynamic_id",dynamic);
         if (iBuildingDynamicService.updateById(dynamic)){

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

@@ -149,7 +149,7 @@ public class TaRecommendCustomerController extends BaseController {
         }
     }
 
-    // 客户列表
+    // 客户列表 公客/私客
     @GetMapping("/admin/customer/recommend")
     public ResponseBean getCustomerList (@RequestParam(value ="name",required = false) String name,
                                          @RequestParam(value ="tel",required = false) String tel,
@@ -160,9 +160,10 @@ public class TaRecommendCustomerController extends BaseController {
                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                          @RequestParam(value ="entryType",required = false) String entryType,
                                          @RequestParam(value ="verifyStatus",required = false) String verifyStatus,
-                                         @RequestParam(value = "sex",required = false)Integer sex){
+                                         @RequestParam(value = "sex",required = false)Integer sex,
+                                         @RequestParam(value = "customerType") String customerType){ // public 公  private 私
         try{
-            return ResponseBean.success(taRecommendCustomerService.getCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex));
+            return ResponseBean.success(taRecommendCustomerService.getCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, customerType));
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
@@ -213,14 +214,21 @@ public class TaRecommendCustomerController extends BaseController {
     }
 
 
-    //独立经纪人列表
+    /**
+     * 经纪人列表
+     * @param name
+     * @param tel
+     * @param pageNumber
+     * @param pageSize
+     * @return
+     */
     @GetMapping("/admin/customer/agents")
     public ResponseBean getIndependentAgents (@RequestParam(value ="name",required = false) String name,
                                             @RequestParam(value ="tel",required = false) String tel,
                                             @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
         try{
-            return ResponseBean.success(taRecommendCustomerService.getIndependentAgents(pageNumber,pageSize,name,tel));
+            return ResponseBean.success(taRecommendCustomerService.getIndependentAgents(pageNumber,pageSize,name,tel, null));
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);

src/main/java/com/huiju/estateagents/entity/TaPerson.java

@@ -246,4 +246,10 @@ public class TaPerson implements Serializable {
 
     @TableField(exist = false)
     private TaOrg org;
+
+    /**
+     * 渠道名称
+     */
+    @TableField(exist = false)
+    private String channelName;
 }

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

@@ -27,7 +27,7 @@ public interface TaBuildingDynamicMapper extends BaseMapper<TaBuildingDynamic> {
      * @param page
      * @return
      */
-    IPage<TaBuildingDynamic> buildingDynamicList(Page page, @Param("name") String name, @Param("buildingId") String buildingId,@Param("cityId") Integer cityId,@Param("isEnlist") String isEnlist,@Param("time")LocalDateTime time,@Param("title") String title);
+    IPage<TaBuildingDynamic> buildingDynamicList(Page page, @Param("name") String name, @Param("buildingId") String buildingId,@Param("cityId") Integer cityId,@Param("isEnlist") String isEnlist,@Param("time")LocalDateTime time,@Param("title") String title,@Param("orgId") Integer orgId);
 
     /**
      * 详情

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

@@ -29,5 +29,17 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
     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);
     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);
     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);
-    IPage<TaPerson> getIndependentAgents(IPage<TaPerson>page, @Param("name") String name, @Param("tel") String tel);
+    IPage<TaPerson> getIndependentAgents(IPage<TaPerson>page, @Param("name") String name, @Param("tel") String tel, @Param("orgId") Integer orgId);
+
+    /**
+     * 公客
+     * @param page
+     * @param name
+     * @param tel
+     * @param entryType
+     * @param verifyStatus
+     * @param sex
+     * @return
+     */
+    IPage<TaRecommendCustomer> getPublicCustomerList(IPage<TaPerson> page, @Param("name") String name, @Param("tel") String tel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex);
 }

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

@@ -25,7 +25,7 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
      * 项目动态管理列表
      * @return
      */
-    ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time,String title);
+    ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time,String title,Integer orgId);
 
     /**
      * 项目详情

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

@@ -28,13 +28,13 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
 
     IPage<TaRecommendCustomer> getUnSignedCustomerList(int pageNumber, int pageSize, String building,String personId);
 
-    IPage<TaRecommendCustomer> getCustomerList(int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex);
+    IPage<TaRecommendCustomer> getCustomerList(int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, String customerType);
 
     IPage<TaRecommendCustomer> getRecCustomerList(int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex);
 
     IPage<TaRecommendCustomer> getRepCustomerList(int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex);
 
-    IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize,String name,String tel);
+    IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize,String name,String tel, Integer orgId);
 
 
     TaRecommendCustomer getCustomerDetail(String customerId);

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

@@ -64,12 +64,12 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         binder.registerCustomEditor(Date.class, editor);
     }
     @Override
-    public ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time,String title) {
+    public ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time,String title,Integer orgId) {
         Page<TaBuildingDynamic> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);
         page.setCurrent(pageNum == null ? 1 : pageNum);
 
-        IPage<TaBuildingDynamic> buildingDynamic = buildingDynamicMapper.buildingDynamicList(page, name, buildingId,cityId,isEnlist,time,title);
+        IPage<TaBuildingDynamic> buildingDynamic = buildingDynamicMapper.buildingDynamicList(page, name, buildingId,cityId,isEnlist,time,title,orgId);
         List<TaBuildingDynamic> buildingDynamicList = buildingDynamic.getRecords();
         for (TaBuildingDynamic taBuildingDynamic:buildingDynamicList){
             QueryWrapper<TaActivityDynamicEnlist> taActivityDynamicEnlist= new QueryWrapper<>();

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

@@ -332,15 +332,25 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
     @Override
-    public IPage<TaRecommendCustomer> getCustomerList(int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex){
-        IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
-        return taRecommendCustomerMapper.getCustomerList(page,building,name,tel,consultName,consultTel,entryType,verifyStatus,sex);
+    public IPage<TaRecommendCustomer> getCustomerList(int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, String customerType){
+
+        IPage<TaRecommendCustomer> customerList = null;
+        if (CommConstant.CUTOMER_TYPE_PUBLIC.equals(customerType)) {
+            // 公客
+            IPage<TaPerson>page = new Page<>(pageNumber,pageSize);
+            return taRecommendCustomerMapper.getPublicCustomerList(page, name, tel,  entryType, verifyStatus, sex);
+        } else {
+            // 私客
+            IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
+            return taRecommendCustomerMapper.getCustomerList(page, building, name, tel, consultName, consultTel, entryType, verifyStatus, sex);
+        }
+
     }
 
     @Override
-    public IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize,String name,String tel){
+    public IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize,String name,String tel, Integer orgId){
         IPage<TaPerson>page = new Page<>(pageNumber,pageSize);
-        return taRecommendCustomerMapper.getIndependentAgents(page,name,tel);
+        return taRecommendCustomerMapper.getIndependentAgents(page,name,tel, orgId);
     }
 
     @Override

src/main/resources/mapper/TaBuildingDynamicMapper.xml

@@ -33,6 +33,9 @@
         <if test="title != null and title != ''">
             and title = #{title}
         </if>
+        <if test="orgId != null and orgId != ''">
+            and org_id = #{orgId}
+        </if>
         <if test="time != null">
             and TO_DAYS(create_date) = TO_DAYS(#{time})
         </if>

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -73,23 +73,29 @@ FROM
 
     <select id="getIndependentAgents" resultType="com.huiju.estateagents.entity.TaPerson">
         SELECT
-	a.*
-FROM
-	ta_person a
-<where>
-    a.person_type = 'estate agent'
-    and a.status >0
-    <if test="name != null and name !=''">
-        and a.nickname = #{name}
-    </if>
-    <if test="tel != null and tel!=''">
-        and a.phone = #{tel}
-    </if>
+            a.*,
+            tc.channel_name as channelName
+        FROM
+            ta_person a
+            left join ta_channel_person tcp on a.person_id = tcp.person_id
+            left join ta_channel tc on tc.channel_id = tcp.channel_id
+        <where>
+            a.person_type = 'estate agent'
+            and a.status >0
+            <if test="name != null and name !=''">
+                and a.nickname = #{name}
+            </if>
+            <if test="tel != null and tel!=''">
+                and a.phone = #{tel}
+            </if>
+            <if test="orgId != null">
+                and a.org_id = #{orgId}
+            </if>
 
-</where>
+        </where>
 
-ORDER BY
-	create_date DESC
+        ORDER BY
+            create_date DESC
     </select>
 
     <select id="getRepCustomerList" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
@@ -145,6 +151,7 @@ ORDER BY
         LEFT JOIN ta_person c on a.recommend_person = c.person_id
         <where>
             a.status > 0
+            and realty_consultant is not null
             <if test="building != null and building !=''">
                 and a.building_id = #{building}
             </if>
@@ -181,4 +188,29 @@ FROM
 	LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
 	WHERE a.customer_id = #{customerId}
     </select>
+
+    <select id="getPublicCustomerList" resultType="com.huiju.estateagents.entity.TaPerson">
+        SELECT
+        b.*
+        FROM
+        ta_person b
+        <where>
+            b.status > 0
+            AND IFNULL(b.person_type, '') in ('estate agent', 'customer')
+            <if test="name != null and name !=''">
+                and b.nickname = #{name}
+            </if>
+            <if test="tel != null and tel!=''">
+                and b.phone = #{tel}
+            </if>
+            <if test="entryType != null and entryType !=''">
+                and b.entry_type = #{entryType}
+            </if>
+            <if test="sex != null and sex !=''">
+                and b.sex = #{sex}
+            </if>
+            and NOT EXISTS ( select * from ta_recommend_customer a where a.recommend_person = b.person_id)
+        </where>
+        order by b.create_date desc
+    </select>
 </mapper>