From 361bd8c306b14e4c48e145f02b78928dedf7fbeb Mon Sep 17 00:00:00 2001
From: river <1376754470@qq.com>
Date: Tue, 8 Sep 2020 17:04:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                     | 18 ------------------
 README.md                                      |  3 ---
 .../crms/service/CustomerService.java          |  5 ++++-
 .../crms/service/impl/CustomerServiceImpl.java | 16 +++++++++++++++-
 4 files changed, 19 insertions(+), 23 deletions(-)
 delete mode 100644 .gitignore
 delete mode 100644 README.md

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 3f9b83f3..00000000
--- a/.gitignore
+++ /dev/null
@@ -1,18 +0,0 @@
-target/
-pom.xml.tag
-pom.xml.releaseBackup
-pom.xml.versionsBackup
-pom.xml.next
-release.properties
-dependency-reduced-pom.xml
-buildMumber.properties
-.mvn/timing.properties
-.mvn/wrapper/maven-wrapper.jar
-
-**/mvnw
-**/mvnw.cmd
-**/.mvn
-**/target/
-
-.idea
-**/.gitignore
\ No newline at end of file
diff --git a/README.md b/README.md
deleted file mode 100644
index 8256754d..00000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# dqFinancial
-
-大庆智慧金融平台项目后端代码
\ No newline at end of file
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 2ffec802..06040f5d 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.request.CustomerRequest;
 import com.daqing.framework.utils.PageUtils;
 import com.daqing.framework.domain.crms.CustomerEntity;
 
@@ -15,6 +16,8 @@ import java.util.Map;
  */
 public interface CustomerService extends IService<CustomerEntity> {
 
-    PageUtils queryPage(Map<String, Object> params);
+    /*PageUtils queryPage(Map<String, Object> params);*/
+
+    PageUtils queryList(Integer page, Integer size, CustomerRequest customerRequest);
 }
 
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 c8b8934b..f8012264 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
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.daqing.financial.crms.dao.CustomerDao;
 import com.daqing.financial.crms.service.CustomerService;
 import com.daqing.framework.domain.crms.CustomerEntity;
+import com.daqing.framework.domain.crms.request.CustomerRequest;
 import com.daqing.framework.utils.PageUtils;
 import com.daqing.framework.utils.Query;
 import org.springframework.stereotype.Service;
@@ -16,7 +17,7 @@ import java.util.Map;
 @Service("customerService")
 public class CustomerServiceImpl extends ServiceImpl<CustomerDao, CustomerEntity> implements CustomerService {
 
-    @Override
+    /*@Override
     public PageUtils queryPage(Map<String, Object> params) {
         IPage<CustomerEntity> page = this.page(
                 new Query<CustomerEntity>().getPage(params),
@@ -24,6 +25,19 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerDao, CustomerEntity
         );
 
         return new PageUtils(page);
+    }*/
+
+    /**
+     * 查询客户列表(所有)、根据创建时间筛选、根据客户类型筛选、根据客户编号或者名称搜索
+     * @param page
+     * @param size
+     * @param customerRequest
+     * @return
+     */
+    @Override
+    public PageUtils queryList(Integer page, Integer size, CustomerRequest customerRequest) {
+
+        return null;
     }
 
 }
\ No newline at end of file