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

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

@@ -45,9 +45,9 @@ public class TaBuildingController extends BaseController {
      */
     @GetMapping("/admin/buildinglist")
     public ResponseBean buildingList(@RequestParam("pageNum")Integer pageNum,
-                                                         @RequestParam("pageSize")Integer pageSize,
-                                                         @RequestParam(value = "name", required = false)String name,
-                                                         @RequestParam(value = "code", required = false)String code){
+                                     @RequestParam("pageSize")Integer pageSize,
+                                     @RequestParam(value = "name", required = false)String name,
+                                     @RequestParam(value = "code", required = false)String code){
         return taBuildingService.buildingList(pageNum,pageSize,name,code);
     }
 

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

@@ -42,18 +42,16 @@ public class TaPointsExchangeController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taPointsExchange",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/taPointsExchange",method= RequestMethod.GET)
     public ResponseBean taPointsExchangeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                              @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
-		    IPage<TaPointsExchange> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaPointsExchange> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+            TaPointsExchange taPointsExchange = new TaPointsExchange();
+            
+            responseBean = iTaPointsExchangeService.selectList(pageNum,pageSize,taPointsExchange);
 
-            IPage<TaPointsExchange> result = iTaPointsExchangeService.page(pg, queryWrapper);
-            responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taPointsExchangeList -=- {}",e.toString());

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

@@ -87,14 +87,16 @@ public class TaRecommendCustomerController extends BaseController {
     }
 
     @PostMapping("/wx/customer/recommend")
