From 74fd9e6fa9300d0b425eba0edce4fe14ad67abc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Fri, 5 Jan 2024 12:49:35 +0800
Subject: [PATCH] fix:80460

---
 .../impl/PayMeetingSituationServiceImpl.java   | 18 ++++++++++++++++++
 .../entity/MeetingPackStatisticsSearch.java    |  6 ++++++
 2 files changed, 24 insertions(+)

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 574889fd..9437eeb1 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
@@ -2002,6 +2002,24 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         if (!StringUtils.isBlank(metingPackStatisticsSearch.getPaymentYear())) {
             query.eq("DATE_FORMAT(p3.payment_date,'%Y')", metingPackStatisticsSearch.getPaymentYear());
         }
+        // 排序
+        if(!StringUtils.isBlank(metingPackStatisticsSearch.getColumn()) && !StringUtils.isBlank(metingPackStatisticsSearch.getOrder())){
+            String column = "";
+            switch (metingPackStatisticsSearch.getColumn()){
+                case "allMoney": column = "p1.amount_receivable";break;
+                case "confirmAmount": column = "p1.confirm_amount";break;
+                case "billMoney": column = "p1.invoice_amount";break;
+                case "comeAllMoney": column = "p1.paid_amount";break;
+                default:break;
+            }
+            if(!StringUtils.isBlank(column)){
+                if(Objects.equals(metingPackStatisticsSearch.getOrder(),"asc")){
+                    query.orderByAsc(column);
+                }else{
+                    query.orderByDesc(column);
+                }
+            }
+        }
         return query;
     }
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/MeetingPackStatisticsSearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/MeetingPackStatisticsSearch.java
index fdde5f24..e784b163 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/MeetingPackStatisticsSearch.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/MeetingPackStatisticsSearch.java
@@ -19,4 +19,10 @@ public class MeetingPackStatisticsSearch implements Serializable {
     private String paymentYear;
     @ApiModelProperty(value = "来款方式（默认打包）")
     private String payMode;
+
+    @ApiModelProperty(value = "字段")
+    private String column;
+
+    @ApiModelProperty(value = "排序规则")
+    private String order;
 }