From e08f0099646c71d45be73fa4c6f9582e28053c8e Mon Sep 17 00:00:00 2001
From: shijie <648688341@qq.com>
Date: Thu, 12 Nov 2020 15:35:19 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../financial/crms/dao/CompanyCustomerDao.java    |  4 ++++
 .../crms/service/impl/CustomerServiceImpl.java    |  6 ++++++
 .../resources/mapper/crms/CompanyCustomerDao.xml  |  5 +++++
 .../mapper/DgGuaranteeLetterAssignUserMapper.java |  2 ++
 .../guarantee/DgGuaranteeLetterConsiderMapper.xml | 15 ---------------
 5 files changed, 17 insertions(+), 15 deletions(-)
 delete mode 100644 dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeLetterConsiderMapper.xml

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 33914479..cc2e41d0 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
@@ -7,6 +7,8 @@ import com.daqing.framework.domain.crms.response.CompanyCustomerResponse;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 企业类型客户信息表
  * 
@@ -25,4 +27,6 @@ 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/service/impl/CustomerServiceImpl.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java
index c929ccbc..185182ab 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
@@ -532,4 +532,10 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerDao, CustomerEntity
         CompanyCustomerResponse companyCustomerResponse = companyCustomerDao.queryCompanyInfo(applyAmountInfo);
         return new ResponseResult<CompanyCustomerResponse>().SUCCESS(companyCustomerResponse);
     }
+
+/*    @Override
+    public List<CompanyCustomerEntity> queryCustomerCodeAndName() {
+        List<CompanyCustomerEntity>list = companyCustomerDao.queryCustomerCodeAndName();
+        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 ce39aef3..c48c5667 100644
--- a/dq-financial-crms/src/main/resources/mapper/crms/CompanyCustomerDao.xml
+++ b/dq-financial-crms/src/main/resources/mapper/crms/CompanyCustomerDao.xml
@@ -59,4 +59,9 @@
         </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-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgGuaranteeLetterAssignUserMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgGuaranteeLetterAssignUserMapper.java
index 2b3238c8..1ee73d42 100644
--- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgGuaranteeLetterAssignUserMapper.java
+++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgGuaranteeLetterAssignUserMapper.java
@@ -2,6 +2,7 @@ package com.daqing.financial.guarantee.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.daqing.framework.domain.guarantee.DgGuaranteeLetterAssignUser;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -11,6 +12,7 @@ import com.daqing.framework.domain.guarantee.DgGuaranteeLetterAssignUser;
  * @author Qyq
  * @since 2020-11-12
  */
+@Mapper
 public interface DgGuaranteeLetterAssignUserMapper extends BaseMapper<DgGuaranteeLetterAssignUser> {
 
 }
diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeLetterConsiderMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeLetterConsiderMapper.xml
deleted file mode 100644
index 6203631b..00000000
--- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeLetterConsiderMapper.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.daqing.financial.guarantee.mapper.DgGuaranteeLetterConsiderMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.daqing.framework.domain.guarantee.DgGuaranteeLetterConsider">
-        <id column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="emp_id" property="empId" />
-        <result column="status" property="status" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-</mapper>