From ecbb71b8313a284c4aa25bb352328b23d76ec727 Mon Sep 17 00:00:00 2001
From: shijie <648688341@qq.com>
Date: Thu, 12 Nov 2020 15:59:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=89=80=E6=9C=89=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E7=BC=96=E5=8F=B7=E5=92=8C=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../crms/controller/CustomerController.java   | 12 ++++++++
 .../crms/dao/CompanyCustomerDao.java          |  3 +-
 .../financial/crms/dao/CustomerDao.java       |  2 ++
 .../crms/service/CustomerService.java         |  3 ++
 .../service/impl/CustomerServiceImpl.java     |  7 ++---
 .../mapper/crms/CompanyCustomerDao.xml        | 29 +++++++++----------
 .../resources/mapper/crms/CustomerDao.xml     |  4 +++
 7 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java
index d6d021c4..82833dbf 100644
--- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java
+++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java
@@ -2,6 +2,8 @@ package com.daqing.financial.crms.controller;
 
 import com.daqing.financial.crms.CustomerControllerApi;
 import com.daqing.financial.crms.service.CustomerService;
+import com.daqing.framework.domain.crms.CompanyCustomerEntity;
+import com.daqing.framework.domain.crms.CustomerEntity;
 import com.daqing.framework.domain.crms.ext.CustomerCompanyTOI;
 import com.daqing.framework.domain.crms.ext.CustomerCompanyTOU;
 import com.daqing.framework.domain.crms.ext.CustomerPersonalTOI;
@@ -153,4 +155,14 @@ public class CustomerController implements CustomerControllerApi {
 
         return customerService.queryCustomerInfoById(applyAmountInfo);
     }
+
+    /**
+     * 查询所有客户编号/客户名称
+     */
+    @GetMapping("/queryCompanyCodeAndName")
+    public ResponseResult queryCompanyCodeAndName(){
+
+        List<CustomerEntity>list = customerService.queryCompanyCodeAndName();
+        return  ResponseResult.SUCCESS(list);
+    }
 }
diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CompanyCustomerDao.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CompanyCustomerDao.java
index cc2e41d0..5628e1ba 100644
--- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CompanyCustomerDao.java
+++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CompanyCustomerDao.java
@@ -2,6 +2,7 @@ package com.daqing.financial.crms.dao;
 
 import com.daqing.framework.domain.crms.CompanyCustomerEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.daqing.framework.domain.crms.CustomerEntity;
 import com.daqing.framework.domain.crms.request.DgApplyAmountInfoRequest;
 import com.daqing.framework.domain.crms.response.CompanyCustomerResponse;
 import org.apache.ibatis.annotations.Mapper;
@@ -27,6 +28,4 @@ public interface CompanyCustomerDao extends BaseMapper<CompanyCustomerEntity> {
 
     CompanyCustomerResponse queryCompanyInfo(@Param("applyAmountInfo") DgApplyAmountInfoRequest applyAmountInfo);
 
-    List<CompanyCustomerEntity> queryCompanyCodeAndName();
-
 }
diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerDao.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerDao.java
index f8e8585f..41ced049 100644
--- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerDao.java
+++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/dao/CustomerDao.java
@@ -34,4 +34,6 @@ public interface CustomerDao extends BaseMapper<CustomerEntity> {
     boolean updateCustomer(CustomerEntity customerEntity);
 
     List<Long> listCustomerId();
+
+    List<CustomerEntity> queryCompanyCodeAndName();
 }
diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerService.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerService.java
index c2e7cf89..3bccb734 100644
--- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerService.java
+++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerService.java
@@ -1,6 +1,7 @@
 package com.daqing.financial.crms.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.daqing.framework.domain.crms.CompanyCustomerEntity;
 import com.daqing.framework.domain.crms.ext.CustomerCompanyTOI;
 import com.daqing.framework.domain.crms.ext.CustomerCompanyTOU;
 import com.daqing.framework.domain.crms.ext.CustomerPersonalTOI;
