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

fix:80462

Browse Source
This commit is contained in:
梁琦涛
2024-01-05 12:35:27 +08:00
parent 5dffc9a4c3
commit 0077db7779
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+2 -1
View File
@@ -1939,6 +1939,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
Integer pageSize) { Integer pageSize) {
QueryWrapper<PayMeetingSituation> query = getPayMeetingSituationQueryWrapper(metingPackStatisticsSearch); QueryWrapper<PayMeetingSituation> query = getPayMeetingSituationQueryWrapper(metingPackStatisticsSearch);
Page<PayMeetingSituation> page = new Page<>(pageNo, pageSize); Page<PayMeetingSituation> page = new Page<>(pageNo, pageSize);
query.groupBy("p3.project_id");
query.select("p1.id,p1.meeting_id,p1.company_name,p1.company_contact_name,p1.amount_receivable as allMoney,p1.confirm_amount,\n" + query.select("p1.id,p1.meeting_id,p1.company_name,p1.company_contact_name,p1.amount_receivable as allMoney,p1.confirm_amount,\n" +
" p1.invoice_amount as billMoney,p1.paid_amount as comeAllMoney,p2.meeting_name,p2.meeting_type,DATE_FORMAT(p3.payment_date,'%Y') as payment_year"); " p1.invoice_amount as billMoney,p1.paid_amount as comeAllMoney,p2.meeting_name,p2.meeting_type,DATE_FORMAT(p3.payment_date,'%Y') as payment_year");
// 查看分页数据 // 查看分页数据
@@ -1973,6 +1974,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
QueryWrapper<PayMeetingSituation> query = getPayMeetingSituationQueryWrapper(metingPackStatisticsSearch); QueryWrapper<PayMeetingSituation> query = getPayMeetingSituationQueryWrapper(metingPackStatisticsSearch);
query.select("p1.id,p1.meeting_id,p1.company_name,p1.company_contact_name,p1.amount_receivable as allMoney,p1.confirm_amount,\n" + query.select("p1.id,p1.meeting_id,p1.company_name,p1.company_contact_name,p1.amount_receivable as allMoney,p1.confirm_amount,\n" +
"p1.invoice_amount as billMoney,p1.paid_amount as comeAllMoney,p2.meeting_name,p2.meeting_type,DATE_FORMAT(p3.payment_date,'%Y') as payment_year"); "p1.invoice_amount as billMoney,p1.paid_amount as comeAllMoney,p2.meeting_name,p2.meeting_type,DATE_FORMAT(p3.payment_date,'%Y') as payment_year");
query.groupBy("p3.project_id");
List<MeetingPackStatistics> list = payMeetingSituationMapper.getMeetingPackStatistics(query); List<MeetingPackStatistics> list = payMeetingSituationMapper.getMeetingPackStatistics(query);
// Step.3 AutoPoi 导出Excel // Step.3 AutoPoi 导出Excel
@@ -2000,7 +2002,6 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
if (!StringUtils.isBlank(metingPackStatisticsSearch.getPaymentYear())) { if (!StringUtils.isBlank(metingPackStatisticsSearch.getPaymentYear())) {
query.eq("DATE_FORMAT(p3.payment_date,'%Y')", metingPackStatisticsSearch.getPaymentYear()); query.eq("DATE_FORMAT(p3.payment_date,'%Y')", metingPackStatisticsSearch.getPaymentYear());
} }
query.groupBy("p3.project_id");
return query; return query;
} }
} }