From bf978de90165d89a72a7454106274d0585125eca Mon Sep 17 00:00:00 2001 From: han0 Date: Thu, 26 Dec 2024 15:49:11 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=85=A5=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/controller/DataShowingController.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/mjkf/xinke/main/controller/DataShowingController.java b/src/main/java/mjkf/xinke/main/controller/DataShowingController.java index 8ad0b98..a38c915 100644 --- a/src/main/java/mjkf/xinke/main/controller/DataShowingController.java +++ b/src/main/java/mjkf/xinke/main/controller/DataShowingController.java @@ -37,9 +37,9 @@ public class DataShowingController { @ApiOperation("钢材") @GetMapping("/steel") public HttpResponse steel ( - @ApiParam(value = "名称") @RequestParam(value="name", required = false) String name + @ApiParam(value = "材料编号") @RequestParam(value="materialId", required = false) String materialId ) throws Exception { - var query = priceResultService.getQueryByName(name); + var query = priceResultService.getQueryByMaterialId(materialId); query = priceResultService.queryLastYear(query); var result = priceResultService.list(query); return FuHttpResponse.Builder().dataResponse(result).build(); @@ -48,9 +48,9 @@ public class DataShowingController { @ApiOperation("沥青") @GetMapping("/asphalt") public HttpResponse asphalt ( - @ApiParam(value = "名称") @RequestParam(value="name", required = false) String name + @ApiParam(value = "材料编号") @RequestParam(value="materialId", required = false) String materialId ) throws Exception { - var query = priceResultService.getQueryByName(name); + var query = priceResultService.getQueryByMaterialId(materialId); query = priceResultService.queryLastYear(query); var result = priceResultService.list(query); return FuHttpResponse.Builder().dataResponse(result).build(); @@ -59,9 +59,9 @@ public class DataShowingController { @ApiOperation("水泥") @GetMapping("/cement") public HttpResponse cement ( - @ApiParam(value = "名称") @RequestParam(value="name", required = false) String name + @ApiParam(value = "材料编号") @RequestParam(value="materialId", required = false) String materialId ) throws Exception { - var query = priceResultService.getQueryByName(name); + var query = priceResultService.getQueryByMaterialId(materialId); query = priceResultService.queryLastYear(query); var result = priceResultService.list(query); return FuHttpResponse.Builder().dataResponse(result).build(); @@ -70,9 +70,9 @@ public class DataShowingController { @ApiOperation("汽油") @GetMapping("/gasoline") public HttpResponse gasoline ( - @ApiParam(value = "名称") @RequestParam(value="name", required = false) String name + @ApiParam(value = "材料编号") @RequestParam(value="materialId", required = false) String materialId ) throws Exception { - var query = priceResultService.getQueryByName(name); + var query = priceResultService.getQueryByMaterialId(materialId); query = priceResultService.queryLastYear(query); var result = priceResultService.list(query); return FuHttpResponse.Builder().dataResponse(result).build();