六小金刚分页查询

src/main/java/com/sfa/operation/controller/sales/query/ApDisplayQueryController.java

@@ -70,6 +70,15 @@ public class ApDisplayQueryController {
         return apDisplayQueryService.slPage(salesApRequest);
     }
 
+    /**
+     * 六小金刚
+     */
+    @GetMapping("/jg_page")
+    public PageInfo jgPage(SalesApRequest salesApRequest){
+        checkPermission(salesApRequest);
+        return apDisplayQueryService.jgPage(salesApRequest);
+    }
+
     /**
      * 判断登录人权限
      * 判断是否存在人客关系，存在：根据负责经销商查询数据；不存在：判断是否是销售部人员。是：根据部门查询；不是：返回全部数据

src/main/java/com/sfa/operation/domain/sales/dao/ISalesApDisplayJDao.java

+package com.sfa.operation.domain.sales.dao;
+
+import com.sfa.common.core.web.domain.PageInfo;
+import com.sfa.operation.domain.sales.wq.SalesApWq;
+
+/**
+ * @author : liqiulin
+ * @date : 2025-11-21 14
+ * @describe :
+ */
+public interface ISalesApDisplayJDao {
+    PageInfo page(SalesApWq salesApWq);
+}

src/main/java/com/sfa/operation/domain/sales/dao/impl/SalesApDisplayJDaoImpl.java

+package com.sfa.operation.domain.sales.dao.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sfa.common.core.utils.StringUtils;
+import com.sfa.common.core.web.domain.PageInfo;
+import com.sfa.common.core.web.page.TableSupport;
+import com.sfa.operation.domain.sales.dao.ISalesApDisplayJDao;
+import com.sfa.operation.domain.sales.entity.SalesApDisplayJ;
+import com.sfa.operation.domain.sales.mapper.SalesApDisplayJMapper;
+import com.sfa.operation.domain.sales.wq.SalesApWq;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.Objects;
+
+/**
+ * @author : liqiulin
+ * @date : 2025-11-21 14
+ * @describe :
+ */
+@DS("bi")
+@Service
+public class SalesApDisplayJDaoImpl implements ISalesApDisplayJDao {
+    @Autowired
+    private SalesApDisplayJMapper salesApDisplayJMapper;
+
+    @Override
+    public PageInfo page(SalesApWq salesApWq) {
+        LambdaQueryWrapper<SalesApDisplayJ> qw = buildWq(salesApWq);
+        Page<SalesApDisplayJ> salesApDisplayJPage = salesApDisplayJMapper.selectPage(TableSupport.pageI(), qw);
+        return new PageInfo<>(salesApDisplayJPage);
+    }
+
+
+    private LambdaQueryWrapper<SalesApDisplayJ> buildWq(SalesApWq salesApWq) {
+        LambdaQueryWrapper<SalesApDisplayJ> qw = new LambdaQueryWrapper<>();
+        if (Objects.nonNull(salesApWq.getSalesMonth())){
+            qw.eq(SalesApDisplayJ::getSalesMonth, salesApWq.getSalesMonth());
+        }
+        if (!CollectionUtils.isEmpty(salesApWq.getDealerCodes())) {
+            qw.in(SalesApDisplayJ::getDealerCode, salesApWq.getDealerCodes());
+        }
+        if (StringUtils.isNotBlank(salesApWq.getDeptName())){
+            qw.and(
+                    wrapper -> wrapper.eq(SalesApDisplayJ::getRegionName, salesApWq.getDeptName())
+                            .or()
+                            .eq(SalesApDisplayJ::getDistrictName, salesApWq.getDeptName())
+            );
+        }
+        if (StringUtils.isNotBlank(salesApWq.getNickName())){
+            qw.and(
+                    wrapper -> wrapper.eq(SalesApDisplayJ::getRegionManager, salesApWq.getNickName())
+                            .or()
+                            .eq(SalesApDisplayJ::getDistrictManager, salesApWq.getNickName())
+                            .or()
+                            .eq(SalesApDisplayJ::getCityManager, salesApWq.getNickName())
+            );
+        }
+        if (StringUtils.isNotBlank(salesApWq.getDealerCN())){
+            qw.and(
+                    wrapper -> wrapper.like(SalesApDisplayJ::getDealerName, salesApWq.getDealerCN())
+                            .or()
+                            .like(SalesApDisplayJ::getDealerCode, salesApWq.getDealerCN())
+            );
+        }
+        if (StringUtils.isNotBlank(salesApWq.getStoreCN())){
+            qw.and(
+                    wrapper -> wrapper.like(SalesApDisplayJ::getStoreName, salesApWq.getStoreCN())
+                            .or()
+                            .like(SalesApDisplayJ::getStoreCode, salesApWq.getStoreCN())
+            );
+        }
+        if (StringUtils.isNotBlank(salesApWq.getLineNameLike())){
+            qw.like(SalesApDisplayJ::getLineName, salesApWq.getLineNameLike());
+        }
+        return qw;
+    }
+}

src/main/java/com/sfa/operation/service/sales/IApDisplayQueryService.java

@@ -18,4 +18,6 @@ public interface IApDisplayQueryService {
     PageInfo snackPage(SalesApRequest salesApRequest);
 
     PageInfo slPage(SalesApRequest salesApRequest);
+
+    PageInfo jgPage(SalesApRequest salesApRequest);
 }

src/main/java/com/sfa/operation/service/sales/impl/ApDisplayQueryServiceImpl.java

@@ -5,10 +5,7 @@ import cn.hutool.core.date.DateUtil;
 import com.sfa.common.core.utils.bean.BeanUtils;
 import com.sfa.common.core.web.domain.PageInfo;
 import com.sfa.operation.domain.feishu.dao.IQinceMarketEmployeeDao;
-import com.sfa.operation.domain.sales.dao.ISalesApDisplayDao;
-import com.sfa.operation.domain.sales.dao.ISalesApDisplaySDao;
-import com.sfa.operation.domain.sales.dao.ISalesApPromotionDisplayDao;
-import com.sfa.operation.domain.sales.dao.ISalesApSnacksDisplayDao;
+import com.sfa.operation.domain.sales.dao.*;
 import com.sfa.operation.domain.sales.wq.SalesApWq;
 import com.sfa.operation.pojo.sales.request.SalesApRequest;
 import com.sfa.operation.service.sales.IApDisplayQueryService;
@@ -33,6 +30,8 @@ public class ApDisplayQueryServiceImpl implements IApDisplayQueryService {
     private ISalesApSnacksDisplayDao salesapsnackdsDisplayDao;
     @Autowired
     private ISalesApDisplaySDao salesApDisplaySDao;
+    @Autowired
+    private ISalesApDisplayJDao salesApDisplayJDao;
 
 
     @Override
@@ -55,6 +54,11 @@ public class ApDisplayQueryServiceImpl implements IApDisplayQueryService {
         return salesApDisplaySDao.page(build(salesApRequest));
     }
 
+    @Override
+    public PageInfo jgPage(SalesApRequest salesApRequest) {
+        return salesApDisplayJDao.page(build(salesApRequest));
+    }
+
     private SalesApWq build(SalesApRequest salesApRequest){
         SalesApWq salesApWq = new SalesApWq();
         BeanUtils.copyProperties(salesApRequest,salesApWq);