From e057ff13c10d8e96f44d9c96caa2436a762c5547 Mon Sep 17 00:00:00 2001 From: han0 Date: Mon, 6 Jan 2025 10:10:42 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=96=B0=E5=A2=9E=E6=8C=89=E5=B9=B4?= =?UTF-8?q?=E4=BB=BD=E6=9F=A5=E8=AF=A2=E9=87=87=E9=9B=86=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mjkf/xinke/main/controller/MaterialTaskController.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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); }