diff --git a/lc123/cloud/app/plugin/form/conm/RebateRulesBillPlugin.java b/lc123/cloud/app/plugin/form/conm/RebateRulesBillPlugin.java
index 64dbe2f..14def5d 100644
--- a/lc123/cloud/app/plugin/form/conm/RebateRulesBillPlugin.java
+++ b/lc123/cloud/app/plugin/form/conm/RebateRulesBillPlugin.java
@@ -49,7 +49,7 @@ public class RebateRulesBillPlugin extends AbstractBillPlugIn implements BeforeF
         IDataModel model = this.getModel();
         String tqq9_excludnum = model.getDataEntity().getString("tqq9_excludnum");//排除后基数
         DynamicObjectCollection tqq9_supplier = model.getDataEntity(true).getDynamicObjectCollection("tqq9_supplier");//供应商
-        Set<String> numbers =new HashSet<String>();
+        Set<String> numbers = new HashSet<String>();
         for (DynamicObject dynamicObject : tqq9_supplier) {
             DynamicObject fbasedataid = dynamicObject.getDynamicObject("fbasedataid");
             String number = fbasedataid.getString("number");
@@ -57,13 +57,13 @@ public class RebateRulesBillPlugin extends AbstractBillPlugIn implements BeforeF
         }
 
         //排除时间段不排除订单
