update

dsk-admin/src/main/java/com/dsk/web/controller/dsk/EnterpriseBussinessController.java

@@ -2,6 +2,7 @@ package com.dsk.web.controller.dsk;
 
 
 import com.dsk.common.core.domain.R;
+import com.dsk.common.core.domain.model.*;
 import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.system.dskService.EnterpriseBussinessService;
 import io.swagger.annotations.ApiOperation;
@@ -28,67 +29,67 @@ public class EnterpriseBussinessController {
 
     @ApiOperation(value = "客户信息列表（openApi）")
     @RequestMapping(value = "/clientPage", method = RequestMethod.POST)
-    public TableDataInfo clientPage(@RequestBody Map<String, Object> paramMap) throws Exception {
+    public TableDataInfo clientPage(@RequestBody EnterpriseBussinessClientPageBody paramMap) throws Exception {
         return enterpriseBussinessService.clientPage(paramMap);
     }
 
     @ApiOperation(value = "客户项目列表（openApi）")
     @RequestMapping(value = "/clientProjectPage", method = RequestMethod.POST)
-    public TableDataInfo clientProjectPage(@RequestBody Map<String, Object> paramMap) throws Exception {
+    public TableDataInfo clientProjectPage(@RequestBody EnterpriseBussinessClientProjectPageBody paramMap) throws Exception {
         return enterpriseBussinessService.clientProjectPage(paramMap);
     }
 
     @ApiOperation(value = "投标记录列表（开标记录）（openApi）")
     @RequestMapping(value = "/tenderPage",method = RequestMethod.POST)
-    public TableDataInfo tenderPage(@RequestBody Map<String, Object> paramMap) throws Exception {
+    public TableDataInfo tenderPage(@RequestBody EnterpriseBussinessTenderPageBody paramMap) throws Exception {
         return enterpriseBussinessService.tenderPage(paramMap);
     }
 
     @ApiOperation(value = "投标记录详情（开标记录）（openApi）")
     @RequestMapping(value = "/tenderDetail",method = RequestMethod.POST)
-    public R tenderDetail(@RequestBody Map<String, Object> paramMap) throws Exception {
+    public R tenderDetail(@RequestBody EnterpriseBussinessTenderDetailBody paramMap) throws Exception {
         return enterpriseBussinessService.tenderDetail(paramMap);
     }
 
     @ApiOperation(value = "供应商列表（openApi）")
     @RequestMapping(value = "/supplierPage",method = RequestMethod.POST)
-    public TableDataInfo supplierPage(@RequestBody Map<String, Object> paramMap) throws Exception {
+    public TableDataInfo supplierPage(@RequestBody EnterpriseBussinessSupplierPageBody paramMap) throws Exception {
         return enterpriseBussinessService.supplierPage(paramMap);
     }
 
     @ApiOperation(value = "供应商项目列表（openApi）")
     @RequestMapping(value = "/supplierProjectPage",method = RequestMethod.POST)
-    public TableDataInfo supplierProjectPage(@RequestBody Map<String, Object> paramMap) throws Exception {
+    public TableDataInfo supplierProjectPage(@RequestBody EnterpriseBussinessSupplierProjectPageBody paramMap) throws Exception {
         return enterpriseBussinessService.supplierProjectPage(paramMap);
     }
 
     @ApiOperation(value = "中标项目详情（openApi）")
     @RequestMapping(value = "/projectDetail", method = RequestMethod.POST)
-    public R projectDetail(@RequestBody Map<String, Object> paramMap) throws Exception {
+    public R projectDetail(@RequestBody EnterpriseBussinessProjectDetailBody paramMap) throws Exception {
         return enterpriseBussinessService.projectDetail(paramMap);
     }
 
     @ApiOperation(value = "招标代理常合作代理机构列表（openApi）")
     @RequestMapping(value = "/oftenAgencyPage",method = RequestMethod.POST)
-    public TableDataInfo oftenAgencyPage(@RequestBody Map<String, Object> paramMap) throws Exception {
+    public TableDataInfo oftenAgencyPage(@RequestBody EnterpriseBussinessOftenAgencyPageBody paramMap) throws Exception {
         return enterpriseBussinessService.oftenAgencyPage(paramMap);
     }
 
     @ApiOperation(value = "招标合作明细列表（openApi）")
     @RequestMapping(value = "/bidCooperatePage", method = RequestMethod.POST)
-    public TableDataInfo bidCooperatePage(@RequestBody Map<String, Object> paramMap) throws Exception {
+    public TableDataInfo bidCooperatePage(@RequestBody EnterpriseBussinessBidCooperatePageBody paramMap) throws Exception {
         return enterpriseBussinessService.bidCooperatePage(paramMap);
     }
 
     @ApiOperation(value = "历史发包列表（openApi）")
     @RequestMapping(value = "/historySendPage", method = RequestMethod.POST)
-    public TableDataInfo historySendPage(@RequestBody Map<String, Object> paramMap) throws Exception {
+    public TableDataInfo historySendPage(@RequestBody EnterpriseBussinessHistorySendPageBody paramMap) throws Exception {
         return enterpriseBussinessService.historySendPage(paramMap);
     }
 
     @ApiOperation(value = "历史发包省份（openApi）")
     @RequestMapping(value = "/historySendProvince", method = RequestMethod.POST)
-    public R historySendProvince(@RequestBody Map<String, Object> paramMap) throws Exception {
+    public R historySendProvince(@RequestBody EnterpriseBussinessHistorySendProvinceBody paramMap) throws Exception {
         return enterpriseBussinessService.historySendProvince(paramMap);
     }
 

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

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseBussinessProjectDetailBody {
+    /**
+     * id
+     */
+    @NotNull(message = "id不能为空")
+    private Integer id;
+
+}

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

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseBussinessSupplierPageBody extends BasePage {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+
+    /**
+     * 查询关键字
+     */
+    private String keys;
+
+
+    /*
+     * 排序字段：1金额倒序，2金额正序，3时间倒序，4时间正序，5次数倒序，6次数正序
+     */
+    private Integer sort;
+
+}

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

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseBussinessSupplierProjectPageBody extends BasePage {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer unitId;
+
+    /**
+     * 查询关键字
+     */
+    private String keys;
+    
+
+}

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

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseBussinessTenderDetailBody {
+    /**
+     * id
+     */
+    @NotNull(message = "id不能为空")
+    private Integer id;
+
+}

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

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseBussinessTenderPageBody extends BasePage {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+
+    /**
+     * 查询关键字
+     */
+    private String keys;
+
+
+}

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

@@ -2,6 +2,7 @@ package com.dsk.system.dskService;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.dsk.common.core.domain.R;
+import com.dsk.common.core.domain.model.*;
 import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.common.utils.DskOpenApiUtil;
 import org.slf4j.Logger;
@@ -20,67 +21,67 @@ public class EnterpriseBussinessService {
     private DskOpenApiUtil dskOpenApiUtil;
 
 
-    public TableDataInfo clientPage(Map<String, Object> body) throws Exception {
+    public TableDataInfo clientPage(EnterpriseBussinessClientPageBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/clientPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
-    public TableDataInfo clientProjectPage(Map<String, Object> body) throws Exception {
+    public TableDataInfo clientProjectPage(EnterpriseBussinessClientProjectPageBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/clientProjectPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
-    public TableDataInfo tenderPage(Map<String, Object> body) throws Exception {
+    public TableDataInfo tenderPage(EnterpriseBussinessTenderPageBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/tenderPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
-    public R tenderDetail(Map<String, Object> body) throws Exception {
+    public R tenderDetail(EnterpriseBussinessTenderDetailBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/tenderDetail", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
 
 
-    public TableDataInfo supplierPage(Map<String, Object> body) throws Exception {
+    public TableDataInfo supplierPage(EnterpriseBussinessSupplierPageBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/supplierPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
-    public TableDataInfo supplierProjectPage(Map<String, Object> body) throws Exception {
+    public TableDataInfo supplierProjectPage(EnterpriseBussinessSupplierProjectPageBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/supplierProjectPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
-    public R projectDetail(Map<String, Object> body) throws Exception {
+    public R projectDetail(EnterpriseBussinessProjectDetailBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/projectDetail", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
 
 
-    public TableDataInfo oftenAgencyPage(Map<String, Object> body) throws Exception {
+    public TableDataInfo oftenAgencyPage(EnterpriseBussinessOftenAgencyPageBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/oftenAgencyPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
-    public TableDataInfo bidCooperatePage(Map<String, Object> body) throws Exception {
+    public TableDataInfo bidCooperatePage(EnterpriseBussinessBidCooperatePageBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/bidCooperatePage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
-    public TableDataInfo historySendPage(Map<String, Object> body) throws Exception {
+    public TableDataInfo historySendPage(EnterpriseBussinessHistorySendPageBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/historySendPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
-    public R historySendProvince(Map<String, Object> body) throws Exception {
+    public R historySendProvince(EnterpriseBussinessHistorySendProvinceBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/historySendProvince", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }