修复复杂查询翻页异常

src/main/java/com/qs/serve/common/model/dto/R.java

@@ -189,4 +189,16 @@ public class R<T> implements Serializable {
         return R.ok(pageVo);
     }
 
+    public static <TYPE> R<PageVo<TYPE>> byPageList(Long total,List<TYPE> data){
+        Integer pageNum = PageUtil.getPageNum();
+        Integer pageSize = PageUtil.getPageSize();
+        PageVo<TYPE> pageVo = new PageVo<>();
+        pageVo.setPageSize(pageSize);
+        pageVo.setPageNum(pageNum);
+        pageVo.setTotal(total);
+        pageVo.setList(data);
+        pageVo.setTotalPage(total%pageSize==0?total/pageSize:total/pageSize+1);
+        return R.ok(pageVo);
+    }
+
 }

src/main/java/com/qs/serve/common/model/dto/RowParam.java

@@ -0,0 +1,25 @@
+package com.qs.serve.common.model.dto;
+
+import com.qs.serve.common.util.PageUtil;
+import lombok.Data;
+
+/**
+ * @author YenHex
+ * @since 2023/5/17
+ */
+@Data
+public class RowParam {
+
+    private Integer startIndex;
+    private Integer size;
+
+    public RowParam(Integer startIndex, Integer size) {
+
+    }
+
+    public RowParam(boolean pageable) {
+        this.size = PageUtil.getPageSize();
+        this.startIndex =  (PageUtil.getPageNum()-1)*size;
+    }
+
+}

src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java

@@ -1,9 +1,11 @@
 package com.qs.serve.modules.bms.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qs.serve.common.model.annotation.SysLog;
 import com.qs.serve.common.model.dto.PageVo;
 import com.qs.serve.common.model.dto.R;
+import com.qs.serve.common.model.dto.RowParam;
 import com.qs.serve.common.model.enums.BizType;
 import com.qs.serve.common.model.enums.SystemModule;
 import com.qs.serve.common.util.AuthContextUtils;
