From 18a957146202aa9053007baaf69c3ccf1ffd316b Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Tue, 10 May 2022 11:02:51 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95-=E9=94=80?=
 =?UTF-8?q?=E5=94=AE=E6=94=BF=E7=AD=96=E5=88=86=E9=A1=B5=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BaseSalesDicountQuery.java                    | 15 +++++++++++++++
 .../BaseDiscountpackageService.java               | 12 ++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseSalesDicountQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseSalesDicountQuery.java
index ad99fa9867..f53dd764d1 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseSalesDicountQuery.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseSalesDicountQuery.java
@@ -15,4 +15,19 @@ public class BaseSalesDicountQuery implements Query {
 
     @ApiModelProperty(value = "业务员sid")
     private String staffSid;
+
+    @ApiModelProperty("政策类别key")
+    private String salesPolicyKey;
+
+    @ApiModelProperty("优惠类型key")
+    private String discountTypeKey;
+
+    @ApiModelProperty("是否有效")
+    private String isEmploy;
+
+    @ApiModelProperty("开始有效期")
+    private String getEffectiveStartDate;
+
+    @ApiModelProperty("结束有效期")
+    private String getEffectiveEndDate;
 }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java
index 6c641d07bf..3881266b0a 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java
@@ -287,6 +287,18 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
                 orgSid = stringResultBean.getData();
             }
             qw.lambda().apply("FIND_IN_SET ('" + orgSid + "',useOrg)");
+            if (StringUtils.isNotBlank(params.getDiscountTypeKey())) {
+                qw.eq("discountTypeKey", params.getDiscountTypeKey());
+            }
+            if (StringUtils.isNotBlank(params.getSalesPolicyKey())) {
+                qw.eq("salesPolicyKey", params.getSalesPolicyKey());
+            }
+            if (StringUtils.isNotBlank(params.getIsEmploy())) {
+                qw.eq("isEmploy", params.getIsEmploy());
+            }
+            if (StringUtils.isNotBlank(params.getGetEffectiveStartDate()) && StringUtils.isNotBlank(params.getGetEffectiveEndDate())) {
+                qw.between("effectiveDate", params.getGetEffectiveStartDate(), params.getGetEffectiveEndDate());
+            }
         }
         return qw;
     }