From baafad34915b6f878e35da4db717a738d0d365a4 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 2 Aug 2024 14:45:37 +0800
Subject: [PATCH] =?UTF-8?q?fix=2087983=20=E5=B7=A5=E4=BD=9C=E7=BB=84?=
 =?UTF-8?q?=E6=9D=A5=E6=AC=BE=E8=AF=A6=E6=83=85--=E9=87=91=E9=A2=9D?=
 =?UTF-8?q?=E5=88=97=E6=8E=92=E5=BA=8F=E6=B2=A1=E6=9C=89=E4=BD=9C=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/PayWorkingGroupSubletSearch.java   |  6 +++
 .../xml/PayWorkingGroupSubItemMapper.xml      | 43 +++++++++++++------
 2 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubletSearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubletSearch.java
index c1e46e68..80eacc5c 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubletSearch.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubletSearch.java
@@ -52,4 +52,10 @@ public class PayWorkingGroupSubletSearch {
 
     @ApiModelProperty(value = "是否打包")
     private String pack;
+
+    @ApiModelProperty(value = "字段")
+    private String column;
+
+    @ApiModelProperty(value = "排序规则")
+    private String order;
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml
index deeb4c06..f4beaba3 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml
@@ -132,7 +132,8 @@
     </sql>
 <!--工作组详情-->
     <select id="queryPageList2" resultType="com.jero.project.entity.PayWorkGroupSubletStatistics">
-       SELECT
+       select * from
+        (SELECT
         principalNameId as principalId,
         principalName,
         chargeCompanyTemporaryName,
@@ -202,17 +203,37 @@
                     </if>
                 </otherwise>
             </choose>
-            <!--<if test="payWorkingGroupSubletSearch.paymentYear != null and payWorkingGroupSubletSearch.paymentYear != ''">
-                and DATE_FORMAT (pcpr.payment_date,'%Y') like concat(#{payWorkingGroupSubletSearch.paymentYear}, '%')
-                <if test="payWorkingGroupSubletSearch.paymentMonth != null and payWorkingGroupSubletSearch.paymentMonth != ''">
-                    and DATE_FORMAT (pcpr.payment_date,'%m') like concat(#{payWorkingGroupSubletSearch.paymentMonth}, '%')
-                </if>
-            </if>-->
             <if test="payWorkingGroupSubletSearch.pack != null and payWorkingGroupSubletSearch.pack != ''">
                 AND pack = #{payWorkingGroupSubletSearch.pack}
             </if>
         </where>
-        group by id
+        group by id) p
+        <if test="payWorkingGroupSubletSearch.column != null and payWorkingGroupSubletSearch.column != ''">
+            <if test="payWorkingGroupSubletSearch.column == 'allMoney' and payWorkingGroupSubletSearch.order == 'desc'">
+                order by allMoney desc
+            </if>
+            <if test="payWorkingGroupSubletSearch.column == 'comeAllMoney' and payWorkingGroupSubletSearch.order == 'desc'">
+                order by comeAllMoney desc
+            </if>
+            <if test="payWorkingGroupSubletSearch.column == 'billMoney' and payWorkingGroupSubletSearch.order == 'desc'">
+                order by billMoney desc
+            </if>
+            <if test="payWorkingGroupSubletSearch.column == 'confirmAmount' and payWorkingGroupSubletSearch.order == 'desc'">
+                order by confirmAmount desc
+            </if>
+            <if test="payWorkingGroupSubletSearch.column == 'confirmAmount' and payWorkingGroupSubletSearch.order == 'asc'">
+                order by confirmAmount
+            </if>
+            <if test="payWorkingGroupSubletSearch.column == 'allMoney' and payWorkingGroupSubletSearch.order == 'asc'">
+                order by allMoney
+            </if>
+            <if test="payWorkingGroupSubletSearch.column == 'comeAllMoney' and payWorkingGroupSubletSearch.order == 'asc'">
+                order by comeAllMoney
+            </if>
+            <if test="payWorkingGroupSubletSearch.column == 'billMoney' and payWorkingGroupSubletSearch.order == 'asc'">
+                order by billMoney
+            </if>
+        </if>
     </select>
     <!--工作组详情总金额-->
     <select id="queryPageList233" resultType="com.jero.statistics.entity.AllMoney">
@@ -286,12 +307,6 @@
             <if test="payWorkingGroupSubletSearch.pack != null and payWorkingGroupSubletSearch.pack != ''">
                 AND pack = #{payWorkingGroupSubletSearch.pack}
             </if>
-            <!--<if test="payWorkingGroupSubletSearch.paymentYear != null and payWorkingGroupSubletSearch.paymentYear != ''">
-                and DATE_FORMAT (pcpr.payment_date,'%Y') like concat(#{payWorkingGroupSubletSearch.paymentYear}, '%')
-                <if test="payWorkingGroupSubletSearch.paymentMonth != null and payWorkingGroupSubletSearch.paymentMonth != ''">
-                    and DATE_FORMAT (pcpr.payment_date,'%m') like concat(#{payWorkingGroupSubletSearch.paymentMonth}, '%')
-                </if>
-            </if>-->
         </where>
         group by id) p
     </select>