-    public ResponseBean getUnSignedCustomerList (@RequestParam int pageNumber, @RequestParam int pageSize,HttpServletRequest request){
+    public ResponseBean getUnSignedCustomerList ( @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
+                                                  @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                                  @RequestParam(value ="today",defaultValue = "false") String buildingId,
+                                                  HttpServletRequest request){
         String openid = JWTUtils.getSubject(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson person = taPersons.get(0);
-        String buildingId = "";
         try{
             return ResponseBean.success(taRecommendCustomerService.getUnSignedCustomerList(pageNumber,pageSize,buildingId,person.getPersonId()));
         }catch (Exception e){
@@ -104,10 +106,15 @@ public class TaRecommendCustomerController extends BaseController {
     }
 
     @PostMapping("/customer/recommend")
-    public ResponseBean getCustomerList (@RequestParam int pageNumber, @RequestParam int pageSize){
+    public ResponseBean getCustomerList (@RequestParam(value ="name",defaultValue = "false") String name,
+                                         @RequestParam(value ="tel",defaultValue = "false") String tel,
+                                         @RequestParam(value ="buildingId",defaultValue = "false") String buildingId,
+                                         @RequestParam(value ="consultName",defaultValue = "false") String consultName,
+                                         @RequestParam(value ="consultTel",defaultValue = "false") String consultTel,
+                                         @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
+                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
         try{
-            String buildingId="";
-            return ResponseBean.success(taRecommendCustomerService.getCustomerList(pageNumber,pageSize,buildingId));
+            return ResponseBean.success(taRecommendCustomerService.getCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel));
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
@@ -193,4 +200,17 @@ public class TaRecommendCustomerController extends BaseController {
         }
         return responseBean;
     }
+
+    @PostMapping("/customer/recommend/drift")
+    public ResponseBean getDriftCustomerList (@RequestParam(value ="buildingId",defaultValue = "false") String buildingId,
+                                         @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
+                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        try{
+            return ResponseBean.success(taPersonService.getDriftCustomerList(pageNumber,pageSize,buildingId));
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
 }

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

@@ -156,6 +156,26 @@ public class TaBuilding implements Serializable {
 
     private String buildingRestaurant;
 
+    private String greeningRate;
+
+    private String buildingType;
+
+    private String serviceBuilding;
+
+    private String serviceFee;
+
+    private String decoration;
+
+    private String receivedDate;
+
+    private String rightsYear;
+
+    private String familyNum;
+
+    private String parkingRate;
+
+    private String volumeRate;
+
 
     /**
      * 图片

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -89,6 +90,11 @@ public class TaPointsExchange implements Serializable {
      * 创建时间
      */
     private LocalDateTime createDate;
+    
+    /**
+     * 领取时间
+     */
+    private LocalDateTime verifyDate;
 
     /**
      * 公司id
@@ -99,6 +105,19 @@ public class TaPointsExchange implements Serializable {
      * 楼盘id
      */
     private String buildingId;
-
-
+    
+    @TableField(exist = false)
+    private String personType;
+    
+    @TableField(exist = false)
+    private String startCreateDate;
+    
+    @TableField(exist = false)
+    private String endCreateDate;
+    
+    @TableField(exist = false)
+    private String startVerifyDate;
+    
+    @TableField(exist = false)
+    private String endVerifyDate;
 }

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

@@ -39,4 +39,8 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
 
     TaPerson selectByIdPerson(@Param("openid") String openid);
 
+    List<String> getConsultantByName(@Param("name")String name);
+
+    String getConsultantByTel(@Param("tel")String tel);
+
 }

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

@@ -1,9 +1,12 @@
 package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.entity.TaPointsExchange;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 积分兑换记录  Mapper 接口
@@ -14,5 +17,6 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface TaPointsExchangeMapper extends BaseMapper<TaPointsExchange> {
-
+	
+	List<TaPointsExchange> selectListByParams(Page page, TaPointsExchange taPointsExchange);
 }

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

@@ -53,4 +53,6 @@ public interface ITaPersonService extends IService<TaPerson> {
     List<TaPerson> getPersonsByOpenId(String openid);
 
     IPage<TaPerson> getDriftCustomerList (int pageNumber, int pageSize,String building);
+
+
 }

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

@@ -1,6 +1,8 @@
 package com.huiju.estateagents.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaPointsExchange;
 
 /**
@@ -12,5 +14,6 @@ import com.huiju.estateagents.entity.TaPointsExchange;
  * @since 2019-07-25
  */
 public interface ITaPointsExchangeService extends IService<TaPointsExchange> {
-
+	
+	ResponseBean selectList(Integer pageNum, Integer pageSize, TaPointsExchange taPointsExchange);
 }

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

@@ -25,7 +25,7 @@ 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);
+    IPage<TaRecommendCustomer> getCustomerList(int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel);
 
     TaRecommendCustomer getCustomerDetail(String customerId);
 

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

@@ -628,7 +628,9 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     public IPage<TaPerson> getDriftCustomerList (int pageNumber, int pageSize,String building){
         QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<>();
         queryWrapper.isNull("person_type");
-        queryWrapper.eq("building_id",building);
+        if(building.equals("") && null != building){
+            queryWrapper.eq("building_id",building);
+        }
         IPage<TaPerson> page = new Page<>(pageNumber, pageSize);
         return taPersonMapper.selectPage(page,queryWrapper);
     }

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

@@ -1,11 +1,17 @@
 package com.huiju.estateagents.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaPointsExchange;
 import com.huiju.estateagents.mapper.TaPointsExchangeMapper;
 import com.huiju.estateagents.service.ITaPointsExchangeService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 积分兑换记录  服务实现类
@@ -16,5 +22,23 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class TaPointsExchangeServiceImpl extends ServiceImpl<TaPointsExchangeMapper, TaPointsExchange> implements ITaPointsExchangeService {
-
+	
+	@Autowired
+	private TaPointsExchangeMapper taPointsExchangeMapper;
+	
+	
+	/**
+	 * 分页获取数据
+	 *
+	 * @param taPointsExchange
+	 * @return
+	 */
+	@Override
+	public ResponseBean selectList(Integer pageNum, Integer pageSize,TaPointsExchange taPointsExchange) {
+		Page page = new Page(pageNum,pageSize);
+		// 分页查询
+		List<TaPointsExchange> list = taPointsExchangeMapper.selectListByParams(page,taPointsExchange);
+		page.setRecords(list);
+		return ResponseBean.success(page);
+	}
 }

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

@@ -246,9 +246,26 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
     @Override
-    public IPage<TaRecommendCustomer> getCustomerList(int pageNumber, int pageSize,String building){
+    public IPage<TaRecommendCustomer> getCustomerList(int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel){
         QueryWrapper<TaRecommendCustomer>queryWrapper = new QueryWrapper<>();
-//        queryWrapper.eq("building_id",building);
+        if(building.equals("") && null != building){
+            queryWrapper.eq("building_id",building);
+        }
+        if(name.equals("") && null != name){
+            queryWrapper.like("name",name);
+        }
+        if(tel.equals("") && null != tel){
+            queryWrapper.eq("phone",tel);
+        }
+        if(consultName.equals("") && null != consultName){
+            List<String> consultIds = taPersonMapper.getConsultantByName(consultName);
+            queryWrapper.in("realty_consultant",consultIds);
+        }
+        if(consultTel.equals("") && null != consultTel){
+            String consultId = taPersonMapper.getConsultantByTel(consultTel);
+            queryWrapper.eq("realty_consultant",consultId);
+        }
+
         queryWrapper.gt("status", CommConstant.MESSAGE_UNREAD);
         IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
         return taRecommendCustomerMapper.selectPage(page,queryWrapper);

src/main/resources/mapper/TaPersonMapper.xml

@@ -105,4 +105,12 @@ FROM
         select * from ta_person where mini_openid = #{openid};
 
     </select>
+
+    <select id="getConsultantByName" resultType="java.lang.String">
+        select person_id from ta_person where name like CONCAT('%',#{name}, '%')
+    </select>
+
+    <select id="getConsultantByTel" resultType="java.lang.String">
+        select person_id from ta_person where tel = #{tel}
+    </select>
 </mapper>

src/main/resources/mapper/TaPointsExchangeMapper.xml

@@ -2,4 +2,27 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.TaPointsExchangeMapper">
 
+    <select id="selectListByParams" resultType="com.huiju.estateagents.entity.TaPointsExchange">
+        SELECT
+            t.rec_id,
+            t.person_id,
+            t.person_name,
+            t.phone,
+            t.avatar,
+            t.target_id,
+            t.target_name,
+            t.image,
+            t.points,
+            t.address,
+            t.`status`,
+            t.expired_date,
+            t.create_date,
+            t.org_id,
+            t.building_id,
+            t.verify_date,
+            p.person_type
+        FROM
+            ta_points_exchange t
+            LEFT JOIN ta_person p ON t.person_id = p.person_id
+    </select>
 </mapper>