From 2cb5d887c9b7845353ae28bfc193f6a24b4c589e Mon Sep 17 00:00:00 2001
From: gaorl <gaoronglin@ele-cloud.com>
Date: Thu, 4 May 2023 18:47:10 +0800
Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E5=AE=A2=E6=88=B7=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=88=86=E9=A1=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/buyer/dao/BuyerMapper.java         |   8 ++
 .../buyer/service/impl/BuyerServiceImpl.java  |   3 +-
 .../resources/mybatis/mapper/BuyerMapper.xml  | 135 ++++++++++--------
 3 files changed, 82 insertions(+), 64 deletions(-)

diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/dao/BuyerMapper.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/dao/BuyerMapper.java
index 7150f909..70490bb2 100644
--- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/dao/BuyerMapper.java
+++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/dao/BuyerMapper.java
@@ -23,6 +23,14 @@ public interface BuyerMapper {
      */
     List<BuyerEntity> selectBuyerList(@Param("map") Map<String, Object> map, @Param("shList") List<String> shList);
 
+    /**
+     * 客户信息统计数
+     * @param map
+     * @param shList
+     * @return
+     */
+    Integer selectBuyerCount(@Param("map") Map<String, Object> map, @Param("shList") List<String> shList);
+
     /**
      * 修改
      *
diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java
index 7f38544c..dd897d55 100644
--- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java
+++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java
@@ -70,6 +70,7 @@ public class BuyerServiceImpl implements BuyerService {
         int pageSize = Integer.parseInt(String.valueOf(paramMap.get(ConfigureConstant.STRING_PAGE_SIZE)));
         int currPage = Integer.parseInt(String.valueOf(paramMap.get(ConfigureConstant.STRING_CURR_PAGE)));
         log.debug("{}订单查询，当前页：{},页面条数:{}", LOGGER_MSG, currPage, pageSize);
+        Integer integer = buyerMapper.selectBuyerCount(paramMap, shList);
         PageHelper.startPage(currPage, pageSize);
         List<BuyerEntity> list = buyerMapper.selectBuyerList(paramMap, shList);
         list.forEach(t->{
@@ -80,7 +81,7 @@ public class BuyerServiceImpl implements BuyerService {
             }
         });
         PageInfo<BuyerEntity> pageInfo = new PageInfo<>(list);
-        PageUtils page = new PageUtils(pageInfo.getList(), list.size(), pageInfo.getPageSize(),
+        PageUtils page = new PageUtils(pageInfo.getList(), integer, pageInfo.getPageSize(),
                 pageInfo.getPageNum());
 
         log.info("{}返回值{} ", LOGGER_MSG, page);
diff --git a/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml b/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml
index 153a9d7f..cb448fe4 100644
--- a/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml
+++ b/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml
@@ -43,6 +43,77 @@
     <sql id="Buyer_Base_Column_List">
         id,taxpayer_code,purchase_name,address,phone,bank_of_deposit,bank_number,email,sjh,remarks,create_time,create_user_id,modify_time,modify_user_id,ghf_qylx,xhf_nsrsbh,xhf_mc,buyer_code,invoice_name,invoice_taxno,mdm_multicode_json,status
     </sql>
+    <sql id="Buyer_Where">
+        <where>
+            <if test="shList != null and shList.size() == 0">
+                and xhf_nsrsbh = ''
+            </if>
+            <if test="shList != null and shList.size() == 1">
+                and xhf_nsrsbh =
+                <foreach collection="shList" index="index" item="item">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="shList != null and shList.size() > 1">
+                and xhf_nsrsbh in
+                <foreach collection="shList" index="index" item="item"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="map.entList != null and map.entList.size() == 0">
+                and ent_id = ''
+            </if>
+            <if test="map.entList != null and map.entList.size() == 1">
+                and ent_id =
+                <foreach collection="map.entList" index="index" item="item">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="map.entList != null and map.entList.size() > 1">
+                and ent_id in
+                <foreach collection="map.entList" index="index" item="item"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <!--购买方编码-->
+            <if test="map.buyerCode != null and map.buyerCode !='' ">
+                and buyer_code  LIKE CONCAT(CONCAT('%',#{map.buyerCode,jdbcType=VARCHAR},'%'))
+            </if>
+            <!-- 销货方纳税人名称-->
+            <if test="map.xhfMc != null and map.xhfMc !='' ">
+                and xhf_mc = #{map.xhfMc,jdbcType=VARCHAR}
+            </if>
+            <!-- 客户状态-->
+            <if test="map.status != null and map.status !='' ">
+                and status = #{map.status,jdbcType=VARCHAR}
+            </if>
+            <!--购买方纳税人识别号-->
+            <if test="map.taxpayerCode !=null and map.taxpayerCode !=''">
+                and taxpayer_code = #{map.taxpayerCode,jdbcType=VARCHAR}
+            </if>
+            <if test="map.purchaseName != null and map.purchaseName !='' ">
+                <choose>
+                    <!--模糊查询的标识(0表示不进行模糊查询，1表示模糊查询)-->
+                    <when test="map.fuzzyQuery != null and map.fuzzyQuery !='' and map.fuzzyQuery =='0'.toString() ">
+                        AND purchase_name = #{map.purchaseName,jdbcType=VARCHAR}
+                    </when>
+                    <otherwise>
+                        AND purchase_name LIKE CONCAT(CONCAT('%',#{map.purchaseName}),'%')
+                    </otherwise>
+                </choose>
+            </if>
+        </where>
+    </sql>
+    <select id="selectBuyerCount" resultType="java.lang.Integer">
+        SELECT
+           count(1)
+        FROM
+            buyer_manage_info
+        <include refid="Buyer_Where"/>
+    </select>
     <!-- 查询 -->
     <select parameterType="map" id="selectBuyerList" resultMap="BaseResultMap">
         <bind name="dataType" value="${dataType}"/>
@@ -82,69 +153,7 @@
 
             FROM
             buyer_manage_info bmi left join buyer_manage_info_detail bmid on bmi.id = bmid.buyer_manage_id
-            <where>
-                <if test="shList != null and shList.size() == 0">
-                    and xhf_nsrsbh = ''
-                </if>
-                <if test="shList != null and shList.size() == 1">
-                    and xhf_nsrsbh =
-                    <foreach collection="shList" index="index" item="item">
-                        #{item}
-                    </foreach>
-                </if>
-                <if test="shList != null and shList.size() > 1">
-                    and xhf_nsrsbh in
-                    <foreach collection="shList" index="index" item="item"
-                             open="(" separator="," close=")">
-                        #{item}
-                    </foreach>
-                </if>
-
-                <if test="map.entList != null and map.entList.size() == 0">
-                    and ent_id = ''
-                </if>
-                <if test="map.entList != null and map.entList.size() == 1">
-                    and ent_id =
-                    <foreach collection="map.entList" index="index" item="item">
-                        #{item}
-                    </foreach>
-                </if>
-                <if test="map.entList != null and map.entList.size() > 1">
-                    and ent_id in
-                    <foreach collection="map.entList" index="index" item="item"
-                             open="(" separator="," close=")">
-                        #{item}
-                    </foreach>
-                </if>
-                <!--购买方编码-->
-                <if test="map.buyerCode != null and map.buyerCode !='' ">
-                    and buyer_code  LIKE CONCAT(CONCAT('%',#{map.buyerCode,jdbcType=VARCHAR},'%'))
-                </if>
-                <!-- 销货方纳税人名称-->
-                <if test="map.xhfMc != null and map.xhfMc !='' ">
-                    and xhf_mc = #{map.xhfMc,jdbcType=VARCHAR}
-                </if>
-                <!-- 客户状态-->
-                <if test="map.status != null and map.status !='' ">
-                    and status = #{map.status,jdbcType=VARCHAR}
-                </if>
-                <!--购买方纳税人识别号-->
-                <if test="map.taxpayerCode !=null and map.taxpayerCode !=''">
-                    and taxpayer_code = #{map.taxpayerCode,jdbcType=VARCHAR}
-                </if>
-                <if test="map.purchaseName != null and map.purchaseName !='' ">
-                    <choose>
-                        <!--模糊查询的标识(0表示不进行模糊查询，1表示模糊查询)-->
-                        <when test="map.fuzzyQuery != null and map.fuzzyQuery !='' and map.fuzzyQuery =='0'.toString() ">
-                            AND purchase_name = #{map.purchaseName,jdbcType=VARCHAR}
-                        </when>
-                        <otherwise>
-                            AND purchase_name LIKE CONCAT(CONCAT('%',#{map.purchaseName}),'%')
-                        </otherwise>
-                    </choose>
-                </if>
-            </where>
-
+            <include refid="Buyer_Where"/>
             order by create_time desc
         </if>
         <if test="dataType ==1 ">