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

@@ -792,10 +792,10 @@ public class TaRecommendCustomerController extends BaseController {
                                          @RequestParam(value = "name",required = false) String name,
                                          @RequestParam(value = "phone",required = false) String phone,
                                          @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,
+                                         @RequestParam(value = "startReportDate",required = false) String startReportDate,
+                                         @RequestParam(value = "endReportDate",required = false) String endReportDate,
+                                         @RequestParam(value = "startArrivalDate",required = false) String startArrivalDate,
+                                         @RequestParam(value = "endArrivalDate",required = false) String endArrivalDate,
                                          HttpServletRequest request) {
         String openid = getOpenId(request);
         return taRecommendCustomerService.getMyCustFollowOrClinch(pageNumber,pageSize,openid,type,name,phone,status,startReportDate,endReportDate,startArrivalDate,endArrivalDate);

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

@@ -177,7 +177,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @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,@Param("startReportDate") LocalDateTime startReportDate,@Param("endReportDate") LocalDateTime endReportDate,@Param("startArrivalDate") LocalDateTime startArrivalDate,@Param("endArrivalDate") LocalDateTime endArrivalDate);
+    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") String startReportDate,@Param("endReportDate") String endReportDate,@Param("startArrivalDate") String startArrivalDate,@Param("endArrivalDate") String endArrivalDate);
     
     /**
      * 获取我的客户详情数据

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

@@ -120,7 +120,7 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
      * @param endArrivalDate
      * @return
      */
-    ResponseBean getMyCustFollowOrClinch(Integer pageNumber, Integer pageSize, String openid, String type, String name, String phone, Integer status, LocalDateTime startReportDate, LocalDateTime endReportDate, LocalDateTime startArrivalDate, LocalDateTime endArrivalDate);
+    ResponseBean getMyCustFollowOrClinch(Integer pageNumber, Integer pageSize, String openid, String type, String name, String phone, Integer status, String startReportDate, String endReportDate, String startArrivalDate, String endArrivalDate);
     
     /**
      * 获取盘客工具下我的客户详情

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

@@ -627,7 +627,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
      * @return
      */
     @Override
-    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) {
+    public ResponseBean getMyCustFollowOrClinch(Integer pageNumber, Integer pageSize, String openid, String type, String name, String phone, Integer status, String startReportDate, String endReportDate, String startArrivalDate, String endArrivalDate) {
         List<TaPerson> taPersons = getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -640,16 +640,16 @@ FROM
                 and status = #{status}
             </if>
             <if test="startReportDate != null and startReportDate !=''">
-                and report_date >= #{startReportDate}
+                and date_format( report_date, '%Y-%m-%d' ) >= #{startReportDate}
             </if>
             <if test="endReportDate != null and endReportDate !=''">
-                and report_date &lt;= #{endReportDate}
+                and date_format( report_date, '%Y-%m-%d' ) &lt;= #{endReportDate}
             </if>
             <if test="startArrivalDate != null and startArrivalDate !=''">
-                and arrival_date >= #{startArrivalDate}
+                and date_format( arrival_date, '%Y-%m-%d' ) >= #{startArrivalDate}
             </if>
             <if test="endArrivalDate != null and endArrivalDate !=''">
-                and arrival_date &lt;= #{endArrivalDate}
+                and date_format( arrival_date, '%Y-%m-%d' ) &lt;= #{endArrivalDate}
             </if>
         </if>
         <if test="type == 'clinch'">