diff --git a/src/main/java/com/gunshi/project/ss/controller/FundBudgetController.java b/src/main/java/com/gunshi/project/ss/controller/FundBudgetController.java index a3a4b53..a7f6674 100644 --- a/src/main/java/com/gunshi/project/ss/controller/FundBudgetController.java +++ b/src/main/java/com/gunshi/project/ss/controller/FundBudgetController.java @@ -30,8 +30,12 @@ public class FundBudgetController extends AbstractCommonFileController { @Operation(description = "根据年份查询") @GetMapping("/get/{year}") - public R get(@PathVariable("year") String year){ - + public R get(@PathVariable("year") Integer year){ + FundBudget res = fundBudgetService.getByYear(year); + if(res!=null){ + List files = fileService.getFiles(getGroupId(), res.getId().toString()); + } + return R.ok(res); } @Operation(description = "分页") diff --git a/src/main/java/com/gunshi/project/ss/service/FundBudgetService.java b/src/main/java/com/gunshi/project/ss/service/FundBudgetService.java index 0cac1c3..1b7d1b6 100644 --- a/src/main/java/com/gunshi/project/ss/service/FundBudgetService.java +++ b/src/main/java/com/gunshi/project/ss/service/FundBudgetService.java @@ -60,4 +60,11 @@ public class FundBudgetService extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(FundBudget::getBudgetYear, year); + FundBudget one = baseMapper.selectOne(queryWrapper); + return one; + } }