From 8a66320f8b0d8a148fe67345f148ae5df10b3c7e Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Mon, 26 Sep 2022 14:49:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=88=86=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E4=B8=8B=E4=B8=9A=E5=8A=A1=E5=91=98=E4=B8=8B=E7=9A=84=E5=AE=A2?= =?UTF-8?q?=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crmcustomertemp/CrmCustomerTempFeign.java | 8 +++++++- .../CrmCustomerTempFeignFallback.java | 5 +++++ .../CrmCustomerTempListQuery.java | 17 +++++++++++++++++ .../CrmCustomerTempListVo.java | 19 +++++++++++++++++++ .../CrmCustomerTempMapper.java | 1 + .../crmcustomertemp/CrmCustomerTempMapper.xml | 7 +++++++ .../crmcustomertemp/CrmCustomerTempRest.java | 5 +++++ .../CrmCustomerTempService.java | 13 +++++++++++++ doc/databases/base_tables.sql | 2 ++ 9 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempListQuery.java create mode 100644 anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempListVo.java diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java index d07dc6c1e2..93b80f3b8b 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java @@ -8,6 +8,7 @@ import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -149,6 +150,11 @@ public interface CrmCustomerTempFeign { @ResponseBody @GetMapping("/selectCustomerFile/{customerSid}") - public ResultBean> selectCustomerFile(@PathVariable("customerSid")String customerSid); + public ResultBean> selectCustomerFile(@PathVariable("customerSid") String customerSid); + + @ResponseBody + @GetMapping("/selectCustomerList") + @ApiOperation("查询该分公司业务员下的客户列表") + ResultBean> selectCustomerList(@SpringQueryMap CrmCustomerTempListQuery query); } \ No newline at end of file diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java index 551ea612e5..082e12e22f 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java @@ -120,5 +120,10 @@ public class CrmCustomerTempFeignFallback implements CrmCustomerTempFeign { return null; } + @Override + public ResultBean> selectCustomerList(CrmCustomerTempListQuery query) { + return null; + } + } \ No newline at end of file diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempListQuery.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempListQuery.java new file mode 100644 index 0000000000..97255c2000 --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempListQuery.java @@ -0,0 +1,17 @@ +package com.yxt.anrui.crm.api.crmcustomertemp; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/9/26 14:30 + * @Description + */ +@Data +public class CrmCustomerTempListQuery implements Query { + private static final long serialVersionUID = -8235453055415557265L; + + private String userSid; + private String staffSid; +} diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempListVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempListVo.java new file mode 100644 index 0000000000..5c7958c9df --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempListVo.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.crm.api.crmcustomertemp; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/9/26 14:28 + * @Description + */ +@Data +public class CrmCustomerTempListVo implements Vo { + private static final long serialVersionUID = 5338688085476236821L; + + private String name; + private String sid; + private String mobile; + +} diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java index d717d7a8b4..2105142b36 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java @@ -118,4 +118,5 @@ public interface CrmCustomerTempMapper extends BaseMapper { CrmCustomerTempVo selByMobile(@Param("mobile") String mobile); + List selectCustomerList(@Param("orgSid") String orgSid, @Param("staffSid") String staffSid); } \ No newline at end of file diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml index 2fc3dc7661..ffe5a53526 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml @@ -205,4 +205,11 @@ FROM crm_customer_temp WHERE mobile = #{mobile} + + \ No newline at end of file diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java index 040143a4fa..faaed9f779 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java @@ -268,5 +268,10 @@ public class CrmCustomerTempRest implements CrmCustomerTempFeign { return crmCustomerFileService.selectCustomerFile(customerSid); } + @Override + public ResultBean> selectCustomerList(CrmCustomerTempListQuery query) { + return crmCustomerTempService.selectCustomerList(query); + } + } diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java index 96088ff15a..c2dcddd659 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java @@ -23,6 +23,7 @@ import com.yxt.anrui.crm.biz.crmvehicledemand.CrmVehicledemandService; import com.yxt.anrui.crm.biz.crmvisit.CrmVisitService; import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign; import com.yxt.anrui.portal.api.dictcommon.DictCommonVo; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo; import com.yxt.anrui.portal.api.sysuser.SysUserVo; @@ -85,6 +86,8 @@ public class CrmCustomerTempService extends MybatisBaseService listPage(PagerQuery pq) { @@ -877,4 +880,14 @@ public class CrmCustomerTempService extends MybatisBaseService> selectCustomerList(CrmCustomerTempListQuery query) { + ResultBean> rb = ResultBean.fireFail(); + String staffSid = query.getStaffSid(); + //根据用户sid查询分公司sid + String orgSid = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid()).getData(); + List list = baseMapper.selectCustomerList(orgSid, staffSid); + list.removeAll(Collections.singleton(null)); + return rb.success().setData(list); + } } \ No newline at end of file diff --git a/doc/databases/base_tables.sql b/doc/databases/base_tables.sql index 3cfd4399d8..7c3c4e040f 100644 --- a/doc/databases/base_tables.sql +++ b/doc/databases/base_tables.sql @@ -922,8 +922,10 @@ CREATE TABLE `base_vehicle_out` `isTerminal` varchar(64) DEFAULT NULL COMMENT '是否为终端客户', `customerName` varchar(255) DEFAULT NULL COMMENT '客户名称', `mobile` varchar(255) DEFAULT NULL COMMENT '手机号', + `customerSid` varchar(255) DEFAULT NULL COMMENT '客户sid', `actualCustomer` varchar(255) DEFAULT NULL COMMENT '实际购车人名称', `actualMobile` varchar(255) DEFAULT NULL COMMENT '实际购车人手机号', + `actualSid` varchar(255) DEFAULT NULL COMMENT '实际购车人sid', `giftsDescription` varchar(255) DEFAULT NULL COMMENT '赠品说明', `distributorName` varchar(255) DEFAULT NULL COMMENT '二次经销商', `rebateAmount` varchar(255) DEFAULT NULL COMMENT '返利金额',