傅行帆 5 yıl önce
ebeveyn
işleme
b70eb733c5

+ 7
- 2
src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java Dosyayı Görüntüle

791
                                          @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize,
791
                                          @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize,
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,HttpServletRequest request) {
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,
799
+                                         HttpServletRequest request) {
795
         String openid = getOpenId(request);
800
         String openid = getOpenId(request);
796
-        return taRecommendCustomerService.getMyCustFollowOrClinch(pageNumber,pageSize,openid,type,name,phone,status);
801
+        return taRecommendCustomerService.getMyCustFollowOrClinch(pageNumber,pageSize,openid,type,name,phone,status,startReportDate,endReportDate,startArrivalDate,endArrivalDate);
797
     }
802
     }
798
     
803
     
799
     /**
804
     /**

+ 6
- 1
src/main/java/com/huiju/estateagents/mapper/TaRecommendCustomerMapper.java Dosyayı Görüntüle

9
 import org.apache.ibatis.annotations.Mapper;
9
 import org.apache.ibatis.annotations.Mapper;
10
 import org.apache.ibatis.annotations.Param;
10
 import org.apache.ibatis.annotations.Param;
11
 
11
 
12
+import java.time.LocalDateTime;
12
 import java.util.List;
13
 import java.util.List;
13
 import java.util.Map;
14
 import java.util.Map;
14
 
15
 
170
      * @param name
171
      * @param name
171
      * @param phone
172
      * @param phone
172
      * @param status
173
      * @param status
174
+     * @param startReportDate
175
+     * @param endReportDate
176
+     * @param startArrivalDate
177
+     * @param endArrivalDate
173
      * @return
178
      * @return
174
      */
179
      */
175
-    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);
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);
176
     
181
     
177
     /**
182
     /**
178
      * 获取我的客户详情数据
183
      * 获取我的客户详情数据

+ 6
- 1
src/main/java/com/huiju/estateagents/service/ITaRecommendCustomerService.java Dosyayı Görüntüle

9
 import com.huiju.estateagents.excel.ExcelRecommendCustomer;
9
 import com.huiju.estateagents.excel.ExcelRecommendCustomer;
10
 import com.huiju.estateagents.excel.ReporRecommendCustomer;
10
 import com.huiju.estateagents.excel.ReporRecommendCustomer;
11
 
11
 
12
+import java.time.LocalDateTime;
12
 import java.util.List;
13
 import java.util.List;
13
 
14
 
14
 /**
15
 /**
113
      * @param name
114
      * @param name
114
      * @param phone
115
      * @param phone
115
      * @param status
116
      * @param status
117
+     * @param startReportDate
118
+     * @param endReportDate
119
+     * @param startArrivalDate
120
+     * @param endArrivalDate
116
      * @return
121
      * @return
117
      */
122
      */
118
-    ResponseBean getMyCustFollowOrClinch(Integer pageNumber, Integer pageSize, String openid, String type, String name, String phone, Integer status);
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);
119
     
124
     
120
     /**
125
     /**
121
      * 获取盘客工具下我的客户详情
126
      * 获取盘客工具下我的客户详情

+ 6
- 2
src/main/java/com/huiju/estateagents/service/impl/TaRecommendCustomerServiceImpl.java Dosyayı Görüntüle

614
      * @param name
614
      * @param name
615
      * @param phone
615
      * @param phone
616
      * @param status
616
      * @param status
617
+     * @param startReportDate
618
+     * @param endReportDate
619
+     * @param startArrivalDate
620
+     * @param endArrivalDate
617
      * @return
621
      * @return
618
      */
622
      */
619
     @Override
623
     @Override
620
-    public ResponseBean getMyCustFollowOrClinch(Integer pageNumber, Integer pageSize, String openid, String type, String name, String phone, Integer status) {
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) {
621
         List<TaPerson> taPersons = getPersonsByOpenId(openid);
625
         List<TaPerson> taPersons = getPersonsByOpenId(openid);
622
         if (null == taPersons || taPersons.size() != 1) {
626
         if (null == taPersons || taPersons.size() != 1) {
623
             return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
627
             return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
630
         page.setSize(pageSize);
634
         page.setSize(pageSize);
631
         
635
         
632
         //分页获取跟进客户status != 4的为跟进客户, status = 4的为成交客户 根据type区分  follow 跟进  clinch 成交
636
         //分页获取跟进客户status != 4的为跟进客户, status = 4的为成交客户 根据type区分  follow 跟进  clinch 成交
633
-        IPage<TaRecommendCustomer> result = taRecommendCustomerMapper.getMyCustFollowOrClinch(page, taPerson.getPersonId(),taPerson.getUserId(),taPerson.getOrgId(), type,name,phone,status);
637
+        IPage<TaRecommendCustomer> result = taRecommendCustomerMapper.getMyCustFollowOrClinch(page, taPerson.getPersonId(),taPerson.getUserId(),taPerson.getOrgId(), type,name,phone,status,startReportDate,endReportDate,startArrivalDate,endArrivalDate);
634
         return ResponseBean.success(result);
638
         return ResponseBean.success(result);
635
     }
639
     }
636
     
640
     

+ 12
- 0
src/main/resources/mapper/TaRecommendCustomerMapper.xml Dosyayı Görüntüle

639
             <if test="status != null and status !=''">
639
             <if test="status != null and status !=''">
640
                 and status = #{status}
640
                 and status = #{status}
641
             </if>
641
             </if>
642
+            <if test="startReportDate != null and startReportDate !=''">
643
+                and report_date >= #{startReportDate}
644
+            </if>
645
+            <if test="endReportDate != null and endReportDate !=''">
646
+                and report_date &lt;= #{endReportDate}
647
+            </if>
648
+            <if test="startArrivalDate != null and startArrivalDate !=''">
649
+                and arrival_date >= #{startArrivalDate}
650
+            </if>
651
+            <if test="endArrivalDate != null and endArrivalDate !=''">
652
+                and arrival_date &lt;= #{endArrivalDate}
653
+            </if>
642
         </if>
654
         </if>
643
         <if test="type == 'clinch'">
655
         <if test="type == 'clinch'">
644
           AND STATUS = 4
656
           AND STATUS = 4