root/material-manage-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修改查询入参

Browse Source
This commit is contained in:
han0
2024-12-26 15:49:11 +08:00
parent 6e8273a527
commit bf978de901
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/mjkf/xinke/main/controller/DataShowingController.java
View File

@@ -37,9 +37,9 @@ public class DataShowingController {
@ApiOperation("钢材") @ApiOperation("钢材")
@GetMapping("/steel") @GetMapping("/steel")
public HttpResponse steel ( public HttpResponse steel (
@ApiParam(value = "名称") @RequestParam(value="name", required = false) String name @ApiParam(value = "材料编号") @RequestParam(value="materialId", required = false) String materialId
) throws Exception { ) throws Exception {
var query = priceResultService.getQueryByName(name); var query = priceResultService.getQueryByMaterialId(materialId);
query = priceResultService.queryLastYear(query); query = priceResultService.queryLastYear(query);
var result = priceResultService.list(query); var result = priceResultService.list(query);
return FuHttpResponse.Builder().dataResponse(result).build(); return FuHttpResponse.Builder().dataResponse(result).build();
@@ -48,9 +48,9 @@ public class DataShowingController {
@ApiOperation("沥青") @ApiOperation("沥青")
@GetMapping("/asphalt") @GetMapping("/asphalt")
public HttpResponse asphalt ( public HttpResponse asphalt (
@ApiParam(value = "名称") @RequestParam(value="name", required = false) String name @ApiParam(value = "材料编号") @RequestParam(value="materialId", required = false) String materialId
) throws Exception { ) throws Exception {
var query = priceResultService.getQueryByName(name); var query = priceResultService.getQueryByMaterialId(materialId);
query = priceResultService.queryLastYear(query); query = priceResultService.queryLastYear(query);
var result = priceResultService.list(query); var result = priceResultService.list(query);
return FuHttpResponse.Builder().dataResponse(result).build(); return FuHttpResponse.Builder().dataResponse(result).build();
@@ -59,9 +59,9 @@ public class DataShowingController {
@ApiOperation("水泥") @ApiOperation("水泥")
@GetMapping("/cement") @GetMapping("/cement")
public HttpResponse cement ( public HttpResponse cement (
@ApiParam(value = "名称") @RequestParam(value="name", required = false) String name @ApiParam(value = "材料编号") @RequestParam(value="materialId", required = false) String materialId
) throws Exception { ) throws Exception {
var query = priceResultService.getQueryByName(name); var query = priceResultService.getQueryByMaterialId(materialId);
query = priceResultService.queryLastYear(query); query = priceResultService.queryLastYear(query);
var result = priceResultService.list(query); var result = priceResultService.list(query);
return FuHttpResponse.Builder().dataResponse(result).build(); return FuHttpResponse.Builder().dataResponse(result).build();
@@ -70,9 +70,9 @@ public class DataShowingController {
@ApiOperation("汽油") @ApiOperation("汽油")
@GetMapping("/gasoline") @GetMapping("/gasoline")
public HttpResponse gasoline ( public HttpResponse gasoline (
@ApiParam(value = "名称") @RequestParam(value="name", required = false) String name @ApiParam(value = "材料编号") @RequestParam(value="materialId", required = false) String materialId
) throws Exception { ) throws Exception {
var query = priceResultService.getQueryByName(name); var query = priceResultService.getQueryByMaterialId(materialId);
query = priceResultService.queryLastYear(query); query = priceResultService.queryLastYear(query);
var result = priceResultService.list(query); var result = priceResultService.list(query);
return FuHttpResponse.Builder().dataResponse(result).build(); return FuHttpResponse.Builder().dataResponse(result).build();