From e37d499bbc0950963773482cc5f4359c894ed9d5 Mon Sep 17 00:00:00 2001 From: han0 Date: Tue, 4 Mar 2025 10:43:37 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8F=98=E6=9B=B4=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E6=9D=90=E6=96=99=E7=BC=96=E5=8F=B7=E8=8E=B7=E5=8F=96=E5=9C=B0?= =?UTF-8?q?=E6=9D=90=E7=BB=9F=E8=AE=A1=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xinke/main/controller/DataShowingController.java | 9 ++++----- .../mjkf/xinke/main/service/LocalMaterialService.java | 6 ++++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/mjkf/xinke/main/controller/DataShowingController.java b/src/main/java/mjkf/xinke/main/controller/DataShowingController.java index a38c915..1c7a2ca 100644 --- a/src/main/java/mjkf/xinke/main/controller/DataShowingController.java +++ b/src/main/java/mjkf/xinke/main/controller/DataShowingController.java @@ -81,10 +81,10 @@ public class DataShowingController { @ApiOperation("地材") @GetMapping("/local-material") public HttpResponse localMaterial ( - @ApiParam(value = "名称") @RequestParam(value="name", required = false) String name + @ApiParam(value = "材料编号") @RequestParam(value="materialId", required = false) String materialId ) throws Exception { // 中(粗)砂、碎石、机制砂 - var query = localMaterialService.getQueryByName(name); + var query = localMaterialService.getQueryByMaterialId(materialId); query = localMaterialService.queryLastYear(query); var result = localMaterialService.list(query); return FuHttpResponse.Builder().dataResponse(result).build(); @@ -93,11 +93,10 @@ public class DataShowingController { @ApiOperation("商混") @GetMapping("/commercial-concrete") public HttpResponse commercialConcrete ( - @ApiParam(value = "名称") @RequestParam(value="name", required = false) String name + @ApiParam(value = "材料编号") @RequestParam(value="materialId", required = false) String materialId ) throws Exception { // 商品混凝土 - var query = localMaterialService.getQueryByName(name); - query.like(LocalMaterial::getSpec,"C40"); + var query = localMaterialService.getQueryByMaterialId(materialId); query = localMaterialService.queryLastYear(query); var result = localMaterialService.list(query); return FuHttpResponse.Builder().dataResponse(result).build(); diff --git a/src/main/java/mjkf/xinke/main/service/LocalMaterialService.java b/src/main/java/mjkf/xinke/main/service/LocalMaterialService.java index 0fe4eb4..02c931e 100644 --- a/src/main/java/mjkf/xinke/main/service/LocalMaterialService.java +++ b/src/main/java/mjkf/xinke/main/service/LocalMaterialService.java @@ -114,6 +114,12 @@ public class LocalMaterialService extends DataService, return query; } + public LambdaQueryWrapper getQueryByMaterialId(String materialId) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(LocalMaterial::getMaterialId, materialId); + return query; + } + public LambdaQueryWrapper queryLastYear (LambdaQueryWrapper query) { var endDate = LocalDate.now(); var startDate = endDate.minusYears(1);