@@ -45,5 +46,7 @@ public interface CustomerService extends IService<CustomerEntity> {
     void excelTemplate(HttpServletResponse response);
 
     ResponseResult queryCustomerInfoById(DgApplyAmountInfoRequest applyAmountInfo);
+
+    List<CustomerEntity> queryCompanyCodeAndName();
 }
 
diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java
index 185182ab..3a37c89e 100644
--- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java
+++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java
@@ -533,9 +533,8 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerDao, CustomerEntity
         return new ResponseResult<CompanyCustomerResponse>().SUCCESS(companyCustomerResponse);
     }
 
-/*    @Override
-    public List<CompanyCustomerEntity> queryCustomerCodeAndName() {
-        List<CompanyCustomerEntity>list = companyCustomerDao.queryCustomerCodeAndName();
+    public List<CustomerEntity> queryCompanyCodeAndName() {
+        List<CustomerEntity>list = customerDao.queryCompanyCodeAndName();
         return list;
-    }*/
+    }
 }
\ No newline at end of file
diff --git a/dq-financial-crms/src/main/resources/mapper/crms/CompanyCustomerDao.xml b/dq-financial-crms/src/main/resources/mapper/crms/CompanyCustomerDao.xml
index c48c5667..2d05cc87 100644
--- a/dq-financial-crms/src/main/resources/mapper/crms/CompanyCustomerDao.xml
+++ b/dq-financial-crms/src/main/resources/mapper/crms/CompanyCustomerDao.xml
@@ -5,18 +5,18 @@
 
 	<!-- 可根据自己的需求，是否要使用 -->
     <resultMap type="com.daqing.framework.domain.crms.CompanyCustomerEntity" id="companyCustomerMap">
-        <result property="id" column="id"/>
-        <result property="registeredCapital" column="registered_capital"/>
-        <result property="industry" column="industry"/>
-        <result property="years" column="years"/>
-        <result property="region" column="region"/>
-        <result property="shareholder" column="shareholder"/>
-        <result property="affiliatedCompany" column="affiliated_company"/>
-        <result property="empNum" column="emp_num"/>
-        <result property="linkman" column="linkman"/>
-        <result property="businessSource" column="business_source"/>
-        <result property="customerId" column="customer_id"/>
-    </resultMap>
+    <result property="id" column="id"/>
+    <result property="registeredCapital" column="registered_capital"/>
+    <result property="industry" column="industry"/>
+    <result property="years" column="years"/>
+    <result property="region" column="region"/>
+    <result property="shareholder" column="shareholder"/>
+    <result property="affiliatedCompany" column="affiliated_company"/>
+    <result property="empNum" column="emp_num"/>
+    <result property="linkman" column="linkman"/>
+    <result property="businessSource" column="business_source"/>
+    <result property="customerId" column="customer_id"/>
+</resultMap>
 
     <!-- 根据客户基本信息id查询企业类型客户的信息 -->
     <select id="queryCompanyCustomerById" parameterType="long" resultType="com.daqing.framework.domain.crms.CompanyCustomerEntity">
@@ -59,9 +59,6 @@
         </where>
     </select>
 
-    <!-- 根据客户编号/客户名称获取企业信息 -->
-    <select id="queryCompanyCodeAndName" resultMap="companyCustomerMap">
-        SELECT code,`name` from crms_customer
-    </select>
+
 
 </mapper>
\ No newline at end of file
diff --git a/dq-financial-crms/src/main/resources/mapper/crms/CustomerDao.xml b/dq-financial-crms/src/main/resources/mapper/crms/CustomerDao.xml
index 7b4db4b2..dcc1cd71 100644
--- a/dq-financial-crms/src/main/resources/mapper/crms/CustomerDao.xml
+++ b/dq-financial-crms/src/main/resources/mapper/crms/CustomerDao.xml
@@ -90,6 +90,10 @@
         WHERE del_or_not = 0;
     </select>
 
+    <!-- 获取所有客户编号和客户名称 -->
+    <select id="queryCompanyCodeAndName" resultMap="customerMap">
+        SELECT code,`name` from crms_customer
+    </select>
 
 
 </mapper>
\ No newline at end of file