Merge branch 'release' of http://192.168.12.182/invoice/sims-order into release

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);
+
     /**
      * 修改
      *

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);

order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml

@@ -43,45 +43,7 @@
     <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>
-    <!-- 查询 -->
-    <select parameterType="map" id="selectBuyerList" resultMap="BaseResultMap">
-        <bind name="dataType" value="${dataType}"/>
-        <if test="dataType ==0 ">
-            SELECT
-            bmi.id,
-            bmi.taxpayer_code,
-            bmi.purchase_name,
-            bmi.address,
-            bmi.phone,
-            bmi.bank_of_deposit,
-            bmi.bank_number,
-            bmi.email,
-            bmi.sjh,
-            bmi.remarks,
-            bmi.create_user_id,
-            DATE_FORMAT(bmi.create_time, '%Y-%m-%d') createTime,
-            DATE_FORMAT(bmi.modify_time, '%Y-%m-%d') modifyTime,
-            bmi.modify_user_id,
-            bmi.ghf_qylx,
-            bmi.xhf_nsrsbh,
-            bmi.xhf_mc,
-            bmi.buyer_code,
-            bmi.create_time,
-            bmi.status,
-            bmi.sync_order,
-            bmi.ent_id,
-            bmid.consumer_id,
-            bmid.buyer_manage_id,
-            bmid.bank_name,
-            bmid.bank_account,
-            bmid.address as bmid_address,
-            bmid.phone as bmid_phone,
-            bmid.default_mark,
-            bmid.create_user,
-            bmid.update_user
-
-            FROM
-            buyer_manage_info bmi left join buyer_manage_info_detail bmid on bmi.id = bmid.buyer_manage_id
+    <sql id="Buyer_Where">
         <where>
             <if test="shList != null and shList.size() == 0">
                 and xhf_nsrsbh = ''
@@ -144,7 +106,54 @@
                 </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}"/>
+        <if test="dataType ==0 ">
+            SELECT
+            bmi.id,
+            bmi.taxpayer_code,
+            bmi.purchase_name,
+            bmi.address,
+            bmi.phone,
+            bmi.bank_of_deposit,
+            bmi.bank_number,
+            bmi.email,
+            bmi.sjh,
+            bmi.remarks,
+            bmi.create_user_id,
+            DATE_FORMAT(bmi.create_time, '%Y-%m-%d') createTime,
+            DATE_FORMAT(bmi.modify_time, '%Y-%m-%d') modifyTime,
+            bmi.modify_user_id,
+            bmi.ghf_qylx,
+            bmi.xhf_nsrsbh,
+            bmi.xhf_mc,
+            bmi.buyer_code,
+            bmi.create_time,
+            bmi.status,
+            bmi.sync_order,
+            bmi.ent_id,
+            bmid.consumer_id,
+            bmid.buyer_manage_id,
+            bmid.bank_name,
+            bmid.bank_account,
+            bmid.address as bmid_address,
+            bmid.phone as bmid_phone,
+            bmid.default_mark,
+            bmid.create_user,
+            bmid.update_user
 
+            FROM
+            buyer_manage_info bmi left join buyer_manage_info_detail bmid on bmi.id = bmid.buyer_manage_id
+            <include refid="Buyer_Where"/>
             order by create_time desc
         </if>
         <if test="dataType ==1 ">