Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-api-boot-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lanbaoming
jiedao-api-boot-master
Commits
6a3d5df4
Commit
6a3d5df4
authored
Sep 08, 2024
by
chenjiuping
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
按前端查询条件改
parent
0bce2816
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
OrderExceptionServiceImpl.java
...der/service/orderException/OrderExceptionServiceImpl.java
+6
-6
OrderExceptionQueryVO.java
...module/order/vo/orderException/OrderExceptionQueryVO.java
+2
-2
No files found.
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderException/OrderExceptionServiceImpl.java
View file @
6a3d5df4
...
...
@@ -484,10 +484,10 @@ public class OrderExceptionServiceImpl extends AbstractService<OrderExceptionMap
//queryWrapper.eq(null != reqVo.getChannelId(), "o.channel_id", reqVo.getChannelId());
queryWrapper
.
in
(
null
!=
reqVo
.
getChannelId
List
(),
"o.channel_id"
,
reqVo
.
getChannelIdList
());
queryWrapper
.
in
(
null
!=
reqVo
.
getChannelId
s
(),
"o.channel_id"
,
reqVo
.
getChannelIds
());
//跟进客服
queryWrapper
.
in
(
null
!=
reqVo
.
get
CustomerServiceIdList
(),
"su.customer_service_id"
,
reqVo
.
getCustomerServiceIdList
());
queryWrapper
.
in
(
null
!=
reqVo
.
get
SalesmanIds
(),
"su.customer_service_id"
,
reqVo
.
getSalesmanIds
());
queryWrapper
.
orderByDesc
(
"e.id"
);
...
...
@@ -2588,10 +2588,10 @@ public class OrderExceptionServiceImpl extends AbstractService<OrderExceptionMap
}
//渠道支持多选queryWrapper.eq(null != reqVo.getChannelId(), "a.channel_id", reqVo.getChannelId());
queryWrapper
.
in
(
null
!=
reqVo
.
getChannelId
List
(),
"a.channel_id"
,
reqVo
.
getChannelIdList
());
queryWrapper
.
in
(
null
!=
reqVo
.
getChannelId
s
(),
"a.channel_id"
,
reqVo
.
getChannelIds
());
//跟进客服
queryWrapper
.
in
(
null
!=
reqVo
.
get
CustomerServiceIdList
(),
"su.customer_service_id"
,
reqVo
.
getCustomerServiceIdList
());
queryWrapper
.
in
(
null
!=
reqVo
.
get
SalesmanIds
(),
"su.customer_service_id"
,
reqVo
.
getSalesmanIds
());
queryWrapper
.
orderByDesc
(
"b.id"
);
...
...
@@ -2707,10 +2707,10 @@ public class OrderExceptionServiceImpl extends AbstractService<OrderExceptionMap
//queryWrapper.eq(null != reqVo.getChannelId(), "a.channel_id", reqVo.getChannelId());
queryWrapper
.
in
(
null
!=
reqVo
.
getChannelId
List
(),
"a.channel_id"
,
reqVo
.
getChannelIdList
());
queryWrapper
.
in
(
null
!=
reqVo
.
getChannelId
s
(),
"a.channel_id"
,
reqVo
.
getChannelIds
());
//跟进客服
queryWrapper
.
in
(
null
!=
reqVo
.
get
CustomerServiceIdList
(),
"su.customer_service_id"
,
reqVo
.
getCustomerServiceIdList
());
queryWrapper
.
in
(
null
!=
reqVo
.
get
SalesmanIds
(),
"su.customer_service_id"
,
reqVo
.
getSalesmanIds
());
StatisticsOrderVO
vo
=
orderExceptionMapper
.
statisticsExceptionOrder
(
queryWrapper
,
reqVo
.
getOrderExceptionType
(),
startTime
,
endTime
);
if
(
Objects
.
nonNull
(
vo
))
{
...
...
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/orderException/OrderExceptionQueryVO.java
View file @
6a3d5df4
...
...
@@ -102,10 +102,10 @@ public class OrderExceptionQueryVO {
private
String
packageType
;
@ApiModelProperty
(
value
=
"渠道集合"
)
private
List
<
Long
>
channelId
List
;
private
List
<
Long
>
channelId
s
;
@ApiModelProperty
(
value
=
"跟进客服"
)
private
List
<
Long
>
customerServiceIdList
;
private
List
<
Long
>
salesmanIds
;
@ApiModelProperty
(
value
=
"目的国"
)
private
List
<
Long
>
destCountryIds
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment