Commit 1ba1a678 authored by chenjiuping's avatar chenjiuping

按前端查询条件改

parent 2e6fb845
...@@ -484,10 +484,10 @@ public class OrderExceptionServiceImpl extends AbstractService<OrderExceptionMap ...@@ -484,10 +484,10 @@ public class OrderExceptionServiceImpl extends AbstractService<OrderExceptionMap
//queryWrapper.eq(null != reqVo.getChannelId(), "o.channel_id", reqVo.getChannelId()); //queryWrapper.eq(null != reqVo.getChannelId(), "o.channel_id", reqVo.getChannelId());
queryWrapper.in(null != reqVo.getChannelIdList(), "o.channel_id", reqVo.getChannelIdList()); queryWrapper.in(null != reqVo.getChannelIds(), "o.channel_id", reqVo.getChannelIds());
//跟进客服 //跟进客服
queryWrapper.in(null != reqVo.getCustomerServiceIdList(), "su.customer_service_id", reqVo.getCustomerServiceIdList()); queryWrapper.in(null != reqVo.getSalesmanIds(), "su.customer_service_id", reqVo.getSalesmanIds());
queryWrapper.orderByDesc("e.id"); queryWrapper.orderByDesc("e.id");
...@@ -2588,10 +2588,10 @@ public class OrderExceptionServiceImpl extends AbstractService<OrderExceptionMap ...@@ -2588,10 +2588,10 @@ public class OrderExceptionServiceImpl extends AbstractService<OrderExceptionMap
} }
//渠道支持多选queryWrapper.eq(null != reqVo.getChannelId(), "a.channel_id", reqVo.getChannelId()); //渠道支持多选queryWrapper.eq(null != reqVo.getChannelId(), "a.channel_id", reqVo.getChannelId());
queryWrapper.in(null != reqVo.getChannelIdList(), "a.channel_id", reqVo.getChannelIdList()); queryWrapper.in(null != reqVo.getChannelIds(), "a.channel_id", reqVo.getChannelIds());
//跟进客服 //跟进客服
queryWrapper.in(null != reqVo.getCustomerServiceIdList(), "su.customer_service_id", reqVo.getCustomerServiceIdList()); queryWrapper.in(null != reqVo.getSalesmanIds(), "su.customer_service_id", reqVo.getSalesmanIds());
queryWrapper.orderByDesc("b.id"); queryWrapper.orderByDesc("b.id");
...@@ -2707,10 +2707,10 @@ public class OrderExceptionServiceImpl extends AbstractService<OrderExceptionMap ...@@ -2707,10 +2707,10 @@ public class OrderExceptionServiceImpl extends AbstractService<OrderExceptionMap
//queryWrapper.eq(null != reqVo.getChannelId(), "a.channel_id", reqVo.getChannelId()); //queryWrapper.eq(null != reqVo.getChannelId(), "a.channel_id", reqVo.getChannelId());
queryWrapper.in(null != reqVo.getChannelIdList(), "a.channel_id", reqVo.getChannelIdList()); queryWrapper.in(null != reqVo.getChannelIds(), "a.channel_id", reqVo.getChannelIds());
//跟进客服 //跟进客服
queryWrapper.in(null != reqVo.getCustomerServiceIdList(), "su.customer_service_id", reqVo.getCustomerServiceIdList()); queryWrapper.in(null != reqVo.getSalesmanIds(), "su.customer_service_id", reqVo.getSalesmanIds());
StatisticsOrderVO vo = orderExceptionMapper.statisticsExceptionOrder(queryWrapper, reqVo.getOrderExceptionType(), startTime, endTime); StatisticsOrderVO vo = orderExceptionMapper.statisticsExceptionOrder(queryWrapper, reqVo.getOrderExceptionType(), startTime, endTime);
if (Objects.nonNull(vo)) { if (Objects.nonNull(vo)) {
......
...@@ -102,10 +102,10 @@ public class OrderExceptionQueryVO { ...@@ -102,10 +102,10 @@ public class OrderExceptionQueryVO {
private String packageType; private String packageType;
@ApiModelProperty(value = "渠道集合") @ApiModelProperty(value = "渠道集合")
private List<Long> channelIdList; private List<Long> channelIds;
@ApiModelProperty(value = "跟进客服") @ApiModelProperty(value = "跟进客服")
private List<Long> customerServiceIdList; private List<Long> salesmanIds;
@ApiModelProperty(value = "目的国") @ApiModelProperty(value = "目的国")
private List<Long> destCountryIds; private List<Long> destCountryIds;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment