From 8fe33b1af4b615380152aed022a95e6fe6313450 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 25 Jul 2024 18:06:17 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=9A=E8=AE=AE=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=20=E7=A1=AE=E8=AE=A4=E5=B9=B4=E4=BB=BD=20?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=20=E9=A1=B9=E7=9B=AE=E5=B9=B4=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/统计视图（新）.sql                                         | 1 +
 .../meeting/service/impl/PayMeetingSituationServiceImpl.java  | 4 ++--
 .../jero/statistics/entity/MeetingPackStatisticsSearch.java   | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/db/统计视图（新）.sql b/db/统计视图（新）.sql
index 6cf1a284..b91765a3 100644
--- a/db/统计视图（新）.sql
+++ b/db/统计视图（新）.sql
@@ -826,6 +826,7 @@ SELECT
     end meeting_costs_b,
     p2.meeting_name,
     p2.meeting_type,
+    p2.particular_year as year,
     ( SELECT DATE_FORMAT( payment_date, '%Y' ) FROM pay_confirm_payment_record p3 WHERE p3.project_id = p1.id LIMIT 1 ) AS payment_year
 FROM
     pay_meeting_situation p1
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
index 91094319..5977296c 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
@@ -2154,8 +2154,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         if (!StringUtils.isBlank(metingPackStatisticsSearch.getPayMode())) {
             query.lambda().eq(PayMeetingSituation::getPayMode, metingPackStatisticsSearch.getPayMode());
         }
-        if (!StringUtils.isBlank(metingPackStatisticsSearch.getPaymentYear())) {
-            query.eq("payment_year", metingPackStatisticsSearch.getPaymentYear());
+        if (!StringUtils.isBlank(metingPackStatisticsSearch.getYear())) {
+            query.eq("year", metingPackStatisticsSearch.getYear());
         }
         return query;
     }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/MeetingPackStatisticsSearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/MeetingPackStatisticsSearch.java
index e784b163..6e505e14 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/MeetingPackStatisticsSearch.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/MeetingPackStatisticsSearch.java
@@ -15,8 +15,8 @@ public class MeetingPackStatisticsSearch implements Serializable {
 
     @ApiModelProperty(value = "来款单位")
     private String companyName;
-    @ApiModelProperty(value = "确认年份")
-    private String paymentYear;
+    @ApiModelProperty(value = "项目年份")
+    private String year;
     @ApiModelProperty(value = "来款方式（默认打包）")
     private String payMode;