From f9b6fd8406b0be1d09217cc1c1fde3b14a7c6a5e Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 5 Aug 2020 11:06:26 +0800
Subject: [PATCH] =?UTF-8?q?pagequery=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dao/CustomerDao.java    |  9 +++++++++
 .../com/epmet/service/impl/CustomerServiceImpl.java |  3 ++-
 .../src/main/resources/mapper/CustomerDao.xml       | 13 +++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/dao/CustomerDao.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/dao/CustomerDao.java
index dea5f2f40b..49e3525ce9 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/dao/CustomerDao.java
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/dao/CustomerDao.java
@@ -68,6 +68,15 @@ public interface CustomerDao extends BaseDao<CustomerEntity> {
 	 **/
     List<CustomerResultDTO> selectCustomerList(@Param("customerName") String customerName);
 
+	/**
+	 * @return int
+	 * @param customerName
+	 * @author yinzuomei
+	 * @description 查询有效客户数据(不区分是否在有效期内)【按名称模糊查询】  - 总记录数
+	 * @Date 2020/8/5 11:02
+	 **/
+	int selectCountByCustomerName(@Param("customerName") String customerName);
+
 	/**
 	 * desc：获取未删除的所有用户
 	 * @return
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
index 55505076e7..4e944f2920 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
@@ -403,7 +403,8 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
         PageHelper.startPage(formDTO.getPageNo(),formDTO.getPageSize());
         List<CustomerResultDTO> list = baseDao.selectCustomerList(formDTO.getCustomerName());
         //PageInfo<CustomerResultDTO> pi = new PageInfo<>(list);
-        PageData resultDTO = new PageData(list,list.size());
+        int total=baseDao.selectCountByCustomerName(formDTO.getCustomerName());
+        PageData resultDTO = new PageData(list,total);
         return resultDTO;
     }
 
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml b/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml
index 1e1c8649d1..8d96205d62 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml
@@ -70,6 +70,19 @@
             AND customer_name LIKE concat('%', trim(#{customerName}), '%')
         </if>
     </select>
+
+    <select id="selectCountByCustomerName" parameterType="map" resultType="java.lang.Integer">
+        SELECT
+        count(id) as total
+        FROM
+        customer
+        WHERE
+        del_flag = '0'
+        <if test='customerName != "" and customerName != null'>
+            AND customer_name LIKE concat('%', trim(#{customerName}), '%')
+        </if>
+    </select>
+
     <select id="getAllList" resultMap="customerMap">
         SELECT
             *