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

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

                                          @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize,
                                          @RequestParam(value = "name",required = false) String name,
                                          @RequestParam(value = "phone",required = false) String phone,
-                                         @RequestParam(value = "status",required = false) Integer status,HttpServletRequest request) {
+                                         @RequestParam(value = "status",required = false) Integer status,
+                                         @RequestParam(value = "startReportDate",required = false) LocalDateTime startReportDate,
+                                         @RequestParam(value = "endReportDate",required = false) LocalDateTime endReportDate,
+                                         @RequestParam(value = "startArrivalDate",required = false) LocalDateTime startArrivalDate,
+                                         @RequestParam(value = "endArrivalDate",required = false) LocalDateTime endArrivalDate,
+                                         HttpServletRequest request) {
         String openid = getOpenId(request);
-        return taRecommendCustomerService.getMyCustFollowOrClinch(pageNumber,pageSize,openid,type,name,phone,status);
+        return taRecommendCustomerService.getMyCustFollowOrClinch(pageNumber,pageSize,openid,type,name,phone,status,startReportDate,endReportDate,startArrivalDate,endArrivalDate);
     }
     
     /**

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

 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
      * @param name
      * @param phone
      * @param status
+     * @param startReportDate
+     * @param endReportDate
+     * @param startArrivalDate
+     * @param endArrivalDate
      * @return
      */
-    IPage<TaRecommendCustomer> getMyCustFollowOrClinch(IPage<TaRecommendCustomer> page, @Param("personId") String personId, @Param("userId") Integer userId, @Param("orgId") Integer orgId, @Param("type") String type, @Param("name") String name, @Param("phone") String phone,@Param("status") Integer status);
+    IPage<TaRecommendCustomer> getMyCustFollowOrClinch(IPage<TaRecommendCustomer> page, @Param("personId") String personId, @Param("userId") Integer userId, @Param("orgId") Integer orgId, @Param("type") String type, @Param("name") String name, @Param("phone") String phone, @Param("status") Integer status,@Param("startReportDate") LocalDateTime startReportDate,@Param("endReportDate") LocalDateTime endReportDate,@Param("startArrivalDate") LocalDateTime startArrivalDate,@Param("endArrivalDate") LocalDateTime endArrivalDate);
     
     /**
      * 获取我的客户详情数据

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

 import com.huiju.estateagents.excel.ExcelRecommendCustomer;
 import com.huiju.estateagents.excel.ReporRecommendCustomer;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
      * @param name
      * @param phone
      * @param status
+     * @param startReportDate
+     * @param endReportDate
+     * @param startArrivalDate
+     * @param endArrivalDate
      * @return
      */
-    ResponseBean getMyCustFollowOrClinch(Integer pageNumber, Integer pageSize, String openid, String type, String name, String phone, Integer status);
+    ResponseBean getMyCustFollowOrClinch(Integer pageNumber, Integer pageSize, String openid, String type, String name, String phone, Integer status, LocalDateTime startReportDate, LocalDateTime endReportDate, LocalDateTime startArrivalDate, LocalDateTime endArrivalDate);
     
     /**
      * 获取盘客工具下我的客户详情

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

      * @param name
      * @param phone
      * @param status
+     * @param startReportDate
+     * @param endReportDate
+     * @param startArrivalDate
+     * @param endArrivalDate
      * @return
      */
     @Override
-    public ResponseBean getMyCustFollowOrClinch(Integer pageNumber, Integer pageSize, String openid, String type, String name, String phone, Integer status) {
+    public ResponseBean getMyCustFollowOrClinch(Integer pageNumber, Integer pageSize, String openid, String type, String name, String phone, Integer status, LocalDateTime startReportDate, LocalDateTime endReportDate, LocalDateTime startArrivalDate, LocalDateTime endArrivalDate) {
         List<TaPerson> taPersons = getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         page.setSize(pageSize);
         
         //分页获取跟进客户status != 4的为跟进客户， status = 4的为成交客户 根据type区分  follow 跟进  clinch 成交
-        IPage<TaRecommendCustomer> result = taRecommendCustomerMapper.getMyCustFollowOrClinch(page, taPerson.getPersonId(),taPerson.getUserId(),taPerson.getOrgId(), type,name,phone,status);
+        IPage<TaRecommendCustomer> result = taRecommendCustomerMapper.getMyCustFollowOrClinch(page, taPerson.getPersonId(),taPerson.getUserId(),taPerson.getOrgId(), type,name,phone,status,startReportDate,endReportDate,startArrivalDate,endArrivalDate);
         return ResponseBean.success(result);
     }
     

src/main/resources/mapper/TaRecommendCustomerMapper.xml

             <if test="status != null and status !=''">
                 and status = #{status}
             </if>
+            <if test="startReportDate != null and startReportDate !=''">
+                and report_date >= #{startReportDate}
+            </if>
+            <if test="endReportDate != null and endReportDate !=''">
+                and report_date &lt;= #{endReportDate}
+            </if>
+            <if test="startArrivalDate != null and startArrivalDate !=''">
+                and arrival_date >= #{startArrivalDate}
+            </if>
+            <if test="endArrivalDate != null and endArrivalDate !=''">
+                and arrival_date &lt;= #{endArrivalDate}
+            </if>
         </if>
         <if test="type == 'clinch'">
           AND STATUS = 4