Skip to content

J
jiedao-api-boot-master
Commit 6f32cb16 authored by zhaobiyan's avatar zhaobiyan
Browse files
Options

客户模块新增筛选字段

parent 7d2006a9
Show whitespace changes
Inline Side-by-side
Showing with 79 additions and 12 deletions
yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/dto/CustomerExportReqDTO.java
View file @ 6f32cb16
......@@ -88,4 +88,13 @@ public class CustomerExportReqDTO {
private List<Integer> marketType;
private int deptId ;
@ApiModelProperty(value = "会员编号")
private String memberCode;
@ApiModelProperty(value = "会员名称")
private String memberName;
@ApiModelProperty(value = "会员手机")
private String memberMobile;
@ApiModelProperty(value = "会员区号")
private String memberAreaCode;
}
yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/dto/CustomerPageReqDTO.java
View file @ 6f32cb16
......@@ -92,4 +92,12 @@ public class CustomerPageReqDTO extends PageParam {
@ApiModelProperty(value = "是否潜在客户")
private Boolean isPotential;
@ApiModelProperty(value = "会员编号")
private String memberCode;
@ApiModelProperty(value = "会员名称")
private String memberName;
@ApiModelProperty(value = "会员手机")
private String memberMobile;
@ApiModelProperty(value = "会员区号")
private String memberAreaCode;
}
yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/dto/indirectCustomer/IndirectCustomerPageReqDTO.java
View file @ 6f32cb16
......@@ -50,4 +50,13 @@ public class IndirectCustomerPageReqDTO {
* 客户来源
*/
private List<Integer> source;
@ApiModelProperty(value = "会员编号")
private String memberCode;
@ApiModelProperty(value = "会员名称")
private String memberName;
@ApiModelProperty(value = "会员手机")
private String memberMobile;
@ApiModelProperty(value = "会员区号")
private String memberAreaCode;
}
yudao-module-customer/yudao-module-customer-core/src/main/resources/mapper/customer/CustomerMapper.xml
View file @ 6f32cb16
......@@ -83,7 +83,7 @@
left join ecw_customer_credit credit
on contact.credit_level = credit.id
left join ecw_country ec on contact.country = ec.id
left join member_user mu on a.member_id = mu.id
WHERE 1=1 AND contact.deleted = 0
......@@ -124,7 +124,7 @@
left join ecw_customer_credit credit
on contact.credit_level = credit.id
left join ecw_country ec on contact.country = ec.id
left join member_user mu on a.member_id = mu.id
WHERE 1=1 AND contact.deleted = 0
......@@ -165,7 +165,7 @@
left join ecw_customer_credit credit
on contact.credit_level = credit.id
left join ecw_country ec on contact.country = ec.id
left join member_user mu on a.member_id = mu.id
WHERE 1=1 AND contact.deleted = 0
......@@ -201,7 +201,7 @@
left join ecw_customer_credit credit
on contact.credit_level = credit.id
left join ecw_country ec on contact.country = ec.id
left join member_user mu on a.member_id = mu.id
WHERE 1=1 AND contact.deleted = 0
......@@ -394,6 +394,19 @@
</foreach>
</if>
</if>
<!-- 会员信息 -->
<if test="query.memberCode != null and query.memberCode != '' ">
AND mu.code like concat('%',#{query.memberCode},'%')
</if>
<if test="query.memberName != null and query.memberName != '' ">
AND mu.nickname like concat('%',#{query.memberName},'%')
</if>
<if test="query.memberMobile != null and query.memberMobile != '' ">
AND mu.mobile like concat('%',#{query.memberMobile},'%')
</if>
<if test="query.memberAreaCode != null and query.memberAreaCode != '' ">
AND mu.area_code like concat('%',#{query.memberAreaCode},'%')
</if>
</sql>
<select id="getMyCustomerExcelVoList"
resultType="cn.iocoder.yudao.module.customer.dal.dataobject.customer.CustomerDO">
......@@ -458,7 +471,7 @@
left join ecw_customer_credit credit
on contact.credit_level = credit.id
left join ecw_country ec on contact.country = ec.id
left join member_user mu on a.member_id = mu.id
WHERE 1=1 AND contact.deleted = 0
<include refid="myCustomerQuery"/>
......@@ -660,6 +673,19 @@
</foreach>
</if>
</if>
<!-- 会员信息 -->
<if test="query.memberCode != null and query.memberCode != '' ">
AND mu.code like concat('%',#{query.memberCode},'%')
</if>
<if test="query.memberName != null and query.memberName != '' ">
AND mu.nickname like concat('%',#{query.memberName},'%')
</if>
<if test="query.memberMobile != null and query.memberMobile != '' ">
AND mu.mobile like concat('%',#{query.memberMobile},'%')
</if>
<if test="query.memberAreaCode != null and query.memberAreaCode != '' ">
AND mu.area_code like concat('%',#{query.memberAreaCode},'%')
</if>
</sql>
<select id="searchCustomer" resultType="cn.iocoder.yudao.module.customer.dal.dataobject.customer.CustomerDO">
select contact.*,
......@@ -1396,7 +1422,7 @@
left join ecw_customer_credit credit
on contact.credit_level = credit.id
left join ecw_country ec on contact.country = ec.id
left join member_user mu on a.member_id = mu.id
WHERE 1=1 AND contact.deleted = 0
......@@ -1430,7 +1456,7 @@
left join ecw_customer_credit credit
on contact.credit_level = credit.id
left join ecw_country ec on contact.country = ec.id
left join member_user mu on a.member_id = mu.id
WHERE 1=1 AND contact.deleted = 0
......@@ -1506,7 +1532,7 @@
on contact.credit_level = credit.id
left join ecw_country ec on contact.country = ec.id
left join member_user mu on a.member_id = mu.id
WHERE 1=1 AND contact.deleted = 0 AND contact.enter_open_sea_time is NOT NULL
<include refid="myCustomerQuery"/>
......@@ -1541,7 +1567,7 @@
on contact.credit_level = credit.id
left join ecw_country ec on contact.country = ec.id
left join member_user mu on a.member_id = mu.id
WHERE 1=1 AND contact.deleted = 0 AND contact.enter_open_sea_time is NOT NULL
<include refid="myCustomerQuery"/>
</select>
......@@ -1612,7 +1638,7 @@
left join ecw_customer_credit credit
on contact.credit_level = credit.id
left join ecw_country ec on contact.country = ec.id
left join member_user mu on a.member_id = mu.id
WHERE 1=1 AND contact.deleted = 0
<if test="deptId != null and deptId>0">
......@@ -1649,7 +1675,7 @@
left join ecw_customer_credit credit
on contact.credit_level = credit.id
left join ecw_country ec on contact.country = ec.id
left join member_user mu on a.member_id = mu.id
WHERE 1=1 AND contact.deleted = 0
<if test="deptId != null and deptId>0">
......
yudao-module-customer/yudao-module-customer-core/src/main/resources/mapper/customer/IndirectCustomerMapper.xml
View file @ 6f32cb16
......@@ -55,6 +55,7 @@
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 system_user su ON a.customer_service = su.id
left join member_user mu on agent.member_id = mu.id
WHERE
c.is_default = 1 AND a.deleted = 0
AND c.deleted = 0
......@@ -150,7 +151,19 @@
</foreach>
</if>
</if>
<!-- 会员信息 -->
<if test="query.memberCode != null and query.memberCode != '' ">
AND mu.code like concat('%',#{query.memberCode},'%')
</if>
<if test="query.memberName != null and query.memberName != '' ">
AND mu.nickname like concat('%',#{query.memberName},'%')
</if>
<if test="query.memberMobile != null and query.memberMobile != '' ">
AND mu.mobile like concat('%',#{query.memberMobile},'%')
</if>
<if test="query.memberAreaCode != null and query.memberAreaCode != '' ">
AND mu.area_code like concat('%',#{query.memberAreaCode},'%')
</if>
</sql>
<select id="getOpenSeaCustomerPageReqCount" resultType="java.lang.Long"
parameterType="cn.iocoder.yudao.module.customer.dto.indirectCustomer.IndirectCustomerPageReqDTO">
......@@ -170,6 +183,7 @@
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 system_user su ON a.customer_service = su.id
left join member_user mu on agent.member_id = mu.id
WHERE
c.is_default = 1 AND a.deleted = 0
AND c.deleted = 0
......@@ -196,6 +210,7 @@
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 system_user su ON a.customer_service = su.id
left join member_user mu on agent.member_id = mu.id
WHERE
c.is_default = 1 AND a.deleted = 0
AND c.deleted = 0
......
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