diff --git a/src/main/java/mjkf/xinke/main/controller/MaterialTaskController.java b/src/main/java/mjkf/xinke/main/controller/MaterialTaskController.java index 7b05dde..1280d10 100644 --- a/src/main/java/mjkf/xinke/main/controller/MaterialTaskController.java +++ b/src/main/java/mjkf/xinke/main/controller/MaterialTaskController.java @@ -46,11 +46,13 @@ public class MaterialTaskController { @ApiParam(value = "页码") @RequestParam(name = "current", required = false, defaultValue = "1") Integer current, @ApiParam("任务类型") Integer type, @ApiParam("关键字") @RequestParam(name = "key_word", required = false) String keyWord, - @ApiParam("月份") Integer month + @ApiParam("月份") Integer month, + @ApiParam("年份") Integer year ) { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(MaterialTask::getType, type); query.eq(MaterialTask::getMonth, month); + query.eq(MaterialTask::getYear, year); if (keyWord != null) { query.like(MaterialTask::getName, keyWord); }