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
35fb74da
Commit
35fb74da
authored
Jul 23, 2024
by
zhaobiyan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
客户会员筛选字段
parent
e8a403ca
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
14 deletions
+28
-14
CustomerMapper.xml
...ore/src/main/resources/mapper/customer/CustomerMapper.xml
+22
-11
IndirectCustomerMapper.xml
...main/resources/mapper/customer/IndirectCustomerMapper.xml
+6
-3
No files found.
yudao-module-customer/yudao-module-customer-core/src/main/resources/mapper/customer/CustomerMapper.xml
View file @
35fb74da
...
@@ -72,6 +72,7 @@
...
@@ -72,6 +72,7 @@
c.social as default_social,
c.social as default_social,
c.email as default_email,
c.email as default_email,
c.social_number as default_social_number,
c.social_number as default_social_number,
c.userid as contact_member_id,
su.nickname as customer_service_name,
su.nickname as customer_service_name,
su.dept_id as dept_id
su.dept_id as dept_id
from ecw_customer a
from ecw_customer a
...
@@ -83,7 +84,7 @@
...
@@ -83,7 +84,7 @@
left join ecw_customer_credit credit
left join ecw_customer_credit credit
on contact.credit_level = credit.id
on contact.credit_level = credit.id
left join ecw_country ec on contact.country = ec.id
left join ecw_country ec on contact.country = ec.id
left join member_user mu on contact.member_id = mu.id
left join member_user mu on contact.
contact_
member_id = mu.id
WHERE 1=1 AND contact.deleted = 0
WHERE 1=1 AND contact.deleted = 0
...
@@ -113,6 +114,7 @@
...
@@ -113,6 +114,7 @@
c.social as default_social,
c.social as default_social,
c.email as default_email,
c.email as default_email,
c.social_number as default_social_number,
c.social_number as default_social_number,
c.userid as contact_member_id,
su.nickname as customer_service_name,
su.nickname as customer_service_name,
su.dept_id as dept_id
su.dept_id as dept_id
from ecw_customer a
from ecw_customer a
...
@@ -124,7 +126,7 @@
...
@@ -124,7 +126,7 @@
left join ecw_customer_credit credit
left join ecw_customer_credit credit
on contact.credit_level = credit.id
on contact.credit_level = credit.id
left join ecw_country ec on contact.country = ec.id
left join ecw_country ec on contact.country = ec.id
left join member_user mu on contact.member_id = mu.id
left join member_user mu on contact.
contact_
member_id = mu.id
WHERE 1=1 AND contact.deleted = 0
WHERE 1=1 AND contact.deleted = 0
...
@@ -154,6 +156,7 @@
...
@@ -154,6 +156,7 @@
c.social as default_social,
c.social as default_social,
c.email as default_email,
c.email as default_email,
c.social_number as default_social_number,
c.social_number as default_social_number,
c.userid as contact_member_id,
su.nickname as customer_service_name,
su.nickname as customer_service_name,
su.dept_id as dept_id
su.dept_id as dept_id
from ecw_customer a
from ecw_customer a
...
@@ -165,7 +168,7 @@
...
@@ -165,7 +168,7 @@
left join ecw_customer_credit credit
left join ecw_customer_credit credit
on contact.credit_level = credit.id
on contact.credit_level = credit.id
left join ecw_country ec on contact.country = ec.id
left join ecw_country ec on contact.country = ec.id
left join member_user mu on contact.member_id = mu.id
left join member_user mu on contact.
contact_
member_id = mu.id
WHERE 1=1 AND contact.deleted = 0
WHERE 1=1 AND contact.deleted = 0
...
@@ -190,6 +193,7 @@
...
@@ -190,6 +193,7 @@
c.social as default_social,
c.social as default_social,
c.email as default_email,
c.email as default_email,
c.social_number as default_social_number,
c.social_number as default_social_number,
c.userid as contact_member_id,
su.nickname as customer_service_name,
su.nickname as customer_service_name,
su.dept_id as dept_id
su.dept_id as dept_id
from ecw_customer a
from ecw_customer a
...
@@ -201,7 +205,7 @@
...
@@ -201,7 +205,7 @@
left join ecw_customer_credit credit
left join ecw_customer_credit credit
on contact.credit_level = credit.id
on contact.credit_level = credit.id
left join ecw_country ec on contact.country = ec.id
left join ecw_country ec on contact.country = ec.id
left join member_user mu on contact.member_id = mu.id
left join member_user mu on contact.
contact_
member_id = mu.id
WHERE 1=1 AND contact.deleted = 0
WHERE 1=1 AND contact.deleted = 0
...
@@ -460,6 +464,7 @@
...
@@ -460,6 +464,7 @@
c.social as default_social,
c.social as default_social,
c.email as default_email,
c.email as default_email,
c.social_number as default_social_number,
c.social_number as default_social_number,
c.userid as contact_member_id,
su.nickname as customer_service_name,
su.nickname as customer_service_name,
su.dept_id as dept_id
su.dept_id as dept_id
from ecw_customer a
from ecw_customer a
...
@@ -471,7 +476,7 @@
...
@@ -471,7 +476,7 @@
left join ecw_customer_credit credit
left join ecw_customer_credit credit
on contact.credit_level = credit.id
on contact.credit_level = credit.id
left join ecw_country ec on contact.country = ec.id
left join ecw_country ec on contact.country = ec.id
left join member_user mu on contact.member_id = mu.id
left join member_user mu on contact.
contact_
member_id = mu.id
WHERE 1=1 AND contact.deleted = 0
WHERE 1=1 AND contact.deleted = 0
<include
refid=
"myCustomerQuery"
/>
<include
refid=
"myCustomerQuery"
/>
...
@@ -1411,6 +1416,7 @@
...
@@ -1411,6 +1416,7 @@
c.social as default_social,
c.social as default_social,
c.email as default_email,
c.email as default_email,
c.social_number as default_social_number,
c.social_number as default_social_number,
c.userid as contact_member_id,
su.nickname as customer_service_name,
su.nickname as customer_service_name,
su.dept_id as dept_id
su.dept_id as dept_id
from ecw_customer a
from ecw_customer a
...
@@ -1422,7 +1428,7 @@
...
@@ -1422,7 +1428,7 @@
left join ecw_customer_credit credit
left join ecw_customer_credit credit
on contact.credit_level = credit.id
on contact.credit_level = credit.id
left join ecw_country ec on contact.country = ec.id
left join ecw_country ec on contact.country = ec.id
left join member_user mu on contact.member_id = mu.id
left join member_user mu on contact.
contact_
member_id = mu.id
WHERE 1=1 AND contact.deleted = 0
WHERE 1=1 AND contact.deleted = 0
...
@@ -1445,6 +1451,7 @@
...
@@ -1445,6 +1451,7 @@
c.social as default_social,
c.social as default_social,
c.email as default_email,
c.email as default_email,
c.social_number as default_social_number,
c.social_number as default_social_number,
c.userid as contact_member_id,
su.nickname as customer_service_name,
su.nickname as customer_service_name,
su.dept_id as dept_id
su.dept_id as dept_id
from ecw_customer a
from ecw_customer a
...
@@ -1456,7 +1463,7 @@
...
@@ -1456,7 +1463,7 @@
left join ecw_customer_credit credit
left join ecw_customer_credit credit
on contact.credit_level = credit.id
on contact.credit_level = credit.id
left join ecw_country ec on contact.country = ec.id
left join ecw_country ec on contact.country = ec.id
left join member_user mu on contact.member_id = mu.id
left join member_user mu on contact.
contact_
member_id = mu.id
WHERE 1=1 AND contact.deleted = 0
WHERE 1=1 AND contact.deleted = 0
...
@@ -1520,6 +1527,7 @@
...
@@ -1520,6 +1527,7 @@
c.social as default_social,
c.social as default_social,
c.email as default_email,
c.email as default_email,
c.social_number as default_social_number,
c.social_number as default_social_number,
c.userid as contact_member_id,
su.nickname as customer_service_name,
su.nickname as customer_service_name,
su.dept_id as dept_id
su.dept_id as dept_id
from ecw_customer a
from ecw_customer a
...
@@ -1532,7 +1540,7 @@
...
@@ -1532,7 +1540,7 @@
on contact.credit_level = credit.id
on contact.credit_level = credit.id
left join ecw_country ec on contact.country = ec.id
left join ecw_country ec on contact.country = ec.id
left join member_user mu on contact.member_id = mu.id
left join member_user mu on contact.
contact_
member_id = mu.id
WHERE 1=1 AND contact.deleted = 0 AND contact.enter_open_sea_time is NOT NULL
WHERE 1=1 AND contact.deleted = 0 AND contact.enter_open_sea_time is NOT NULL
<include
refid=
"myCustomerQuery"
/>
<include
refid=
"myCustomerQuery"
/>
...
@@ -1555,6 +1563,7 @@
...
@@ -1555,6 +1563,7 @@
c.social as default_social,
c.social as default_social,
c.email as default_email,
c.email as default_email,
c.social_number as default_social_number,
c.social_number as default_social_number,
c.userid as contact_member_id,
su.nickname as customer_service_name,
su.nickname as customer_service_name,
su.dept_id as dept_id
su.dept_id as dept_id
from ecw_customer a
from ecw_customer a
...
@@ -1567,7 +1576,7 @@
...
@@ -1567,7 +1576,7 @@
on contact.credit_level = credit.id
on contact.credit_level = credit.id
left join ecw_country ec on contact.country = ec.id
left join ecw_country ec on contact.country = ec.id
left join member_user mu on contact.member_id = mu.id
left join member_user mu on contact.
contact_
member_id = mu.id
WHERE 1=1 AND contact.deleted = 0 AND contact.enter_open_sea_time is NOT NULL
WHERE 1=1 AND contact.deleted = 0 AND contact.enter_open_sea_time is NOT NULL
<include
refid=
"myCustomerQuery"
/>
<include
refid=
"myCustomerQuery"
/>
</select>
</select>
...
@@ -1627,6 +1636,7 @@
...
@@ -1627,6 +1636,7 @@
c.social as default_social,
c.social as default_social,
c.email as default_email,
c.email as default_email,
c.social_number as default_social_number,
c.social_number as default_social_number,
c.userid as contact_member_id,
su.nickname as customer_service_name,
su.nickname as customer_service_name,
su.dept_id as dept_id
su.dept_id as dept_id
from ecw_customer a
from ecw_customer a
...
@@ -1638,7 +1648,7 @@
...
@@ -1638,7 +1648,7 @@
left join ecw_customer_credit credit
left join ecw_customer_credit credit
on contact.credit_level = credit.id
on contact.credit_level = credit.id
left join ecw_country ec on contact.country = ec.id
left join ecw_country ec on contact.country = ec.id
left join member_user mu on contact.member_id = mu.id
left join member_user mu on contact.
contact_
member_id = mu.id
WHERE 1=1 AND contact.deleted = 0
WHERE 1=1 AND contact.deleted = 0
<if
test=
"deptId != null and deptId>0"
>
<if
test=
"deptId != null and deptId>0"
>
...
@@ -1664,6 +1674,7 @@
...
@@ -1664,6 +1674,7 @@
c.social as default_social,
c.social as default_social,
c.email as default_email,
c.email as default_email,
c.social_number as default_social_number,
c.social_number as default_social_number,
c.userid as contact_member_id,
su.nickname as customer_service_name,
su.nickname as customer_service_name,
su.dept_id as dept_id
su.dept_id as dept_id
from ecw_customer a
from ecw_customer a
...
@@ -1675,7 +1686,7 @@
...
@@ -1675,7 +1686,7 @@
left join ecw_customer_credit credit
left join ecw_customer_credit credit
on contact.credit_level = credit.id
on contact.credit_level = credit.id
left join ecw_country ec on contact.country = ec.id
left join ecw_country ec on contact.country = ec.id
left join member_user mu on contact.member_id = mu.id
left join member_user mu on contact.
contact_
member_id = mu.id
WHERE 1=1 AND contact.deleted = 0
WHERE 1=1 AND contact.deleted = 0
<if
test=
"deptId != null and deptId>0"
>
<if
test=
"deptId != null and deptId>0"
>
...
...
yudao-module-customer/yudao-module-customer-core/src/main/resources/mapper/customer/IndirectCustomerMapper.xml
View file @
35fb74da
...
@@ -55,7 +55,8 @@
...
@@ -55,7 +55,8 @@
LEFT JOIN ecw_indirect_customer_contacts c ON a.id = c.customer_id
LEFT JOIN ecw_indirect_customer_contacts c ON a.id = c.customer_id
LEFT JOIN ecw_customer agent ON a.agent_customer_id = agent.id
LEFT JOIN ecw_customer agent ON a.agent_customer_id = agent.id
LEFT JOIN system_user su ON a.customer_service = su.id
LEFT JOIN system_user su ON a.customer_service = su.id
left join member_user mu on agent.member_id = mu.id
left join ecw_customer_contacts ecc on agent.id = ecc.customer_id
left join member_user mu on ecc.userid = mu.id
WHERE
WHERE
c.is_default = 1 AND a.deleted = 0
c.is_default = 1 AND a.deleted = 0
AND c.deleted = 0
AND c.deleted = 0
...
@@ -183,7 +184,8 @@
...
@@ -183,7 +184,8 @@
LEFT JOIN ecw_indirect_customer_contacts c ON a.id = c.customer_id
LEFT JOIN ecw_indirect_customer_contacts c ON a.id = c.customer_id
LEFT JOIN ecw_customer agent ON a.agent_customer_id = agent.id
LEFT JOIN ecw_customer agent ON a.agent_customer_id = agent.id
LEFT JOIN system_user su ON a.customer_service = su.id
LEFT JOIN system_user su ON a.customer_service = su.id
left join member_user mu on agent.member_id = mu.id
left join ecw_customer_contacts ecc on agent.id = ecc.customer_id
left join member_user mu on ecc.userid = mu.id
WHERE
WHERE
c.is_default = 1 AND a.deleted = 0
c.is_default = 1 AND a.deleted = 0
AND c.deleted = 0
AND c.deleted = 0
...
@@ -210,7 +212,8 @@
...
@@ -210,7 +212,8 @@
LEFT JOIN ecw_indirect_customer_contacts c ON a.id = c.customer_id
LEFT JOIN ecw_indirect_customer_contacts c ON a.id = c.customer_id
LEFT JOIN ecw_customer agent ON a.agent_customer_id = agent.id
LEFT JOIN ecw_customer agent ON a.agent_customer_id = agent.id
LEFT JOIN system_user su ON a.customer_service = su.id
LEFT JOIN system_user su ON a.customer_service = su.id
left join member_user mu on agent.member_id = mu.id
left join ecw_customer_contacts ecc on agent.id = ecc.customer_id
left join member_user mu on ecc.userid = mu.id
WHERE
WHERE
c.is_default = 1 AND a.deleted = 0
c.is_default = 1 AND a.deleted = 0
AND c.deleted = 0
AND c.deleted = 0
...
...
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