傅行帆 5 år sedan
förälder
incheckning
314863e389

+ 4
- 4
src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java Visa fil

792
                                          @RequestParam(value = "name",required = false) String name,
792
                                          @RequestParam(value = "name",required = false) String name,
793
                                          @RequestParam(value = "phone",required = false) String phone,
793
                                          @RequestParam(value = "phone",required = false) String phone,
794
                                          @RequestParam(value = "status",required = false) Integer status,
794
                                          @RequestParam(value = "status",required = false) Integer status,
795
-                                         @RequestParam(value = "startReportDate",required = false) LocalDateTime startReportDate,
796
-                                         @RequestParam(value = "endReportDate",required = false) LocalDateTime endReportDate,
797
-                                         @RequestParam(value = "startArrivalDate",required = false) LocalDateTime startArrivalDate,
798
-                                         @RequestParam(value = "endArrivalDate",required = false) LocalDateTime endArrivalDate,
795
+                                         @RequestParam(value = "startReportDate",required = false) String startReportDate,
796
+                                         @RequestParam(value = "endReportDate",required = false) String endReportDate,
797
+                                         @RequestParam(value = "startArrivalDate",required = false) String startArrivalDate,
798
+                                         @RequestParam(value = "endArrivalDate",required = false) String endArrivalDate,
799
                                          HttpServletRequest request) {
799
                                          HttpServletRequest request) {
800
         String openid = getOpenId(request);
800
         String openid = getOpenId(request);
801
         return taRecommendCustomerService.getMyCustFollowOrClinch(pageNumber,pageSize,openid,type,name,phone,status,startReportDate,endReportDate,startArrivalDate,endArrivalDate);
801
         return taRecommendCustomerService.getMyCustFollowOrClinch(pageNumber,pageSize,openid,type,name,phone,status,startReportDate,endReportDate,startArrivalDate,endArrivalDate);

+ 1
- 1
src/main/java/com/huiju/estateagents/mapper/TaRecommendCustomerMapper.java Visa fil

177
      * @param endArrivalDate
177
      * @param endArrivalDate
178
      * @return
178
      * @return
179
      */
179
      */
180
-    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);
180
+    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);
181
     
181
     
182
     /**
182
     /**
183
      * 获取我的客户详情数据
183
      * 获取我的客户详情数据

+ 1
- 1
src/main/java/com/huiju/estateagents/service/ITaRecommendCustomerService.java Visa fil

120
      * @param endArrivalDate
120
      * @param endArrivalDate
121
      * @return
121
      * @return
122
      */
122
      */
123
-    ResponseBean getMyCustFollowOrClinch(Integer pageNumber, Integer pageSize, String openid, String type, String name, String phone, Integer status, LocalDateTime startReportDate, LocalDateTime endReportDate, LocalDateTime startArrivalDate, LocalDateTime endArrivalDate);
123
+    ResponseBean getMyCustFollowOrClinch(Integer pageNumber, Integer pageSize, String openid, String type, String name, String phone, Integer status, String startReportDate, String endReportDate, String startArrivalDate, String endArrivalDate);
124
     
124
     
125
     /**
125
     /**
126
      * 获取盘客工具下我的客户详情
126
      * 获取盘客工具下我的客户详情

+ 1
- 1
src/main/java/com/huiju/estateagents/service/impl/TaRecommendCustomerServiceImpl.java Visa fil

621
      * @return
621
      * @return
622
      */
622
      */
623
     @Override
623
     @Override
624
-    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) {
624
+    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) {
625
         List<TaPerson> taPersons = getPersonsByOpenId(openid);
625
         List<TaPerson> taPersons = getPersonsByOpenId(openid);
626
         if (null == taPersons || taPersons.size() != 1) {
626
         if (null == taPersons || taPersons.size() != 1) {
627
             return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
627
             return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);

+ 4
- 4
src/main/resources/mapper/TaRecommendCustomerMapper.xml Visa fil

640
                 and status = #{status}
640
                 and status = #{status}
641
             </if>
641
             </if>
642
             <if test="startReportDate != null and startReportDate !=''">
642
             <if test="startReportDate != null and startReportDate !=''">
643
-                and report_date >= #{startReportDate}
643
+                and date_format( report_date, '%Y-%m-%d' ) >= #{startReportDate}
644
             </if>
644
             </if>
645
             <if test="endReportDate != null and endReportDate !=''">
645
             <if test="endReportDate != null and endReportDate !=''">
646
-                and report_date &lt;= #{endReportDate}
646
+                and date_format( report_date, '%Y-%m-%d' ) &lt;= #{endReportDate}
647
             </if>
647
             </if>
648
             <if test="startArrivalDate != null and startArrivalDate !=''">
648
             <if test="startArrivalDate != null and startArrivalDate !=''">
649
-                and arrival_date >= #{startArrivalDate}
649
+                and date_format( arrival_date, '%Y-%m-%d' ) >= #{startArrivalDate}
650
             </if>
650
             </if>
651
             <if test="endArrivalDate != null and endArrivalDate !=''">
651
             <if test="endArrivalDate != null and endArrivalDate !=''">
652
-                and arrival_date &lt;= #{endArrivalDate}
652
+                and date_format( arrival_date, '%Y-%m-%d' ) &lt;= #{endArrivalDate}
653
             </if>
653
             </if>
654
         </if>
654
         </if>
655
         <if test="type == 'clinch'">
655
         <if test="type == 'clinch'">