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
136814f0
Commit
136814f0
authored
Sep 10, 2024
by
joy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sourceIds
parent
e7d6687f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
0 deletions
+14
-0
OfferMapper.java
...ocoder/yudao/module/sale/dal/mysql/offer/OfferMapper.java
+11
-0
OfferPageReqVO.java
...cn/iocoder/yudao/module/sale/vo/offer/OfferPageReqVO.java
+3
-0
No files found.
yudao-module-sale/yudao-module-sale-core/src/main/java/cn/iocoder/yudao/module/sale/dal/mysql/offer/OfferMapper.java
View file @
136814f0
...
@@ -119,6 +119,9 @@ public interface OfferMapper extends BaseMapperX<OfferDO> {
...
@@ -119,6 +119,9 @@ public interface OfferMapper extends BaseMapperX<OfferDO> {
"from ecw_offer o "
,
"from ecw_offer o "
,
"left join ecw_customer_contacts cc on (o.relation = 1 and cc.id = o.consignor_id) or (o.relation = 2 and cc.id = o.consignee_id) "
,
"left join ecw_customer_contacts cc on (o.relation = 1 and cc.id = o.consignor_id) or (o.relation = 2 and cc.id = o.consignee_id) "
,
"<when test = 'pageVO.sourceIds != null and pageVO.sourceIds.size() > 0'>"
,
"left join ecw_customer user on user.id = o.relation_id "
,
"</when>"
,
"left join system_user u on u.id = o.follow_up_salesman_id "
,
"left join system_user u on u.id = o.follow_up_salesman_id "
,
"left join ecw_region s on o.objective_id = s.id "
,
"left join ecw_region s on o.objective_id = s.id "
,
"left join ecw_warehouse_line line on o.line_id = line.id "
,
"left join ecw_warehouse_line line on o.line_id = line.id "
,
...
@@ -214,6 +217,10 @@ public interface OfferMapper extends BaseMapperX<OfferDO> {
...
@@ -214,6 +217,10 @@ public interface OfferMapper extends BaseMapperX<OfferDO> {
"AND o.`channel_id` IN "
,
"AND o.`channel_id` IN "
,
"<foreach item='it' collection='pageVO.channelIds' open='(' close=')' separator=','> #{it} </foreach>)"
,
"<foreach item='it' collection='pageVO.channelIds' open='(' close=')' separator=','> #{it} </foreach>)"
,
"</when>"
,
"</when>"
,
"<when test = 'pageVO.sourceIds != null and pageVO.sourceIds.size() > 0'>"
,
"AND user.`source` IN "
,
"<foreach item='it' collection='pageVO.sourceIds' open='(' close=')' separator=','> #{it} </foreach>)"
,
"</when>"
,
"<when test = 'pageVO.beginStopTime != null and pageVO.endStopTime != null '>"
,
"<when test = 'pageVO.beginStopTime != null and pageVO.endStopTime != null '>"
,
"AND o.`stop_time` between #{pageVO.beginStopTime} and #{pageVO.endStopTime}"
,
"AND o.`stop_time` between #{pageVO.beginStopTime} and #{pageVO.endStopTime}"
,
"</when>"
,
"</when>"
,
...
@@ -341,6 +348,10 @@ public interface OfferMapper extends BaseMapperX<OfferDO> {
...
@@ -341,6 +348,10 @@ public interface OfferMapper extends BaseMapperX<OfferDO> {
"AND o.`channel_id` IN "
,
"AND o.`channel_id` IN "
,
"<foreach item='it' collection='pageVO.channelIds' open='(' close=')' separator=','> #{it} </foreach>)"
,
"<foreach item='it' collection='pageVO.channelIds' open='(' close=')' separator=','> #{it} </foreach>)"
,
"</when>"
,
"</when>"
,
"<when test = 'pageVO.sourceIds != null and pageVO.sourceIds.size() > 0'>"
,
"AND c.`source` IN "
,
"<foreach item='it' collection='pageVO.sourceIds' open='(' close=')' separator=','> #{it} </foreach>)"
,
"</when>"
,
"<when test = 'pageVO.relationId != null'>"
,
"<when test = 'pageVO.relationId != null'>"
,
"AND o.`relation_id` = #{pageVO.relationId}"
,
"AND o.`relation_id` = #{pageVO.relationId}"
,
"</when>"
,
"</when>"
,
...
...
yudao-module-sale/yudao-module-sale-core/src/main/java/cn/iocoder/yudao/module/sale/vo/offer/OfferPageReqVO.java
View file @
136814f0
...
@@ -192,4 +192,7 @@ public class OfferPageReqVO extends PageParam {
...
@@ -192,4 +192,7 @@ public class OfferPageReqVO extends PageParam {
@ApiModelProperty
(
value
=
"出货渠道列表"
)
@ApiModelProperty
(
value
=
"出货渠道列表"
)
private
List
<
Long
>
channelIds
;
private
List
<
Long
>
channelIds
;
@ApiModelProperty
(
value
=
"客户来源列表"
)
private
List
<
Long
>
sourceIds
;
}
}
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