From 89c9ffd21355f7b92c32a586d0ea24a1ab673cc5 Mon Sep 17 00:00:00 2001 From: han0 Date: Thu, 11 Jul 2024 11:32:57 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=8C=89=E6=9D=90?= =?UTF-8?q?=E6=96=99id=E6=8E=92=E5=BA=8F=E8=B6=8B=E5=8A=BF=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mjkf/xinke/main/controller/PricePublishController.java | 3 ++- .../java/mjkf/xinke/main/controller/PriceResultController.java | 1 + src/main/java/mjkf/xinke/main/service/PricePublishService.java | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/mjkf/xinke/main/controller/PricePublishController.java b/src/main/java/mjkf/xinke/main/controller/PricePublishController.java index d41da1c..31de920 100644 --- a/src/main/java/mjkf/xinke/main/controller/PricePublishController.java +++ b/src/main/java/mjkf/xinke/main/controller/PricePublishController.java @@ -29,7 +29,7 @@ import java.util.List; @RestController @RequestMapping("/price-publish") public class PricePublishController { - + // todo-1 系统日志 @Resource PricePublishService pricePublishService; @@ -47,6 +47,7 @@ public class PricePublishController { throw new NcHttpException(HttpErrorResponseEnum.PRICE_PUBLISH_YEAR_MONTH_NEEDED); } var query = pricePublishService.getQuery(year, month, materialId, name, spec, type); + query.orderByAsc(PricePublish::getMaterialId); var result = pricePublishService.list(query); return FuHttpResponse.Builder().dataResponse(result).build(); diff --git a/src/main/java/mjkf/xinke/main/controller/PriceResultController.java b/src/main/java/mjkf/xinke/main/controller/PriceResultController.java index 294821e..e2f5198 100644 --- a/src/main/java/mjkf/xinke/main/controller/PriceResultController.java +++ b/src/main/java/mjkf/xinke/main/controller/PriceResultController.java @@ -45,6 +45,7 @@ public class PriceResultController { throw new NcHttpException(HttpErrorResponseEnum.PRICE_RESULT_YEAR_MONTH_NEEDED); } var query = priceResultService.getQuery(year, month, materialId, name); + query.orderByAsc(PriceResult::getMaterialId); var result = priceResultService.list(query); return FuHttpResponse.Builder().dataResponse(result).build(); diff --git a/src/main/java/mjkf/xinke/main/service/PricePublishService.java b/src/main/java/mjkf/xinke/main/service/PricePublishService.java index 58b9943..f8cd3da 100644 --- a/src/main/java/mjkf/xinke/main/service/PricePublishService.java +++ b/src/main/java/mjkf/xinke/main/service/PricePublishService.java @@ -14,7 +14,7 @@ import java.util.stream.Collectors; @Service public class PricePublishService extends ServiceImpl, PricePublish> { - public LambdaQueryWrapper getQuery(Integer year, Integer month, String materialId, String name, String spec, Integer type) { + public LambdaQueryWrapper getQuery(Integer year, Integer month, String materialId, String name, String spec, Integer type) { var query = new LambdaQueryWrapper(); if (year != null) { query = query.eq(PricePublish::getYear, year);