Merge branch 'dev' into 'test'

跟进池调整 See merge request !3

Merge branch 'dev' into 'test'
跟进池调整 See merge request !3
张志伟
2 parents 9faf8fc5 27e74147
Showing 2 changed files with 4 additions and 3 deletions
fw-valhalla-dao/src/main/resources/mapper/FollowTaskMapper.xml
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/FollowPoolBizService.java
@@ -101,8 +101,8 @@
         left join customer t2 on t1.customer_id = t2.id
         left join accident_pool t3 on t1.customer_id = t3.id
         where t1.state = 2
-        and DATE_FORMAT(t1.begin_time, '%Y-%m-%d') &lt; #{condition.startTime}
-        and DATE_FORMAT(t1.deadline, '%Y-%m-%d') >=  #{condition.endTime}) followPool
+        and t1.begin_time &lt; #{condition.endTime}
+        and t1.deadline >=  #{condition.endTime}) followPool
         <where>
             <if test="condition.groupId !=null">
                 and followPool.group_id = #{condition.groupId}
@@ -14,7 +14,6 @@ import cn.fw.valhalla.rpc.erp.UserService;
 import cn.fw.valhalla.rpc.erp.dto.UserInfoDTO;
 import cn.fw.valhalla.rpc.oop.OopService;
 import cn.fw.valhalla.rpc.oop.dto.ShopDTO;
-import cn.fw.valhalla.service.data.FollowRecordService;
 import cn.fw.valhalla.service.data.FollowTaskService;
 import cn.fw.valhalla.service.data.PublicPoolService;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -136,6 +135,8 @@ public class FollowPoolBizService {
         if (Objects.nonNull(user)) {
             queryVO.setUserId(user.getUserId());
             queryVO.setGroupId(user.getGroupId());
+        } else {
+            BV.isFalse(Objects.isNull(queryVO.getShopId()) && Objects.isNull(queryVO.getUserId()), () -> "请选择服务站或者人员");
         }
         boolean inSection = DateUtil.sub(queryVO.getEndTime(), queryVO.getStartTime(), "d") <= MONTH_DAY;
         BV.isTrue(inSection, () -> "暂不支持查询超过一个月区间的数据");