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
2025-03-04 10:43:37 +08:00
parent ff57ea0441
commit e37d499bbc
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,10 +81,10 @@ public class DataShowingController {
@ApiOperation("地材") @ApiOperation("地材")
@GetMapping("/local-material") @GetMapping("/local-material")
public HttpResponse localMaterial ( public HttpResponse localMaterial (
@ApiParam(value = "名称") @RequestParam(value="name", required = false) String name @ApiParam(value = "材料编号") @RequestParam(value="materialId", required = false) String materialId
) throws Exception { ) throws Exception {
// 中(粗)砂、碎石、机制砂 // 中(粗)砂、碎石、机制砂
var query = localMaterialService.getQueryByName(name); var query = localMaterialService.getQueryByMaterialId(materialId);
query = localMaterialService.queryLastYear(query); query = localMaterialService.queryLastYear(query);
var result = localMaterialService.list(query); var result = localMaterialService.list(query);
return FuHttpResponse.Builder().dataResponse(result).build(); return FuHttpResponse.Builder().dataResponse(result).build();
@@ -93,11 +93,10 @@ public class DataShowingController {
@ApiOperation("商混") @ApiOperation("商混")
@GetMapping("/commercial-concrete") @GetMapping("/commercial-concrete")
public HttpResponse commercialConcrete ( public HttpResponse commercialConcrete (
@ApiParam(value = "名称") @RequestParam(value="name", required = false) String name @ApiParam(value = "材料编号") @RequestParam(value="materialId", required = false) String materialId
) throws Exception { ) throws Exception {
// 商品混凝土 // 商品混凝土
var query = localMaterialService.getQueryByName(name); var query = localMaterialService.getQueryByMaterialId(materialId);
query.like(LocalMaterial::getSpec,"C40");
query = localMaterialService.queryLastYear(query); query = localMaterialService.queryLastYear(query);
var result = localMaterialService.list(query); var result = localMaterialService.list(query);
return FuHttpResponse.Builder().dataResponse(result).build(); return FuHttpResponse.Builder().dataResponse(result).build();

6
src/main/java/mjkf/xinke/main/service/LocalMaterialService.java
View File

@@ -114,6 +114,12 @@ public class LocalMaterialService extends DataService<BaseMapper<LocalMaterial>,
return query; return query;
} }
public LambdaQueryWrapper<LocalMaterial> getQueryByMaterialId(String materialId) {
LambdaQueryWrapper<LocalMaterial> query = new LambdaQueryWrapper<>();
query.eq(LocalMaterial::getMaterialId, materialId);
return query;
}
public LambdaQueryWrapper<LocalMaterial> queryLastYear (LambdaQueryWrapper<LocalMaterial> query) { public LambdaQueryWrapper<LocalMaterial> queryLastYear (LambdaQueryWrapper<LocalMaterial> query) {
var endDate = LocalDate.now(); var endDate = LocalDate.now();
var startDate = endDate.minusYears(1); var startDate = endDate.minusYears(1);