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 9437eeb1..3a88c396 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 @@ -1939,9 +1939,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl query = getPayMeetingSituationQueryWrapper(metingPackStatisticsSearch); Page 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" + - " 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"); + addOrder(metingPackStatisticsSearch, query); // 查看分页数据 IPage pageList = payMeetingSituationMapper.getMeetingPackStatistics(page,query); List list = pageList.getRecords(); @@ -1972,9 +1970,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl 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" + - "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"); + addOrder(metingPackStatisticsSearch, query); List list = payMeetingSituationMapper.getMeetingPackStatistics(query); // Step.3 AutoPoi 导出Excel @@ -2002,6 +1998,14 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl query) { + 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" + + " 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"); // 排序 if(!StringUtils.isBlank(metingPackStatisticsSearch.getColumn()) && !StringUtils.isBlank(metingPackStatisticsSearch.getOrder())){ String column = ""; @@ -2020,6 +2024,5 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl