LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 会议打包统计 确认年份 改为 项目年份

Browse Source
This commit is contained in:
lijiarao
2024-07-25 18:06:17 +08:00
parent d420e969b6
commit 8fe33b1af4
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/统计视图（新）.sql
+1
View File
@@ -826,6 +826,7 @@ SELECT
end meeting_costs_b, end meeting_costs_b,
p2.meeting_name, p2.meeting_name,
p2.meeting_type, 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 ( SELECT DATE_FORMAT( payment_date, '%Y' ) FROM pay_confirm_payment_record p3 WHERE p3.project_id = p1.id LIMIT 1 ) AS payment_year
FROM FROM
pay_meeting_situation p1 pay_meeting_situation p1
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+2 -2
View File
@@ -2154,8 +2154,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
if (!StringUtils.isBlank(metingPackStatisticsSearch.getPayMode())) { if (!StringUtils.isBlank(metingPackStatisticsSearch.getPayMode())) {
query.lambda().eq(PayMeetingSituation::getPayMode, metingPackStatisticsSearch.getPayMode()); query.lambda().eq(PayMeetingSituation::getPayMode, metingPackStatisticsSearch.getPayMode());
} }
if (!StringUtils.isBlank(metingPackStatisticsSearch.getPaymentYear())) { if (!StringUtils.isBlank(metingPackStatisticsSearch.getYear())) {
query.eq("payment_year", metingPackStatisticsSearch.getPaymentYear()); query.eq("year", metingPackStatisticsSearch.getYear());
} }
return query; return query;
} }
jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/MeetingPackStatisticsSearch.java
+2 -2
View File
@@ -15,8 +15,8 @@ public class MeetingPackStatisticsSearch implements Serializable {
@ApiModelProperty(value = "来款单位") @ApiModelProperty(value = "来款单位")
private String companyName; private String companyName;
@ApiModelProperty(value = "确认年份") @ApiModelProperty(value = "项目年份")
private String paymentYear; private String year;
@ApiModelProperty(value = "来款方式（默认打包）") @ApiModelProperty(value = "来款方式（默认打包）")
private String payMode; private String payMode;