From 9bdd737605ddf723ffbc146eb8c78f60acde0f8f Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 28 Mar 2024 10:49:14 +0800
Subject: [PATCH] =?UTF-8?q?fix=2082900=20=E6=A0=87=E5=87=86=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1-=20=E9=9C=80=E8=A6=81=E6=8C=89=E7=85=A7=E4=BC=9A?=
 =?UTF-8?q?=E8=AE=AE=E7=9A=84=E5=B9=B4=E4=BB=BD=E4=B8=AD=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E5=BD=93=E5=B9=B4=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../statistics/controller/StandardStatisticsController.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/StandardStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/StandardStatisticsController.java
index 132603f0..59104d6d 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/StandardStatisticsController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/StandardStatisticsController.java
@@ -1,5 +1,6 @@
 package com.jero.statistics.controller;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -39,6 +40,8 @@ public class StandardStatisticsController {
         if (StringUtils.isNotBlank(meetingName)){
             queryWrapper.like("pm.meeting_name",meetingName);
         }
+        String year = req.getParameter("year");
+        queryWrapper.eq("pm.particular_year", StringUtils.isBlank(year) ? String.valueOf(DateUtil.thisYear()) : year);
         Page<PayMeetingStandardProject> page = new Page<>(pageNo, pageSize);
         IPage<PayMeetingStandardProject> pageList = meetingStandardProjectService.pageList(page, queryWrapper);
         return Result.OK(pageList);