AP计划添加查询条件

src/main/java/com/sfa/operation/config/ConstantValue.java

+package com.sfa.operation.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author : liqiulin
+ * @date : 2025-10-23 15
+ * @describe :
+ */
+@Component
+public class ConstantValue {
+    @Value("${wxl-dept.yx}")
+    public String deptYX;
+}

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

@@ -3,6 +3,7 @@ package com.sfa.operation.controller.sales.query;
 import com.sfa.common.core.web.domain.PageInfo;
 import com.sfa.common.security.annotation.RequiresPermissions;
 import com.sfa.common.security.utils.SecurityUtils;
+import com.sfa.operation.config.ConstantValue;
 import com.sfa.operation.pojo.sales.request.SalesApRequest;
 import com.sfa.operation.service.qc.IQinceMarketEmployeeService;
 import com.sfa.operation.service.sales.IApDisplayQueryService;
@@ -30,6 +31,8 @@ public class ApDisplayQueryController {
     private IApDisplayQueryService apDisplayQueryService;
     @Autowired
     private IQinceMarketEmployeeService qinceMarketEmployeeService;
+    @Autowired
+    private ConstantValue constantValue;
 
     /**
      * 常规陈列
@@ -65,8 +68,8 @@ public class ApDisplayQueryController {
     private void checkPermission(SalesApRequest salesApRequest) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
         String ancestors = loginUser.getSysUser().getDept().getAncestors();
-        // todo 不是区域销售部的人员，可以查看所有
-        if (!ancestors.contains("2732")) {
+        // 不是区域销售部的人员，可以查看所有
+        if (!ancestors.contains(constantValue.deptYX)) {
             return;
         }
 

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

 package com.sfa.operation.controller.sales.query;
 
-import com.sfa.common.core.context.UserRoles;
 import com.sfa.common.core.web.domain.PageInfo;
-import com.sfa.common.security.annotation.RequiresPermissions;
 import com.sfa.common.security.utils.SecurityUtils;
+import com.sfa.operation.config.ConstantValue;
 import com.sfa.operation.pojo.sales.request.SalesApRequest;
 import com.sfa.operation.service.qc.IQinceMarketEmployeeService;
 import com.sfa.operation.service.sales.IApPromotionQueryService;
@@ -14,7 +13,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
-import java.util.Set;
 
 /**
  * @author : liqiulin
@@ -28,6 +26,8 @@ public class ApPromotionQueryController {
     private IApPromotionQueryService apPromotionQueryService;
     @Autowired
     private IQinceMarketEmployeeService qinceMarketEmployeeService;
+    @Autowired
+    private ConstantValue constantValue;
 
     @GetMapping("/page")
     public PageInfo page(SalesApRequest salesApRequest){
@@ -43,8 +43,8 @@ public class ApPromotionQueryController {
     private void checkPermission(SalesApRequest salesApRequest) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
         String ancestors = loginUser.getSysUser().getDept().getAncestors();
-        // todo 不是区域销售部的人员，可以查看所有
-        if (!ancestors.contains("2732")) {
+        // 不是区域销售部的人员，可以查看所有
+        if (!ancestors.contains(constantValue.deptYX)) {
             return;
         }
 

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

@@ -75,6 +75,23 @@ public class SalesApDisplayDaoImpl implements ISalesApDisplayDao {
                             .eq(SalesApDisplay::getCityManager, salesApWq.getNickName())
             );
         }
+        if (StringUtils.isNotBlank(salesApWq.getDealerCN())){
+            qw.and(
+                    wrapper -> wrapper.like(SalesApDisplay::getDealerName, salesApWq.getDealerCN())
+                            .or()
+                            .like(SalesApDisplay::getDealerCode, salesApWq.getDealerCN())
+            );
+        }
+        if (StringUtils.isNotBlank(salesApWq.getStoreCN())){
+            qw.and(
+                    wrapper -> wrapper.like(SalesApDisplay::getStoreName, salesApWq.getStoreCN())
+                            .or()
+                            .like(SalesApDisplay::getStoreCode, salesApWq.getStoreCN())
+            );
+        }
+        if (StringUtils.isNotBlank(salesApWq.getLineNameLike())){
+            qw.like(SalesApDisplay::getLineName, salesApWq.getLineNameLike());
+        }
         return qw;
     }
 }

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

@@ -67,6 +67,23 @@ public class SalesApPromotionDisplayDaoImpl implements ISalesApPromotionDisplayD
                             .eq(SalesApPromotionDisplay::getCityManager, salesApWq.getNickName())
             );
         }
+        if (StringUtils.isNotBlank(salesApWq.getDealerCN())){
+            qw.and(
+                    wrapper -> wrapper.like(SalesApPromotionDisplay::getDealerName, salesApWq.getDealerCN())
+                            .or()
+                            .like(SalesApPromotionDisplay::getDealerCode, salesApWq.getDealerCN())
+            );
+        }
+        if (StringUtils.isNotBlank(salesApWq.getStoreCN())){
+            qw.and(
+                    wrapper -> wrapper.like(SalesApPromotionDisplay::getStoreName, salesApWq.getStoreCN())
+                            .or()
+                            .like(SalesApPromotionDisplay::getStoreCode, salesApWq.getStoreCN())
+            );
+        }
+        if (StringUtils.isNotBlank(salesApWq.getLineNameLike())){
+            qw.like(SalesApPromotionDisplay::getLineName, salesApWq.getLineNameLike());
+        }
         return qw;
     }
 }

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

@@ -10,6 +10,7 @@ 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.ISalesApPromotionDao;
+import com.sfa.operation.domain.sales.entity.SalesApDisplay;
 import com.sfa.operation.domain.sales.entity.SalesApPromotion;
 import com.sfa.operation.domain.sales.mapper.SalesApPromotionMapper;
 import com.sfa.operation.domain.sales.wq.SalesApWq;
@@ -100,6 +101,16 @@ public class SalesApPromotionImplDao implements ISalesApPromotionDao {
                             .eq(SalesApPromotion::getCityManager, salesApWq.getNickName())
             );
         }
+        if (StringUtils.isNotBlank(salesApWq.getDealerCN())){
+            qw.and(
+                    wrapper -> wrapper.like(SalesApPromotion::getDealerName, salesApWq.getDealerCN())
+                            .or()
+                            .like(SalesApPromotion::getDealerCode, salesApWq.getDealerCN())
+            );
+        }
+        if (StringUtils.isNotBlank(salesApWq.getLineNameLike())){
+            qw.like(SalesApPromotion::getLineName, salesApWq.getLineNameLike());
+        }
         return qw;
     }
 }

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

@@ -7,6 +7,7 @@ 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.ISalesApSnacksDisplayDao;
+import com.sfa.operation.domain.sales.entity.SalesApDisplay;
 import com.sfa.operation.domain.sales.entity.SalesApPromotionDisplay;
 import com.sfa.operation.domain.sales.entity.SalesApSnacksDisplay;
 import com.sfa.operation.domain.sales.mapper.SalesApSnacksDisplayMapper;
@@ -67,6 +68,23 @@ public class SalesApSnacksDisplayDaoImpl implements ISalesApSnacksDisplayDao {
                             .eq(SalesApSnacksDisplay::getCityManager, salesApWq.getNickName())
             );
         }
+        if (StringUtils.isNotBlank(salesApWq.getDealerCN())){
+            qw.and(
+                    wrapper -> wrapper.like(SalesApSnacksDisplay::getDealerName, salesApWq.getDealerCN())
+                            .or()
+                            .like(SalesApSnacksDisplay::getDealerCode, salesApWq.getDealerCN())
+            );
+        }
+        if (StringUtils.isNotBlank(salesApWq.getStoreCN())){
+            qw.and(
+                    wrapper -> wrapper.like(SalesApSnacksDisplay::getStoreName, salesApWq.getStoreCN())
+                            .or()
+                            .like(SalesApSnacksDisplay::getStoreCode, salesApWq.getStoreCN())
+            );
+        }
+        if (StringUtils.isNotBlank(salesApWq.getLineNameLike())){
+            qw.like(SalesApSnacksDisplay::getLineName, salesApWq.getLineNameLike());
+        }
         return qw;
     }
 }

src/main/java/com/sfa/operation/domain/sales/wq/SalesApWq.java

@@ -15,7 +15,22 @@ public class SalesApWq {
     private String dealerCode;
     private Date salesMonth;
     private String cityManager;
+    /**
+     * 大区/战区
+     */
     private String deptName;
     private String nickName;
     private List<String> dealerCodes;
+    /**
+     * 经销商编码（精准）/名称（模糊）
+     */
+    private String dealerCN;
+    /**
+     * 门店编码（精准）/名称（模糊）
+     */
+    private String storeCN;
+    /**
+     * 系统名称
+     */
+    private String lineNameLike;
 }

src/main/java/com/sfa/operation/pojo/sales/request/SalesApRequest.java

@@ -19,11 +19,29 @@ import java.util.List;
 public class SalesApRequest {
     // ######################## 通用查询 ########################
     private String dealerCode;
+    /**
+     * 默认当月
+     */
     private String salesMonth;
+    /**
+     * 经销商编码（精准）/名称（模糊）
+     */
+    private String dealerCN;
     private String cityManager;
+    /**
+     * 大区/战区
+     */
     private String deptName;
+    /**
+     * 门店编码（精准）/名称（模糊）
+     */
+    private String storeCN;
     private String nickName;
     private List<String> dealerCodes;
+    /**
+     * 系统名称
+     */
+    private String lineNameLike;
 
     // ######################## 通用查询 ########################