update

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

@@ -115,13 +115,13 @@ public class EnterpriseProjectController {
 
     @ApiOperation(value = "招标计划列表")
     @RequestMapping(value = "/bidPlanPage",method = RequestMethod.POST)
-    public TableDataInfo bidPlanPage(@RequestBody @Valid Object body) throws Exception {
+    public TableDataInfo bidPlanPage(@RequestBody @Valid EnterpriseProjectBidPlanPageBody body) throws Exception {
         return enterpriseProjectService.bidPlanPage(body);
     }
 
     @ApiOperation(value = "招标计划详情")
     @RequestMapping(value = "/bidPlanDetail", method = RequestMethod.POST)
-    public R bidPlanDetail(@RequestBody @Valid Object body) throws Exception {
+    public R bidPlanDetail(@RequestBody @Valid EnterpriseProjectBidPlanDetailBody body) throws Exception {
         return enterpriseProjectService.bidPlanDetail(body);
     }
 

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectBidPlanDetailBody.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 EnterpriseProjectBidPlanDetailBody {
+    /**
+     * id
+     */
+    @NotNull(message = "id不能为空")
+    private String id;
+
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectBidPlanPageBody.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;
+import java.util.List;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseProjectBidPlanPageBody extends BasePage {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+    /**
+     * 查询关键字
+     */
+    private String keys;
+
+    /*
+     * 排序字段：1金额倒序，2金额正序，3发布时间倒序，4发布时间正序，15预计招标时间倒序，16预计招标时间正序
+     */
+    @NotNull(message = "排序条件不能为空")
+    private Integer sort;
+
+
+}

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

@@ -106,13 +106,13 @@ public class EnterpriseProjectService {
     }
 
 
-    public TableDataInfo bidPlanPage(Object body) throws Exception {
+    public TableDataInfo bidPlanPage(EnterpriseProjectBidPlanPageBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/bidPlanPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
-    public R bidPlanDetail(Object body) throws Exception {
+    public R bidPlanDetail(EnterpriseProjectBidPlanDetailBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/bidPlanDetail", BeanUtil.beanToMap(body, false, false));
         Map data = MapUtils.getMap(map, "data", null);
         String contentId = MapUtils.getString(data, "contentId");