update 会议打包统计 确认年份 改为 项目年份
This commit is contained in:
@@ -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
|
||||
|
||||
+2
-2
@@ -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;
|
||||
}
|
||||
|
||||
+2
-2
@@ -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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user