From c766d48ed06e53acda287fcfa7cc1c8bd2737df1 Mon Sep 17 00:00:00 2001 From: maxiangong <298222784@qq.com> Date: Tue, 26 May 2026 09:40:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E7=BB=93=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/oem/pojo/request/PriceSheetQuery.java | 4 ++++ .../erpdata/feign/IErpDataOemClient.java | 4 ++-- .../feign/IErpDataOemClientFallback.java | 2 +- .../desk/oem/controller/OemOrderController.java | 6 ++++-- .../service/impl/OemStatementServiceImpl.java | 17 ++++++++++------- .../erpdata/feign/ErpDataOemClientImpl.java | 3 ++- .../erpdata/mapper/ErpDataOemMapper.xml | 4 ++-- 7 files changed, 25 insertions(+), 15 deletions(-) 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 11dbdc731..bbd8ce6ed 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 @@ -2,6 +2,7 @@ package org.springblade.desk.oem.pojo.request; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import org.springblade.core.mp.support.Query; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDate; @@ -69,4 +70,7 @@ public class PriceSheetQuery { @Schema(description = "价格类型") private String pricetype; + + @Schema(description = "查询条件") + private Query query; } diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataOemClient.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataOemClient.java index 0c48a5ad8..7fe7606cc 100644 --- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataOemClient.java +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataOemClient.java @@ -44,10 +44,10 @@ public interface IErpDataOemClient { /** * 报价单查询 * - * @param query + * @param priceSheetQuery */ @GetMapping(PRICE_SHEET_DATA) - R> priceSheetData(@SpringQueryMap PriceSheetQuery priceSheetQuery, @SpringQueryMap Query query); + R> priceSheetData(@SpringQueryMap PriceSheetQuery priceSheetQuery); /** * 协作外协订单接收 diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataOemClientFallback.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataOemClientFallback.java index 5613325ba..da5723554 100644 --- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataOemClientFallback.java +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpDataOemClientFallback.java @@ -22,7 +22,7 @@ public class IErpDataOemClientFallback implements IErpDataOemClient { } @Override - public R> priceSheetData(PriceSheetQuery priceSheetQuery, Query query) { + public R> priceSheetData(PriceSheetQuery priceSheetQuery) { return R.fail("查询报价单 失败"); } 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 2461af9d0..a096736e7 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,8 @@ public class OemOrderController extends BladeController { @ApiOperationSupport(order = 9) @Operation(summary = "报价单分页", description = "传入mesOemStatement") public R> priceSheetData(PriceSheetQuery priceSheetQuery, Query query) { - R> pageR = erpDataOemClient.priceSheetData(priceSheetQuery, query); + priceSheetQuery.setQuery(query); + R> pageR = erpDataOemClient.priceSheetData(priceSheetQuery); Page data = pageR.getData(); Page pages = new Page<>(); // 复制分页属性 @@ -250,7 +251,8 @@ public class OemOrderController extends BladeController { @Operation(summary = "报价单导出数据", description = "") public void exportPriceSheetData(PriceSheetQuery priceSheetQuery, Query query, HttpServletResponse response) { query.setSize(99999); - R> pageR = erpDataOemClient.priceSheetData(priceSheetQuery, query); + priceSheetQuery.setQuery(query); + R> pageR = erpDataOemClient.priceSheetData(priceSheetQuery); Page data = pageR.getData(); List list = data.getRecords(); List excels = new ArrayList<>(); 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 d23970155..49f027066 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,10 +654,10 @@ public class OemStatementServiceImpl extends BaseServiceImpl> pageR = erpDataOemClient.priceSheetData(query, new Query() {{ + query.setQuery(new Query() {{ setSize(99999); }}); + R> pageR = erpDataOemClient.priceSheetData(query); if (pageR != null && pageR.getData() != null) { return pageR.getData().getRecords(); @@ -675,9 +675,10 @@ public class OemStatementServiceImpl extends BaseServiceImpl getPriceSheets(String oemName) { PriceSheetQuery query = new PriceSheetQuery(); query.setOcName(oemName); - R> pageR = erpDataOemClient.priceSheetData(query, new Query() {{ + query.setQuery(new Query() {{ setSize(99999); }}); + R> pageR = erpDataOemClient.priceSheetData(query); if (pageR != null && pageR.getData() != null) { return pageR.getData().getRecords(); @@ -1508,7 +1509,7 @@ public class OemStatementServiceImpl extends BaseServiceImpl - Map> priceSheetMap = priceSheetAllList.stream().collect(Collectors.groupingBy(PriceSheetVO::getGxinfo, () -> new TreeMap<>(Collections.reverseOrder()), // 按键的倒序排序 + Map> priceSheetMap = priceSheetAllList.stream().filter(item -> item.getGxinfo() != null).collect(Collectors.groupingBy(PriceSheetVO::getGxinfo, () -> new TreeMap<>(Collections.reverseOrder()), // 按键的倒序排序 Collectors.collectingAndThen(Collectors.toList(), list -> { // 对每个分组内的列表按生效日期倒序排序 return list.stream().sorted(Comparator.comparing(PriceSheetVO::getStartdat).reversed()).collect(Collectors.toList()); @@ -1573,9 +1574,10 @@ public class OemStatementServiceImpl extends BaseServiceImpl> pageR = erpDataOemClient.priceSheetData(query, new Query() {{ + query.setQuery(new Query() {{ setSize(99999); }}); + R> pageR = erpDataOemClient.priceSheetData(query); if (pageR != null && pageR.getData() != null) { return pageR.getData().getRecords(); @@ -1715,11 +1717,12 @@ public class OemStatementServiceImpl extends BaseServiceImpl> priceSheetData(@SpringQueryMap PriceSheetQuery priceSheetQuery, @SpringQueryMap Query query) { + public R> priceSheetData(@SpringQueryMap PriceSheetQuery priceSheetQuery) { + Query query = priceSheetQuery.getQuery(); IPage iPages = erpDataOemService.priceSheetData(Condition.getPage(query), priceSheetQuery); Page pages = new Page<>(); diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataOemMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataOemMapper.xml index 27c931caf..571b70de9 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataOemMapper.xml +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataOemMapper.xml @@ -31,10 +31,10 @@ AND a.remark LIKE concat(concat('%', #{query.memo}),'%') - AND to_date(${query.inDateStart},'YYYY-MM-DD'), = ]]> a.startdat + AND #{query.inDateStart} = ]]> a.startdat - AND to_date(${query.inDateEnd},'YYYY-MM-DD'), a.validdat + AND #{query.inDateEnd} a.validdat AND a.validflag IN