diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/request/PriceSheetQuery.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/request/PriceSheetQuery.java index bbd8ce6ed..c6d22afa8 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/request/PriceSheetQuery.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/request/PriceSheetQuery.java @@ -70,7 +70,4 @@ public class PriceSheetQuery { @Schema(description = "价格类型") private String pricetype; - - @Schema(description = "查询条件") - private Query query; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/controller/OemOrderController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/controller/OemOrderController.java index a096736e7..5f2611a35 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/controller/OemOrderController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/controller/OemOrderController.java @@ -184,7 +184,6 @@ public class OemOrderController extends BladeController { @ApiOperationSupport(order = 9) @Operation(summary = "报价单分页", description = "传入mesOemStatement") public R> priceSheetData(PriceSheetQuery priceSheetQuery, Query query) { - priceSheetQuery.setQuery(query); R> pageR = erpDataOemClient.priceSheetData(priceSheetQuery); Page data = pageR.getData(); Page pages = new Page<>(); @@ -250,8 +249,6 @@ public class OemOrderController extends BladeController { @ApiOperationSupport(order = 14) @Operation(summary = "报价单导出数据", description = "") public void exportPriceSheetData(PriceSheetQuery priceSheetQuery, Query query, HttpServletResponse response) { - query.setSize(99999); - priceSheetQuery.setQuery(query); R> pageR = erpDataOemClient.priceSheetData(priceSheetQuery); Page data = pageR.getData(); List list = data.getRecords(); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemStatementServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemStatementServiceImpl.java index 26882b7e4..3630b02d0 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemStatementServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemStatementServiceImpl.java @@ -654,9 +654,6 @@ public class OemStatementServiceImpl extends BaseServiceImpl> pageR = erpDataOemClient.priceSheetData(query); if (pageR != null && pageR.getData() != null) { @@ -675,9 +672,6 @@ public class OemStatementServiceImpl extends BaseServiceImpl getPriceSheets(String oemName) { PriceSheetQuery query = new PriceSheetQuery(); query.setOcName(oemName); - Query pageQuery = new Query(); - pageQuery.setSize(99999); - query.setQuery(pageQuery); R> pageR = erpDataOemClient.priceSheetData(query); if (pageR != null && pageR.getData() != null) { @@ -1584,9 +1578,6 @@ public class OemStatementServiceImpl extends BaseServiceImpl> pageR = erpDataOemClient.priceSheetData(query); if (pageR != null && pageR.getData() != null) { diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/feign/ErpDataOemClientImpl.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/feign/ErpDataOemClientImpl.java index 9353eb12b..d13812de9 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/feign/ErpDataOemClientImpl.java +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/feign/ErpDataOemClientImpl.java @@ -44,7 +44,8 @@ public class ErpDataOemClientImpl implements IErpDataOemClient { @Override @GetMapping(PRICE_SHEET_DATA) public R> priceSheetData(@SpringQueryMap PriceSheetQuery priceSheetQuery) { - Query query = priceSheetQuery.getQuery(); + Query query = new Query(); + query.setSize(99999);; IPage iPages = erpDataOemService.priceSheetData(Condition.getPage(query), priceSheetQuery); Page pages = new Page<>();