@@ -69,8 +71,9 @@ public class BmsChannelPointController {
     @GetMapping("/page4Visit")
     public R<PageVo<BmsUserPoint4VisitVo>> getPage4Visit(BmsPointVisitSo param){
         String sysUserId = AuthContextUtils.getSysUserId();
-        PageUtil.startPage();
+        List<String> userIds = Arrays.asList(sysUserId);
-        List<BmsUserPoint4VisitVo> list = channelPointMapper.selectUserPointList4Visit(param, Arrays.asList(sysUserId));
+        List<BmsUserPoint4VisitVo> list = channelPointMapper.selectUserPointList4Visit(param, userIds,new RowParam(true));
+        Long count = channelPointMapper.selectCountUserPointList4Visit(param,userIds);
         for (BmsUserPoint4VisitVo visitVo : list) {
             LambdaQueryWrapper<BazVisitInfo> visitInfoLqw = new LambdaQueryWrapper<>();
             visitInfoLqw.eq(BazVisitInfo::getTargetType, BazTargetTypeConsts.POINT);
@@ -79,7 +82,7 @@ public class BmsChannelPointController {
             BazVisitInfo visitInfo = bazVisitInfoService.getOne(visitInfoLqw,false);
             visitVo.setVisitInfo(visitInfo);
         }
-        return R.byPageHelperList(list);
+        return R.byPageList(count,list);
     }
 
     /**

src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelPointMyController.java

@@ -1,6 +1,7 @@
 package com.qs.serve.modules.bms.controller.my;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qs.serve.common.model.annotation.SysLog;
 import com.qs.serve.common.model.dto.PageVo;
 import com.qs.serve.common.model.dto.R;
@@ -66,7 +67,6 @@ public class BmsChannelPointMyController {
      */
     @GetMapping("/page")
     public R<PageVo<BmsChannelPoint>> getPage(BmsChannelPoint param){
-        PageUtil.startPage();
         /*param.setUserId(AuthContextUtils.getSysUserId());
         param.setTenantId(AuthContextUtils.getTenant());
         List<BmsChannelPoint> list = bmsChannelPointService.selectChannelPointMyList(param);
@@ -85,7 +85,8 @@ public class BmsChannelPointMyController {
             }
         }*/
         List<BmsChannelPoint> list = bmsChannelPointService.selectChannelPointMyList(param, Arrays.asList(AuthContextUtils.getSysUserId()));
-        return R.byPageHelperList(list);
+        Long count = bmsChannelPointService.selectCountChannelPointMyList(param, Arrays.asList(AuthContextUtils.getSysUserId()));
+        return R.byPageList(count,list);
     }
 
 
@@ -114,8 +115,10 @@ public class BmsChannelPointMyController {
 //        param.setTenantId(AuthContextUtils.getTenant());
 //        List<BmsChannelPoint> list = bmsChannelPointService.selectChannelPointMyUnderList(param);
         //新版本加载方式
-        List<BmsChannelPoint> list = bmsChannelPointService.selectChannelPointMyList(param, userIds);
+        List<BmsChannelPoint> pageList = bmsChannelPointService.selectChannelPointMyList(param, userIds);
-        for (BmsChannelPoint channelPoint : list) {
+        Long count = bmsChannelPointService.selectCountChannelPointMyList(param, userIds);
+
+        for (BmsChannelPoint channelPoint : pageList) {
             if(StringUtils.hasText(channelPoint.getBizRegionPath())){
                 String[] bizRegions = channelPoint.getBizRegionPath().split("_");
                 if(bizRegions.length>0){
@@ -129,7 +132,7 @@ public class BmsChannelPointMyController {
                 }
             }
         }
-        return R.byPageHelperList(list);
+        return R.byPageList(count,pageList);
     }
 
 

src/main/java/com/qs/serve/modules/bms/mapper/BmsChannelPointMapper.java

@@ -4,6 +4,8 @@ package com.qs.serve.modules.bms.mapper;
 import java.util.List;
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qs.serve.common.model.dto.PageVo;
+import com.qs.serve.common.model.dto.RowParam;
 import com.qs.serve.modules.bms.entity.BmsChannelPoint;
 import com.qs.serve.modules.bms.entity.so.BmsPointVisitSo;
 import com.qs.serve.modules.bms.entity.vo.BmsUserPoint4VisitVo;
@@ -31,7 +33,9 @@ public interface BmsChannelPointMapper extends BaseMapper<BmsChannelPoint> {
 
     List<BmsChannelPoint> selectChannelPointList(@Param("query") BmsChannelPoint channelPoint);
 
-    List<BmsChannelPoint> selectPointByUserIds(@Param("query")BmsChannelPoint channelPoint, @Param("userIds")List<String> userIds);
+    List<BmsChannelPoint> selectPointByUserIds(@Param("query")BmsChannelPoint channelPoint, @Param("userIds")List<String> userIds, @Param("rowInfo") RowParam rowParam);
+
+    Long selectCountPointByUserIds(@Param("query")BmsChannelPoint channelPoint, @Param("userIds")List<String> userIds);
 
     /**
      * 直属管理人
@@ -39,7 +43,16 @@ public interface BmsChannelPointMapper extends BaseMapper<BmsChannelPoint> {
      * @return
      */
     @InterceptorIgnore(tenantLine = "1")
-    List<BmsUserPoint4VisitVo> selectUserPointList4Visit(@Param("query") BmsPointVisitSo param,@Param("userIds")List<String> userIds);
+    List<BmsUserPoint4VisitVo> selectUserPointList4Visit(@Param("query") BmsPointVisitSo param, @Param("userIds")List<String> userIds, @Param("rowInfo") RowParam rowParam);
+
+    /**
+     * 直属管理人
+     * @param param
+     * @return
+     */
+    @InterceptorIgnore(tenantLine = "1")
+    Long selectCountUserPointList4Visit(@Param("query") BmsPointVisitSo param,@Param("userIds")List<String> userIds);
+
 
     /**
      * 直属管理人

src/main/java/com/qs/serve/modules/bms/service/BmsChannelPointService.java

@@ -1,5 +1,6 @@
 package com.qs.serve.modules.bms.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qs.serve.modules.bms.entity.BmsChannelPoint;
 import com.qs.serve.modules.bms.entity.bo.BmsChannelPointBo;
@@ -19,7 +20,9 @@ public interface BmsChannelPointService extends IService<BmsChannelPoint> {
 
     List<BmsChannelPoint> selectChannelPointList(BmsChannelPoint channelPoint);
 
-    List<BmsChannelPoint> selectChannelPointMyList(BmsChannelPoint channelPoint,List<String> userIds);
+    List<BmsChannelPoint> selectChannelPointMyList(BmsChannelPoint channelPoint, List<String> userIds);
+
+    Long selectCountChannelPointMyList(BmsChannelPoint channelPoint, List<String> userIds);
 
     List<BmsChannelPoint> selectChannelPointMyList(BmsChannelPoint channelPoint);
     List<BmsChannelPoint> selectChannelPointMyUnderList(BmsChannelPoint channelPoint);

src/main/java/com/qs/serve/modules/bms/service/impl/BmsChannelPointServiceImpl.java

@@ -1,7 +1,9 @@
 package com.qs.serve.modules.bms.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qs.serve.common.model.dto.RowParam;
 import com.qs.serve.common.util.Assert;
 import com.qs.serve.common.util.AuthContextUtils;
 import com.qs.serve.common.util.CopierUtil;
@@ -114,7 +116,12 @@ public class BmsChannelPointServiceImpl extends ServiceImpl<BmsChannelPointMappe
 
     @Override
     public List<BmsChannelPoint> selectChannelPointMyList(BmsChannelPoint channelPoint, List<String> userIds) {
-        return baseMapper.selectPointByUserIds(channelPoint, userIds);
+        return baseMapper.selectPointByUserIds(channelPoint, userIds,new RowParam(true));
+    }
+
+    @Override
+    public Long selectCountChannelPointMyList(BmsChannelPoint channelPoint, List<String> userIds) {
+        return baseMapper.selectCountPointByUserIds(channelPoint, userIds);
     }
 
     @Override

src/main/java/com/qs/serve/modules/his/service/HisUserSupplierService.java

@@ -15,12 +15,15 @@ public interface HisUserSupplierService extends IService<HisUserSupplier> {
 
     List<HisUserSupplier> selectSupplier(BmsSupplier param,boolean usePage);
 
+
+    boolean initByUserId(String userId,boolean hasCheck);
+
     /**
      * 初始化
      * @param userId
      * @return
      */
-    boolean initByUserId(String userId,boolean hasCheck);
+    boolean initByUserId(String userId,boolean hasCheck,List<String> existUserIds);
 
     boolean checkInit(String userId);
 

src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java

@@ -82,12 +82,26 @@ public class HisUserSupplierServiceImpl extends ServiceImpl<HisUserSupplierMappe
     }
 
     @Override
-    public boolean initByUserId(String userId,boolean hasCheck) {
+    public boolean initByUserId(String userId, boolean hasCheck) {
+        return initByUserId(userId, hasCheck,null);
+    }
+
+    @Override
+    public boolean initByUserId(String userId,boolean hasCheck, List<String> existUserIds) {
         if(!hasCheck){
+            if(existUserIds==null){
+                existUserIds = new ArrayList<>();
+            }
+            if(existUserIds.contains(userId)){
+                return true;
+            }else {
+                existUserIds.add(userId);
+            }
+            existUserIds.add(userId);
             boolean checkInit = this.checkInit(userId);
             List<String> childUserList = sysPostUserService.listByChildIds(userId);
             for (String childUserId : childUserList) {
-                this.initByUserId(childUserId,false);
+                this.initByUserId(childUserId,false,existUserIds);
             }
             if(checkInit){
                 return true;

src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java

@@ -151,6 +151,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         if(CollectionUtil.isNotEmpty(budgetLogList)){
             budgetLogService.saveBatch(budgetLogList);
         }
+        //todo 如果为最后的活动，更变费用申请状态
 
     }
 

src/main/resources/mapper/bms/BmsChannelPointMapper.xml

@@ -114,6 +114,29 @@
         <result property="localX"  column="local_x"/>
     </resultMap>
 
+
+
+    <select id="selectCountUserPointList4Visit" resultType="java.lang.Long">
+        SELECT
+         count(1)
+        FROM
+        (   SELECT channel_id FROM `bms_supplier_channel`
+        LEFT JOIN `his_user_supplier` ON `his_user_supplier`.supplier_id = bms_supplier_channel.supplier_id
+        where his_user_supplier.user_id in
+        <foreach collection="userIds" item ="selectId" index="i" open="(" close=")" separator=",">
+            #{selectId}
+        </foreach>
+        and `bms_supplier_channel`.`del_flag` = 0
+        GROUP BY channel_id
+        ) tmp
+        left join bms_channel_point ON `tmp`.channel_id = bms_channel_point.`channel_id`
+        <where>
+            and `bms_channel_point`.`del_flag` = 0
+            <if test="query.pointCode != null and query.pointCode != ''"> and `bms_channel_point`.`point_code` like concat('%',#{query.pointCode},'%') </if>
+            <if test="query.pointName != null and query.pointName != ''"> and `bms_channel_point`.`point_name` like concat('%',#{query.pointName},'%') </if>
+        </where>
+    </select>
+
     <select id="selectUserPointList4Visit" resultType="com.qs.serve.modules.bms.entity.vo.BmsUserPoint4VisitVo" resultMap="userPointList4VisitMap">
         SELECT
             `bms_channel_point`.id,
@@ -142,23 +165,19 @@
             left join bms_channel_point ON `tmp`.channel_id = bms_channel_point.`channel_id`
         <where>
             and `bms_channel_point`.`del_flag` = 0
-            and `bms_supplier_channel`.`del_flag` = 0
             <if test="query.pointCode != null and query.pointCode != ''"> and `bms_channel_point`.`point_code` like concat('%',#{query.pointCode},'%') </if>
             <if test="query.pointName != null and query.pointName != ''"> and `bms_channel_point`.`point_name` like concat('%',#{query.pointName},'%') </if>
-            <if test="userIds != null and userIds.size > 0">
-                and his_user_supplier.user_id in
-                <foreach collection="userIds" item ="selectId" index="i" open="(" close=")" separator=",">
-                    #{selectId}
-                </foreach>
-            </if>
         </where>
         ORDER BY
         <if test="query.localY!=null and query.localX!=null">
             -distance desc,
         </if>
         bms_channel_point.id
+        limit #{rowInfo.startIndex},#{rowInfo.size}
     </select>
 
+
+
     <select id="selectUserPointList4My" resultType="com.qs.serve.modules.bms.entity.BmsChannelPoint">
         SELECT
         <include refid="bmsChannelPointSql"/>
@@ -194,6 +213,7 @@
         </where>
         ORDER BY
         bms_channel_point.id
+        limit #{rowInfo.startIndex},#{rowInfo.size}
     </select>
 
     <select id="selectUserPointList4MyUnder" resultType="com.qs.serve.modules.bms.entity.BmsChannelPoint">
@@ -285,7 +305,39 @@
             <if test="query.bizRegionPath != null and query.bizRegionPath != ''"> and `bms_channel_point`.`biz_region_path`  like concat('%',#{query.bizRegionPath},'%') </if>
             <if test="query.bizRegionPathIds != null and query.bizRegionPathIds != ''"> and `bms_channel_point`.`biz_region_path_ids` = #{query.bizRegionPathIds}</if>
             <if test="query.remark != null and query.remark != ''"> and `bms_channel_point`.`remark` = #{query.remark}</if>
-
+        </where>
+        limit #{rowInfo.startIndex},#{rowInfo.size}
+    </select>
+    <select id="selectCountPointByUserIds" resultType="java.lang.Long">
+        SELECT count(1) FROM
+        (   SELECT channel_id FROM `bms_supplier_channel`
+        LEFT JOIN `his_user_supplier` ON `his_user_supplier`.supplier_id = bms_supplier_channel.supplier_id
+        where his_user_supplier.user_id in
+        <foreach collection="userIds" item ="selectId" index="i" open="(" close=")" separator=",">
+            #{selectId}
+        </foreach>
+        and `bms_supplier_channel`.`del_flag` = 0
+        GROUP BY channel_id
+        ) tmp left join`bms_channel_point` `bms_channel_point` ON `tmp`.channel_id = bms_channel_point.`channel_id`
+        <where>
+            and `bms_channel_point`.`del_flag` = 0
+            <if test="query.id != null"> and `bms_channel_point`.`id` = #{query.id}</if>
+            <if test="query.channelId != null"> and `bms_channel_point`.`channel_id` = #{query.channelId}</if>
+            <if test="query.channelName != null and query.channelName != ''"> and `bms_channel_point`.`channel_name` like concat('%',#{query.channelName},'%') </if>
+            <if test="query.pointCode != null and query.pointCode != ''"> and `bms_channel_point`.`point_code` like concat('%',#{query.pointCode},'%') </if>
+            <if test="query.pointName != null and query.pointName != ''"> and `bms_channel_point`.`point_name` like concat('%',#{query.pointName},'%') </if>
+            <if test="query.shopArea != null and query.shopArea != ''"> and `bms_channel_point`.`shop_area` = #{query.shopArea}</if>
+            <if test="query.countCheckstand != null"> and `bms_channel_point`.`count_checkstand` = #{query.countCheckstand}</if>
+            <if test="query.pointLevel != null and query.pointLevel != ''"> and `bms_channel_point`.`point_level` = #{query.pointLevel}</if>
+            <if test="query.pointType != null and query.pointType != ''"> and `bms_channel_point`.`point_type` like concat('%',#{query.pointType},'%') </if>
+            <if test="query.address != null and query.address != ''"> and `bms_channel_point`.`address` = #{query.address}</if>
+            <if test="query.saleRegionId != null and query.saleRegionId != ''"> and `bms_channel_point`.`sale_region_id` = #{query.saleRegionId}</if>
+            <if test="query.saleRegionPath != null and query.saleRegionPath != ''"> and `bms_channel_point`.`sale_region_path` like concat('%',#{query.saleRegionPath},'%') </if>
+            <if test="query.saleRegionPathIds != null and query.saleRegionPathIds != ''"> and `bms_channel_point`.`sale_region_path_ids` = #{query.saleRegionPathIds}</if>
+            <if test="query.bizRegionId != null and query.bizRegionId != ''"> and `bms_channel_point`.`biz_region_id` = #{query.bizRegionId}</if>
+            <if test="query.bizRegionPath != null and query.bizRegionPath != ''"> and `bms_channel_point`.`biz_region_path`  like concat('%',#{query.bizRegionPath},'%') </if>
+            <if test="query.bizRegionPathIds != null and query.bizRegionPathIds != ''"> and `bms_channel_point`.`biz_region_path_ids` = #{query.bizRegionPathIds}</if>
+            <if test="query.remark != null and query.remark != ''"> and `bms_channel_point`.`remark` = #{query.remark}</if>
         </where>
     </select>