-        if(StringUtils.equals(name,"tqq9_exclunopur")&&StringUtils.equals("1", tqq9_excludnum)){
+        if (StringUtils.equals(name, "tqq9_exclunopur") && StringUtils.equals("1", tqq9_excludnum)) {
             Date tqq9_startexcludate = model.getDataEntity().getDate("tqq9_startexcludate");//排除开始时间段
             Date tqq9_endexcludate = model.getDataEntity().getDate("tqq9_endexcludate");//排除结束时间段
             if (tqq9_startexcludate == null || tqq9_endexcludate == null) {
                 beforeF7SelectEvent.setCancel(true);
                 this.getView().showMessage("请先填写排除时间段");
-            }else{
+            } else {
                 ListShowParameter param = (ListShowParameter) beforeF7SelectEvent.getFormShowParameter();
                 QFilter qF1 = new QFilter("biztime", QCP.large_equals, tqq9_startexcludate);
                 QFilter qF2 = new QFilter("biztime", QCP.less_equals, tqq9_endexcludate);
@@ -72,13 +72,13 @@ public class RebateRulesBillPlugin extends AbstractBillPlugIn implements BeforeF
             }
         }
         //排除采购订单
-        if(StringUtils.equals(name,"tqq9_exclupur")&&StringUtils.equals("1", tqq9_excludnum)){
+        if (StringUtils.equals(name, "tqq9_exclupur") && StringUtils.equals("1", tqq9_excludnum)) {
             Date tqq9_startdate = model.getDataEntity().getDate("tqq9_startdate");//返利开始时间段
             Date tqq9_enddate = model.getDataEntity().getDate("tqq9_enddate");//返利结束时间段
             if (tqq9_startdate == null || tqq9_enddate == null) {
                 beforeF7SelectEvent.setCancel(true);
                 this.getView().showMessage("请先填写排除时间段");
-            }else{
+            } else {
                 ListShowParameter param = (ListShowParameter) beforeF7SelectEvent.getFormShowParameter();
                 QFilter qF1 = new QFilter("biztime", QCP.large_equals, tqq9_startdate);
                 QFilter qF2 = new QFilter("biztime", QCP.less_equals, tqq9_enddate);
@@ -88,13 +88,13 @@ public class RebateRulesBillPlugin extends AbstractBillPlugIn implements BeforeF
 
         }
         //指定采购订单
-        if(StringUtils.equals(name,"tqq9_purchaseorder")){
+        if (StringUtils.equals(name, "tqq9_purchaseorder")) {
             Date tqq9_startdate = model.getDataEntity().getDate("tqq9_startdate");//返利开始时间段
             Date tqq9_enddate = model.getDataEntity().getDate("tqq9_enddate");//返利结束时间段
             if (tqq9_startdate == null || tqq9_enddate == null) {
                 beforeF7SelectEvent.setCancel(true);
                 this.getView().showMessage("请先填写返利时间段");
-            }else{
+            } else {
                 ListShowParameter param = (ListShowParameter) beforeF7SelectEvent.getFormShowParameter();
                 QFilter qF1 = new QFilter("biztime", QCP.large_equals, tqq9_startdate);
                 QFilter qF2 = new QFilter("biztime", QCP.less_equals, tqq9_enddate);
@@ -125,7 +125,7 @@ public class RebateRulesBillPlugin extends AbstractBillPlugIn implements BeforeF
                 if (tqq9_guangzhoulici) {
                     companyBulider.append("GZ").append(",");
                 }
-                if(companyBulider!=null&&companyBulider.length()>0){
+                if (companyBulider != null && companyBulider.length() > 0) {
                     companyBulider.deleteCharAt(companyBulider.length() - 1);
                 }
                 String ruleName = getModel().getValue("name").toString();
@@ -133,7 +133,7 @@ public class RebateRulesBillPlugin extends AbstractBillPlugIn implements BeforeF
                 StringBuilder newName = new StringBuilder();
                 for (int i = 0; i < split.length; i++) {
                     if (i == 1) {
-                        if(StringUtils.isNotBlank(companyBulider)){
+                        if (StringUtils.isNotBlank(companyBulider)) {
                             newName.append(companyBulider).append("-");
                         }
                         if (!split[i].contains("SH") && !split[i].contains("BJ") && !split[i].contains("GZ")) {
@@ -159,7 +159,7 @@ public class RebateRulesBillPlugin extends AbstractBillPlugIn implements BeforeF
                 if (tqq9_guangzhoulici) {
                     companyBulider.append("GZ").append(",");
                 }
-                if(companyBulider!=null&&companyBulider.length()>0){
+                if (companyBulider != null && companyBulider.length() > 0) {
                     companyBulider.deleteCharAt(companyBulider.length() - 1);
                 }
                 String ruleName = getModel().getValue("name").toString();
@@ -167,7 +167,7 @@ public class RebateRulesBillPlugin extends AbstractBillPlugIn implements BeforeF
                 StringBuilder newName = new StringBuilder();
                 for (int i = 0; i < split.length; i++) {
                     if (i == 1) {
-                        if(StringUtils.isNotBlank(companyBulider)){
+                        if (StringUtils.isNotBlank(companyBulider)) {
                             newName.append(companyBulider).append("-");
                         }
                         if (!split[i].contains("SH") && !split[i].contains("BJ") && !split[i].contains("GZ")) {
@@ -194,7 +194,7 @@ public class RebateRulesBillPlugin extends AbstractBillPlugIn implements BeforeF
                 if (tqq9_guangzhoulici) {
                     companyBulider.append("GZ").append(",");
                 }
-                if(companyBulider!=null&&companyBulider.length()>0){
+                if (companyBulider != null && companyBulider.length() > 0) {
                     companyBulider.deleteCharAt(companyBulider.length() - 1);
                 }
                 String ruleName = getModel().getValue("name").toString();
@@ -202,7 +202,7 @@ public class RebateRulesBillPlugin extends AbstractBillPlugIn implements BeforeF
                 StringBuilder newName = new StringBuilder();
                 for (int i = 0; i < split.length; i++) {
                     if (i == 1) {
-                        if(StringUtils.isNotBlank(companyBulider)){
+                        if (StringUtils.isNotBlank(companyBulider)) {
                             newName.append(companyBulider).append("-");
                         }
                         if (!split[i].contains("SH") && !split[i].contains("BJ") && !split[i].contains("GZ")) {
@@ -230,7 +230,7 @@ public class RebateRulesBillPlugin extends AbstractBillPlugIn implements BeforeF
                 if (tqq9_gzlcbl.compareTo(BigDecimal.ZERO) > 0) {
                     companyBulider.append("GZ").append(",");
                 }
-                if(companyBulider!=null&&companyBulider.length()>0){
+                if (companyBulider != null && companyBulider.length() > 0) {
                     companyBulider.deleteCharAt(companyBulider.length() - 1);
                 }
                 String ruleName = getModel().getValue("name").toString();
@@ -238,7 +238,7 @@ public class RebateRulesBillPlugin extends AbstractBillPlugIn implements BeforeF
                 StringBuilder newName = new StringBuilder();
                 for (int i = 0; i < split.length; i++) {
                     if (i == 1) {
-                        if(StringUtils.isNotBlank(companyBulider)){
+                        if (StringUtils.isNotBlank(companyBulider)) {
                             newName.append(companyBulider).append("-");
                         }
                         if (!split[i].contains("SH") && !split[i].contains("BJ") && !split[i].contains("GZ")) {
@@ -264,7 +264,7 @@ public class RebateRulesBillPlugin extends AbstractBillPlugIn implements BeforeF
                 if (tqq9_gzlcbl.compareTo(BigDecimal.ZERO) > 0) {
                     companyBulider.append("GZ").append(",");
                 }
-                if(companyBulider!=null&&companyBulider.length()>0){
+                if (companyBulider != null && companyBulider.length() > 0) {
                     companyBulider.deleteCharAt(companyBulider.length() - 1);
                 }
                 String ruleName = getModel().getValue("name").toString();
@@ -272,7 +272,7 @@ public class RebateRulesBillPlugin extends AbstractBillPlugIn implements BeforeF
                 StringBuilder newName = new StringBuilder();
                 for (int i = 0; i < split.length; i++) {
                     if (i == 1) {
-                        if(StringUtils.isNotBlank(companyBulider)){
+                        if (StringUtils.isNotBlank(companyBulider)) {
                             newName.append(companyBulider).append("-");
                         }
                         if (!split[i].contains("SH") && !split[i].contains("BJ") && !split[i].contains("GZ")) {
@@ -298,7 +298,7 @@ public class RebateRulesBillPlugin extends AbstractBillPlugIn implements BeforeF
                 if (tqq9_gzlcbl.compareTo(BigDecimal.ZERO) > 0) {
                     companyBulider.append("GZ").append(",");
                 }
-                if(companyBulider!=null&&companyBulider.length()>0){
+                if (companyBulider != null && companyBulider.length() > 0) {
                     companyBulider.deleteCharAt(companyBulider.length() - 1);
                 }
                 String ruleName = getModel().getValue("name").toString();
@@ -306,7 +306,7 @@ public class RebateRulesBillPlugin extends AbstractBillPlugIn implements BeforeF
                 StringBuilder newName = new StringBuilder();
                 for (int i = 0; i < split.length; i++) {
                     if (i == 1) {
-                        if(StringUtils.isNotBlank(companyBulider)){
+                        if (StringUtils.isNotBlank(companyBulider)) {
                             newName.append(companyBulider).append("-");
                         }
                         if (!split[i].contains("SH") && !split[i].contains("BJ") && !split[i].contains("GZ")) {
@@ -323,7 +323,7 @@ public class RebateRulesBillPlugin extends AbstractBillPlugIn implements BeforeF
         if (StringUtils.equals("tqq9_rebatesub", name)) {
             String ruleName = getModel().getValue("name").toString();
             String[] split = ruleName.split("-");
-             StringBuilder newName = new StringBuilder();
+            StringBuilder newName = new StringBuilder();
             for (int i = 0; i < split.length; i++) {
                 if (i != 1 || i == 1 && !split[i].contains("SH") && !split[i].contains("BJ") && !split[i].contains("GZ")) {
                     newName.append(split[i]).append("-");
@@ -331,6 +331,31 @@ public class RebateRulesBillPlugin extends AbstractBillPlugIn implements BeforeF
             }
             getModel().setValue("name", newName.toString());
         }
+        // 比较时间段
+        if (StringUtils.equals("tqq9_date", name) || StringUtils.equals("tqq9_exclusiondate", name)) {
+            Date tqq9_startdate = (Date) dataEntity.get("tqq9_startdate"); // 返利开始时间
+            Date tqq9_enddate = (Date) dataEntity.get("tqq9_enddate");     // 返利结束时间
+            Date tqq9_startexcludate = (Date) dataEntity.get("tqq9_startexcludate"); // 排除开始时间
+            Date tqq9_endexcludate = (Date) dataEntity.get("tqq9_endexcludate");     // 排除结束时间
+            // 首先判断返利时间范围是否填写
+            if (tqq9_startdate == null || tqq9_enddate == null) {
+                this.getView().showErrorNotification("返利时间范围未填写");
+                return;
+            }
+            // 判断排除时间范围是否填写
+            if (tqq9_startexcludate != null || tqq9_endexcludate != null) {
+                if (tqq9_startexcludate == null || tqq9_endexcludate == null) {
+                    this.getView().showErrorNotification("排除时间范围需完整填写");
+                    return;
+                }
+                // 判断返利时间范围是否大于等于排除时间范围
+                if (tqq9_startdate.compareTo(tqq9_startexcludate) > 0 || tqq9_enddate.compareTo(tqq9_endexcludate) < 0) {
+                    this.getView().showErrorNotification("返利时间范围应大于等于排除时间范围");
+                    return;
+                }
+            }
+        }
+
     }