valhalla / fw-valhalla

Commit 428123aaa8e2b496380a33ba3451baf3f73055f4

Authored by 张志伟
2 parents 9faf8fc5 27e74147

Merge branch 'dev' into 'test' 

:construction: 跟进池调整



See merge request !3
Inline Side-by-side
Showing 2 changed files with 4 additions and 3 deletions
fw-valhalla-dao/src/main/resources/mapper/FollowTaskMapper.xml
  View file @428123a
... ... @@ -101,8 +101,8 @@
101 101 left join customer t2 on t1.customer_id = t2.id
102 102 left join accident_pool t3 on t1.customer_id = t3.id
103 103 where t1.state = 2
104   - and DATE_FORMAT(t1.begin_time, '%Y-%m-%d') < #{condition.startTime}
105   - and DATE_FORMAT(t1.deadline, '%Y-%m-%d') >= #{condition.endTime}) followPool
  104 + and t1.begin_time < #{condition.endTime}
  105 + and t1.deadline >= #{condition.endTime}) followPool
106 106 <where>
107 107 <if test="condition.groupId !=null">
108 108 and followPool.group_id = #{condition.groupId}
... ...
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/FollowPoolBizService.java
  View file @428123a
... ... @@ -14,7 +14,6 @@ import cn.fw.valhalla.rpc.erp.UserService;
14 14 import cn.fw.valhalla.rpc.erp.dto.UserInfoDTO;
15 15 import cn.fw.valhalla.rpc.oop.OopService;
16 16 import cn.fw.valhalla.rpc.oop.dto.ShopDTO;
17   -import cn.fw.valhalla.service.data.FollowRecordService;
18 17 import cn.fw.valhalla.service.data.FollowTaskService;
19 18 import cn.fw.valhalla.service.data.PublicPoolService;
20 19 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
... ... @@ -136,6 +135,8 @@ public class FollowPoolBizService {
136 135 if (Objects.nonNull(user)) {
137 136 queryVO.setUserId(user.getUserId());
138 137 queryVO.setGroupId(user.getGroupId());
  138 + } else {
  139 + BV.isFalse(Objects.isNull(queryVO.getShopId()) && Objects.isNull(queryVO.getUserId()), () -> "请选择服务站或者人员");
139 140 }
140 141 boolean inSection = DateUtil.sub(queryVO.getEndTime(), queryVO.getStartTime(), "d") <= MONTH_DAY;
141 142 BV.isTrue(inSection, () -> "暂不支持查询超过一个月区间的数据");
... ...