Skip to content

J
jiedao-api-boot-master
Commit cb078cf5 authored by lanbaoming's avatar lanbaoming
Browse files
Options

2024-06-17-2提交

parent 84e75508
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 36 deletions
yudao-module-customer/yudao-module-customer-core/src/main/resources/mapper/customer/CustomerMapper.xml
View file @ cb078cf5
...@@ -11,10 +11,10 @@ ...@@ -11,10 +11,10 @@
(select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts s (select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts s
where s.deleted = 0 and s.customer_id=contact.id) as all_contact_phone where s.deleted = 0 and s.customer_id=contact.id) as all_contact_phone
from (select a.*, from (select a.*,
c.name as default_contact_name, c.name as default_contact_name2,
<!--concat(c.area_code, c.phone_new, '') as default_contact_phone,--> concat(c.area_code, c.phone_new, '') as default_contact_phone,
(select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts (select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts
s where s.deleted = 0 and s.customer_id=a.id) as default_contact_phone, s where s.deleted = 0 and s.customer_id=a.id) as default_contact_phone2,
c.phone_new as contactPhone, c.phone_new as contactPhone,
c.id as defaultContactId, c.id as defaultContactId,
c.social as default_social, c.social as default_social,
...@@ -67,9 +67,9 @@ ...@@ -67,9 +67,9 @@
(select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts s where s.deleted = 0 and s.customer_id=contact.id) as all_contact_phone (select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts s where s.deleted = 0 and s.customer_id=contact.id) as all_contact_phone
from (select a.*, from (select a.*,
c.name as default_contact_name, c.name as default_contact_name,
<!-- concat(c.area_code, c.phone_new, '') as default_contact_phone,--> concat(c.area_code, c.phone_new, '') as default_contact_phone,
(select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts (select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts
s where s.deleted = 0 and s.customer_id=a.id) as default_contact_phone, s where s.deleted = 0 and s.customer_id=a.id) as default_contact_phone2,
c.phone_new as contactPhone, c.phone_new as contactPhone,
c.id as defaultContactId, c.id as defaultContactId,
c.social as default_social, c.social as default_social,
...@@ -108,9 +108,9 @@ ...@@ -108,9 +108,9 @@
(select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts s where s.deleted = 0 and s.customer_id=contact.id) as all_contact_phone (select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts s where s.deleted = 0 and s.customer_id=contact.id) as all_contact_phone
from (select a.*, from (select a.*,
c.name as default_contact_name, c.name as default_contact_name,
<!--concat(c.area_code, c.phone_new, '') as default_contact_phone,--> concat(c.area_code, c.phone_new, '') as default_contact_phone,
(select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts (select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts
s where s.deleted = 0 and s.customer_id=a.id) as default_contact_phone, s where s.deleted = 0 and s.customer_id=a.id) as default_contact_phone2,
c.phone_new as contactPhone, c.phone_new as contactPhone,
c.id as defaultContactId, c.id as defaultContactId,
c.social as default_social, c.social as default_social,
...@@ -149,9 +149,9 @@ ...@@ -149,9 +149,9 @@
(select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts s where s.deleted = 0 and s.customer_id=contact.id) as all_contact_phone (select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts s where s.deleted = 0 and s.customer_id=contact.id) as all_contact_phone
from (select a.*, from (select a.*,
c.name as default_contact_name, c.name as default_contact_name,
<!--concat(c.area_code, c.phone_new, '') as default_contact_phone,--> concat(c.area_code, c.phone_new, '') as default_contact_phone,
(select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts (select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts
s where s.deleted = 0 and s.customer_id=a.id) as default_contact_phone, s where s.deleted = 0 and s.customer_id=a.id) as default_contact_phone2,
c.phone_new as contactPhone, c.phone_new as contactPhone,
c.id as defaultContactId, c.id as defaultContactId,
c.social as default_social, c.social as default_social,
...@@ -186,6 +186,8 @@ ...@@ -186,6 +186,8 @@
from (select a.*, from (select a.*,
c.name as default_contact_name, c.name as default_contact_name,
concat(c.area_code, c.phone_new, '') as default_contact_phone, concat(c.area_code, c.phone_new, '') as default_contact_phone,
(select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts
s where s.deleted = 0 and s.customer_id=a.id) as default_contact_phone2,
c.phone_new as contactPhone, c.phone_new as contactPhone,
c.id as defaultContactId, c.id as defaultContactId,
c.social as default_social, c.social as default_social,
...@@ -219,7 +221,7 @@ ...@@ -219,7 +221,7 @@
AND contact.name LIKE concat('%', concat( #{query.name}, '%' )) AND contact.name LIKE concat('%', concat( #{query.name}, '%' ))
</if> </if>
<if test="query.defaultContactPhone != null and query.defaultContactPhone != '' "> <if test="query.defaultContactPhone != null and query.defaultContactPhone != '' ">
AND contact.default_contact_phone LIKE concat('%', concat( #{query.defaultContactPhone}, '%' )) AND contact.default_contact_phone2 LIKE concat('%', concat( #{query.defaultContactPhone}, '%' ))
</if> </if>
<if test="query.defaultContactName != null and query.defaultContactName != '' "> <if test="query.defaultContactName != null and query.defaultContactName != '' ">
AND contact.all_contact_phone LIKE concat('%', concat( #{query.defaultContactName}, '%' )) AND contact.all_contact_phone LIKE concat('%', concat( #{query.defaultContactName}, '%' ))
...@@ -408,9 +410,9 @@ ...@@ -408,9 +410,9 @@
where s.deleted = 0 and s.customer_id=contact.id) as all_contact_phone where s.deleted = 0 and s.customer_id=contact.id) as all_contact_phone
from (select a.*, from (select a.*,
c.name as default_contact_name, c.name as default_contact_name,
<!-- concat(c.area_code, c.phone_new, '') as default_contact_phone,--> concat(c.area_code, c.phone_new, '') as default_contact_phone,
(select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts (select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts
s where s.deleted = 0 and s.customer_id=a.id) as default_contact_phone, s where s.deleted = 0 and s.customer_id=a.id) as default_contact_phone2,
c.phone_new as contactPhone, c.phone_new as contactPhone,
c.id as defaultContactId, c.id as defaultContactId,
c.social as default_social, c.social as default_social,
...@@ -440,9 +442,9 @@ ...@@ -440,9 +442,9 @@
select count(1) select count(1)
from (select a.*, from (select a.*,
c.name as default_contact_name, c.name as default_contact_name,
<!--concat(c.area_code, c.phone_new, '') as default_contact_phone,--> concat(c.area_code, c.phone_new, '') as default_contact_phone,
(select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts (select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts
s where s.deleted = 0 and s.customer_id=a.id) as default_contact_phone, s where s.deleted = 0 and s.customer_id=a.id) as default_contact_phone2,
c.phone_new as contactPhone, c.phone_new as contactPhone,
c.id as defaultContactId, c.id as defaultContactId,
c.social as default_social, c.social as default_social,
...@@ -473,7 +475,7 @@ ...@@ -473,7 +475,7 @@
AND contact.name LIKE concat('%', concat( #{query.name}, '%' )) AND contact.name LIKE concat('%', concat( #{query.name}, '%' ))
</if> </if>
<if test="query.defaultContactPhone != null and query.defaultContactPhone != '' "> <if test="query.defaultContactPhone != null and query.defaultContactPhone != '' ">
AND contact.default_contact_phone LIKE concat('%', concat( #{query.defaultContactPhone}, '%' )) AND contact.default_contact_phone2 LIKE concat('%', concat( #{query.defaultContactPhone}, '%' ))
</if> </if>
<if test="query.defaultContactName != null and query.defaultContactName != '' "> <if test="query.defaultContactName != null and query.defaultContactName != '' ">
AND contact.all_contact_phone LIKE concat('%', concat( #{query.defaultContactName}, '%' )) AND contact.all_contact_phone LIKE concat('%', concat( #{query.defaultContactName}, '%' ))
...@@ -670,9 +672,9 @@ ...@@ -670,9 +672,9 @@
credit.name_en as credit_level_name_en credit.name_en as credit_level_name_en
from (select a.*, from (select a.*,
c.name as default_contact_name, c.name as default_contact_name,
<!-- concat(c.area_code, c.phone_new, '') as default_contact_phone,--> concat(c.area_code, c.phone_new, '') as default_contact_phone,
(select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts (select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts
s where s.deleted = 0 and s.customer_id=a.id) as default_contact_phone, s where s.deleted = 0 and s.customer_id=a.id) as default_contact_phone2,
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
...@@ -1378,9 +1380,9 @@ ...@@ -1378,9 +1380,9 @@
(select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts s where s.deleted = 0 and s.customer_id=contact.id) as all_contact_phone (select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts s where s.deleted = 0 and s.customer_id=contact.id) as all_contact_phone
from (select a.*, from (select a.*,
c.name as default_contact_name, c.name as default_contact_name,
<!--concat(c.area_code, c.phone_new, '') as default_contact_phone,--> concat(c.area_code, c.phone_new, '') as default_contact_phone,
(select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts (select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts
s where s.deleted = 0 and s.customer_id=a.id) as default_contact_phone, s where s.deleted = 0 and s.customer_id=a.id) as default_contact_phone2,
c.phone_new as contactPhone, c.phone_new as contactPhone,
c.id as defaultContactId, c.id as defaultContactId,
c.social as default_social, c.social as default_social,
...@@ -1412,9 +1414,9 @@ ...@@ -1412,9 +1414,9 @@
select count(1) select count(1)
from (select a.*, from (select a.*,
c.name as default_contact_name, c.name as default_contact_name,
<!-- concat(c.area_code, c.phone_new, '') as default_contact_phone,--> concat(c.area_code, c.phone_new, '') as default_contact_phone,
(select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts (select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts
s where s.deleted = 0 and s.customer_id=a.id) as default_contact_phone, s where s.deleted = 0 and s.customer_id=a.id) as default_contact_phone2,
c.phone_new as contactPhone, c.phone_new as contactPhone,
c.id as defaultContactId, c.id as defaultContactId,
c.social as default_social, c.social as default_social,
...@@ -1450,9 +1452,9 @@ ...@@ -1450,9 +1452,9 @@
(select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts s where s.deleted = 0 and s.customer_id=contact.id) as all_contact_phone (select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts s where s.deleted = 0 and s.customer_id=contact.id) as all_contact_phone
from (select a.*, from (select a.*,
c.name as default_contact_name, c.name as default_contact_name,
<!--concat(c.area_code, c.phone_new, '') as default_contact_phone,--> concat(c.area_code, c.phone_new, '') as default_contact_phone,
(select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts (select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts
s where s.deleted = 0 and s.customer_id=a.id) as default_contact_phone, s where s.deleted = 0 and s.customer_id=a.id) as default_contact_phone2,
c.phone_new as contactPhone, c.phone_new as contactPhone,
c.id as defaultContactId, c.id as defaultContactId,
c.social as default_social, c.social as default_social,
...@@ -1487,9 +1489,9 @@ ...@@ -1487,9 +1489,9 @@
(select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts s where s.deleted = 0 and s.customer_id=contact.id) as all_contact_phone (select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts s where s.deleted = 0 and s.customer_id=contact.id) as all_contact_phone
from (select a.*, from (select a.*,
c.name as default_contact_name, c.name as default_contact_name,
<!-- concat(c.area_code, c.phone_new, '') as default_contact_phone,--> concat(c.area_code, c.phone_new, '') as default_contact_phone,
(select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts (select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts
s where s.deleted = 0 and s.customer_id=a.id) as default_contact_phone, s where s.deleted = 0 and s.customer_id=a.id) as default_contact_phone2,
c.phone_new as contactPhone, c.phone_new as contactPhone,
c.id as defaultContactId, c.id as defaultContactId,
c.social as default_social, c.social as default_social,
...@@ -1522,9 +1524,9 @@ ...@@ -1522,9 +1524,9 @@
select count(1) select count(1)
from (select a.*, from (select a.*,
c.name as default_contact_name, c.name as default_contact_name,
<!-- concat(c.area_code, c.phone_new, '') as default_contact_phone,--> concat(c.area_code, c.phone_new, '') as default_contact_phone,
(select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts (select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts
s where s.deleted = 0 and s.customer_id=a.id) as default_contact_phone, s where s.deleted = 0 and s.customer_id=a.id) as default_contact_phone2,
c.phone_new as contactPhone, c.phone_new as contactPhone,
c.id as defaultContactId, c.id as defaultContactId,
c.social as default_social, c.social as default_social,
...@@ -1558,9 +1560,9 @@ ...@@ -1558,9 +1560,9 @@
(select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts s where s.deleted = 0 and s.customer_id=contact.id) as all_contact_phone (select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts s where s.deleted = 0 and s.customer_id=contact.id) as all_contact_phone
from (select a.*, from (select a.*,
c.name as default_contact_name, c.name as default_contact_name,
<!-- concat(c.area_code, c.phone_new, '') as default_contact_phone,--> concat(c.area_code, c.phone_new, '') as default_contact_phone,
(select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts (select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts
s where s.deleted = 0 and s.customer_id=a.id) as default_contact_phone, s where s.deleted = 0 and s.customer_id=a.id) as default_contact_phone2,
c.phone_new as contactPhone, c.phone_new as contactPhone,
c.id as defaultContactId, c.id as defaultContactId,
c.social as default_social, c.social as default_social,
...@@ -1594,9 +1596,9 @@ ...@@ -1594,9 +1596,9 @@
(select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts s where s.deleted = 0 and s.customer_id=contact.id) as all_contact_phone (select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts s where s.deleted = 0 and s.customer_id=contact.id) as all_contact_phone
from (select a.*, from (select a.*,
c.name as default_contact_name, c.name as default_contact_name,
<!-- concat(c.area_code, c.phone_new, '') as default_contact_phone,--> concat(c.area_code, c.phone_new, '') as default_contact_phone,
(select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts (select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts
s where s.deleted = 0 and s.customer_id=a.id) as default_contact_phone, s where s.deleted = 0 and s.customer_id=a.id) as default_contact_phone2,
c.phone_new as contactPhone, c.phone_new as contactPhone,
c.id as defaultContactId, c.id as defaultContactId,
c.social as default_social, c.social as default_social,
...@@ -1631,9 +1633,9 @@ ...@@ -1631,9 +1633,9 @@
select count(1) select count(1)
from (select a.*, from (select a.*,
c.name as default_contact_name, c.name as default_contact_name,
<!--concat(c.area_code, c.phone_new, '') as default_contact_phone,--> concat(c.area_code, c.phone_new, '') as default_contact_phone,
(select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts (select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts
s where s.deleted = 0 and s.customer_id=a.id) as default_contact_phone, s where s.deleted = 0 and s.customer_id=a.id) as default_contact_phone2,
c.phone_new as contactPhone, c.phone_new as contactPhone,
c.id as defaultContactId, c.id as defaultContactId,
c.social as default_social, c.social as default_social,
...@@ -1669,9 +1671,9 @@ ...@@ -1669,9 +1671,9 @@
(select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts s where s.deleted = 0 and s.customer_id=contact.id) as all_contact_phone (select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts s where s.deleted = 0 and s.customer_id=contact.id) as all_contact_phone
from (select a.*, from (select a.*,
c.name as default_contact_name, c.name as default_contact_name,
<!--concat(c.area_code, c.phone_new, '') as default_contact_phone,--> concat(c.area_code, c.phone_new, '') as default_contact_phone,
(select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts (select GROUP_CONCAT(s.phone_new) from ecw_customer_contacts
s where s.deleted = 0 and s.customer_id=a.id) as default_contact_phone, s where s.deleted = 0 and s.customer_id=a.id) as default_contact_phone2,
c.phone_new as contactPhone, c.phone_new as contactPhone,
c.id as defaultContactId, c.id as defaultContactId,
c.social as default_social, c.social as default_social,
......
yudao-module-customer/yudao-module-customer-rest/src/main/java/cn/iocoder/yudao/module/customer/controller/admin/customer/CustomerController.java
View file @ cb078cf5
...@@ -406,7 +406,7 @@ public class CustomerController { ...@@ -406,7 +406,7 @@ public class CustomerController {
@GetMapping("/get-wait-for-distribution") @GetMapping("/get-wait-for-distribution")
@ApiOperation("获得待分配客户列表") @ApiOperation("获得待分配客户列表")
// @PreAuthorize("@ss.hasPermission('ecw:customer:query')") //@PreAuthorize("@ss.hasPermission('ecw:customer:query')")
public CommonResult<PageResult<CustomerRespVO>> getWaitForDistributionList(@Valid CustomerPageReqDTO customerPageReqVO, PageVO page) { public CommonResult<PageResult<CustomerRespVO>> getWaitForDistributionList(@Valid CustomerPageReqDTO customerPageReqVO, PageVO page) {
//lanbm 2024-05-26 添加注释 //lanbm 2024-05-26 添加注释
PageResult<CustomerDO> pageResult = PageResult<CustomerDO> pageResult =
......
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