问题处理

hx-customer/src/main/java/com/fjhx/customer/entity/customer/dto/CustomerSelectDto.java

@@ -94,4 +94,13 @@ public class CustomerSelectDto extends BaseSelectDto {
      */
     private String contactEmail;
 
+    /**
+     * 客户跟进开始天数
+     */
+    private Integer beginDay;
+    /**
+     * 客户跟进结束天数
+     */
+    private Integer endDay;
+
 }

hx-customer/src/main/java/com/fjhx/customer/service/customer/impl/CustomerServiceImpl.java

@@ -82,6 +82,15 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
             wrapper.in("c", Customer::getId, authIdList);
         }
 
+        //最后跟进数据过滤
+        Integer beginDay = dto.getBeginDay();
+        Integer endDay = dto.getEndDay();
+        wrapper.and(ObjectUtil.isNotEmpty(beginDay), q -> q
+                .gt("DATEDIFF( NOW(), c.last_follow_time )", beginDay)
+                .or().isNull(ObjectUtil.isEmpty(endDay), "c.last_follow_time")
+        );
+        wrapper.le(ObjectUtil.isNotEmpty(endDay), "DATEDIFF( NOW(), c.last_follow_time )", endDay);
+
         Page<CustomerVo> page = baseMapper.getPage(dto.getPage(), wrapper);
         CustomizeAreaUtil.setAreaName(page.getRecords());
         return page;
@@ -176,6 +185,15 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
             wrapper.orderByDesc("c.id IN ( " + join + " )");
         }
 
+        //最后跟进数据过滤
+        Integer beginDay = dto.getBeginDay();
+        Integer endDay = dto.getEndDay();
+        wrapper.and(ObjectUtil.isNotEmpty(beginDay), q -> q
+                .gt("DATEDIFF( NOW(), c.last_follow_time )", beginDay)
+                .or().isNull(ObjectUtil.isEmpty(endDay), "c.last_follow_time")
+        );
+        wrapper.le(ObjectUtil.isNotEmpty(endDay), "DATEDIFF( NOW(), c.last_follow_time )", endDay);
+
         wrapper.orderByDesc("c", Customer::getAllocationTime);
         wrapper.orderByDesc("c", Customer::getCreateTime);
 
@@ -418,8 +436,11 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
 
         QueryWrapper<Customer> clone2 = query.clone();
         clone2.select("count(1) as count");
-        clone2.gt("DATEDIFF( NOW(), last_follow_time )", 180);
-        clone2.or().isNull("last_follow_time");
+        clone2.and(q -> q
+                .gt("DATEDIFF( NOW(), last_follow_time )", 180)
+                .or().isNull("last_follow_time")
+        );
+
         Customer customer2 = baseMapper.selectOne(clone2);
 
         //返回最终结果