外协结算

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;
 }

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<IPage<PriceSheetVO>> priceSheetData(PriceSheetQuery priceSheetQuery, Query query) {
-        priceSheetQuery.setQuery(query);
         R<Page<PriceSheetVO>> pageR = erpDataOemClient.priceSheetData(priceSheetQuery);
         Page<PriceSheetVO> data = pageR.getData();
         Page<PriceSheetVO> 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<Page<PriceSheetVO>> pageR = erpDataOemClient.priceSheetData(priceSheetQuery);
         Page<PriceSheetVO> data = pageR.getData();
         List<PriceSheetVO> list = data.getRecords();

blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemStatementServiceImpl.java

@@ -654,9 +654,6 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
             query.setOcName(oemName);
             query.setInDateStart(putStoreDate);
             query.setInDateEnd(putStoreDate);
-            Query pageQuery = new Query();
-            pageQuery.setSize(99999);
-            query.setQuery(pageQuery);
             R<Page<PriceSheetVO>> pageR = erpDataOemClient.priceSheetData(query);
 
             if (pageR != null && pageR.getData() != null) {
@@ -675,9 +672,6 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
     private List<PriceSheetVO> getPriceSheets(String oemName) {
         PriceSheetQuery query = new PriceSheetQuery();
         query.setOcName(oemName);
-        Query pageQuery = new Query();
-        pageQuery.setSize(99999);
-        query.setQuery(pageQuery);
         R<Page<PriceSheetVO>> pageR = erpDataOemClient.priceSheetData(query);
 
         if (pageR != null && pageR.getData() != null) {
@@ -1584,9 +1578,6 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
         if (minPutStoreTime != null) {
             query.setInDateEnd(minPutStoreTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate());
         }
-        Query pageQuery = new Query();
-        pageQuery.setSize(99999);
-        query.setQuery(pageQuery);
         R<Page<PriceSheetVO>> pageR = erpDataOemClient.priceSheetData(query);
 
         if (pageR != null && pageR.getData() != null) {

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<Page<PriceSheetVO>> priceSheetData(@SpringQueryMap PriceSheetQuery priceSheetQuery) {
-        Query query = priceSheetQuery.getQuery();
+        Query query = new Query();
+        query.setSize(99999);;
         IPage<PriceSheetVO> iPages = erpDataOemService.priceSheetData(Condition.getPage(query), priceSheetQuery);
         Page<PriceSheetVO> pages = new Page<>();