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