-/operate

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBussinessClientProjectPageBody.java

@@ -7,7 +7,6 @@ import lombok.ToString;
 
 import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
-import java.util.List;
 
 @Data
 @ToString
@@ -21,10 +20,10 @@ public class EnterpriseBussinessClientProjectPageBody extends BasePage {
     private Integer cid;
 
     /**
-     * 客户企业Id
+     * 企业id
      */
     @NotNull(message = "企业id不能为空")
-    private Integer companyId;
+    private Integer unitId;
 
     /**
      * 查询关键字
@@ -33,29 +32,7 @@ public class EnterpriseBussinessClientProjectPageBody extends BasePage {
 
 
     public boolean isVaildCid() {
-        return 0 == cid;
+        return 0 == cid || 0 == unitId;
     }
 
-    /**
-     * 来源
-     */
-    private List<String> sources;
-
-
-    /**
-     * 项目类型
-     */
-    private List<String> projects;
-
-    /**
-     * 金额起
-     */
-    private Double amountStart;
-
-    /**
-     * 金额止
-     */
-    private Double amountEnd;
-
-
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBussinessSupplierProjectPageBody.java

@@ -7,7 +7,6 @@ import lombok.ToString;
 
 import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
-import java.util.List;
 
 @Data
 @ToString
@@ -21,10 +20,10 @@ public class EnterpriseBussinessSupplierProjectPageBody extends BasePage {
     private Integer cid;
 
     /**
-     * 供应商企业Id
+     * 企业id
      */
     @NotNull(message = "企业id不能为空")
-    private Integer companyId;
+    private Integer unitId;
 
     /**
      * 查询关键字
@@ -33,28 +32,8 @@ public class EnterpriseBussinessSupplierProjectPageBody extends BasePage {
 
 
     public boolean isVaildCid() {
-        return 0 == cid;
+        return 0 == cid || 0 == unitId;
     }
 
 
-    /**
-     * 来源
-     */
-    private List<String> sources;
-
-
-    /**
-     * 项目类型
-     */
-    private List<String> projects;
-
-    /**
-     * 金额起
-     */
-    private Double amountStart;
-
-    /**
-     * 金额止
-     */
-    private Double amountEnd;
 }