业务往来

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

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

dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseBussinessService.java

@@ -58,14 +58,14 @@ public class EnterpriseBussinessService {
 
     public TableDataInfo clientPage(EnterpriseBussinessClientPageBody body) throws Exception {
         if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/clientPage", BeanUtil.beanToMap(body, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/clientPage2", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
     public TableDataInfo clientProjectPage(EnterpriseBussinessClientProjectPageBody body) throws Exception {
         if (body.isVaildCid()) return null;
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/clientProjectPage", BeanUtil.beanToMap(body, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/clientProjectPage2", BeanUtil.beanToMap(body, false, false));
         Integer code = MapUtils.getInteger(map, "code", 300);
         if (200 != code) {
             throw new RuntimeException();
@@ -145,7 +145,7 @@ public class EnterpriseBussinessService {
         if (body.isVaildCid()) {
             return new TableDataInfo(new ArrayList<>(), 0);
         }
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/supplierPage", BeanUtil.beanToMap(body, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/supplierPage2", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
@@ -154,7 +154,7 @@ public class EnterpriseBussinessService {
         if (body.isVaildCid()) {
             return new TableDataInfo(new ArrayList<>(), 0);
         }
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/supplierProjectPage", BeanUtil.beanToMap(body, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/supplierProjectPage2", BeanUtil.beanToMap(body, false, false));
         log.info(JSONUtil.toJsonStr(map));
 
         Integer code = MapUtils.getInteger(map, "code", 300);

dsk-system/src/main/java/com/dsk/system/dskService/IndexService.java

@@ -42,7 +42,7 @@ public class IndexService {
             recentlyBidQueryDtoList = new ArrayList();
             recentlyBidQueryMap.put("startTenderTime", DateUtils.dateTime(DateUtils.addDays(new Date(), -6)));
             recentlyBidQueryMap.put("endTenderTime", DateUtils.getDate());
-            recentlyBidQueryMap.put("endMoney", 20000);
+            recentlyBidQueryMap.put("startMoney", 20000);
             recentlyBidQueryMap.put("tenderType","施工,工程总承包");
             recentlyBidQueryDtoList.add(recentlyBidQueryMap);
             objectMap.put("recentlyBidQueryDto", recentlyBidQueryDtoList);