feature(*): 查询的bug修复

- 查询的bug修复

feature(*): 查询的bug修复
- 查询的bug修复
张志伟
1 parent 77d74af7
Showing 2 changed files with 17 additions and 10 deletions
fw-valhalla-dao/src/main/resources/mapper/CustomerMapper.xml
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/CustomerBizService.java
@@ -145,6 +145,7 @@
         left join follow_clue t3 on t1.frame_no=t3.vin and t3.clue_state=2 and t3.clue_type=2
         left join follow_clue t4 on t1.frame_no=t4.vin and t4.clue_state=2 and t4.clue_type=4
         where t1.yn = 1 and t1.group_id = #{condition.groupId}
+        and t1.adviser_id is not null
         <if test="condition.shopList !=null and condition.shopList.size() != 0">
             and t1.shop_id in
             <foreach collection="condition.shopList" item="id" index="index" open="(" close=")" separator=",">
@@ -168,7 +169,6 @@
         </if>
         <if test="condition.andCondition==true">
             and (
-            t1.adviser_id is not null and
             <trim prefixOverrides="and">
                 <if test="condition.minMileage !=null and condition.maxMileage !=null">
                     <if test="condition.minMileage !=null">
@@ -191,13 +191,13 @@
                 <if test="condition.level !=null">
                     and t1.cus_level = #{condition.level}
                 </if>
+                and t1.adviser_id is not null
             </trim>
             )
         </if>
  
         <if test="condition.andCondition==false">
             and (
-            t1.adviser_id is not null and
             <trim prefixOverrides="or">
                 <if test="condition.minMileage !=null and condition.maxMileage !=null">
                     or (
@@ -241,6 +241,7 @@
         left join follow_task t3 on t1.id=t3.customer_id and t3.state=1 and t3.type=2
         left join follow_task t4 on t1.id=t4.customer_id and t4.state=1 and t4.type=4
         where t1.yn = 1 and t1.group_id = #{condition.groupId}
+        and t1.adviser_id is not null
         <if test="condition.shopList !=null and condition.shopList.size() != 0">
             and t1.shop_id in
             <foreach collection="condition.shopList" item="id" index="index" open="(" close=")" separator=",">
@@ -264,7 +265,6 @@
         </if>
         <if test="condition.andCondition==true">
             and (
-            t1.adviser_id is not null and
             <trim prefixOverrides="and">
                 <if test="condition.minMileage !=null and condition.maxMileage !=null">
                     <if test="condition.minMileage !=null">
@@ -287,17 +287,16 @@
                 <if test="condition.level !=null">
                     and t1.cus_level = #{condition.level}
                 </if>
+                and t1.adviser_id is not null
             </trim>
             )
         </if>
  
         <if test="condition.andCondition==false">
             and (
-            t1.adviser_id is not null and
             <trim prefixOverrides="or">
                 <if test="condition.minMileage !=null and condition.maxMileage !=null">
-                    or (
-                    t1.current_mileage is not null
+                    or (t1.current_mileage is not null
                     <if test="condition.minMileage !=null">
                         and t1.current_mileage >= #{condition.minMileage}
                     </if>
@@ -791,6 +791,7 @@ public class CustomerBizService extends AbstractCustomerService {
  
     /**
      * 更新购车日期
+     *
      * @param vin
      * @param date
      * @param groupId
@@ -987,15 +988,15 @@ public class CustomerBizService extends AbstractCustomerService {
  
     public List<BasicsCustomerDTO> queryByKeyword(String keyword, Long groupId) {
  
-        List<BasicsCustomerDTO> list = fromCustomer(keyword,groupId);
-        if(CollectionUtils.isNotEmpty(list)){
+        List<BasicsCustomerDTO> list = fromCustomer(keyword, groupId);
+        if (CollectionUtils.isNotEmpty(list)) {
             return list;
         }
         return fromVehicle(keyword);
     }
  
  
-    private List<BasicsCustomerDTO> fromCustomer(String keyword, Long groupId){
+    private List<BasicsCustomerDTO> fromCustomer(String keyword, Long groupId) {
         List<BasicsCustomerDTO> list = customerService.queryByKeyword(keyword, groupId);
         for (BasicsCustomerDTO dto : list) {
             UserInfoDTO user = userService.user(dto.getAdviserId());
@@ -1010,9 +1011,10 @@ public class CustomerBizService extends AbstractCustomerService {
         return list;
     }
  
-    private List<BasicsCustomerDTO> fromVehicle(String keyword){
+    private List<BasicsCustomerDTO> fromVehicle(String keyword) {
         return memberVehicleService.queryByKeyword(keyword);
     }
+
     public List<MemberVehicleDTO> queryVehicleByMemberId(Long memberId) {
         List<MemberVehicle> memberVehicleList = memberVehicleService.getMemberVehicle(memberId);
         if (CollectionUtils.isEmpty(memberVehicleList)) {
@@ -1122,6 +1124,12 @@ public class CustomerBizService extends AbstractCustomerService {
         if (Objects.nonNull(queryReq.getFollowType())) {
             query.setFollowType(queryReq.getFollowType().getValue());
         }
+        boolean b = (Objects.nonNull(query.getMinMileage()) && Objects.nonNull(query.getMaxMileage()))
+                || (Objects.nonNull(query.getMinBuyDate()) && Objects.nonNull(query.getMaxBuyDate()))
+                || Objects.nonNull(query.getLevel());
+        if (!b) {
+            query.setAndCondition(true);
+        }
  
         return query;
     }