From f0a89f946cb11cb489fc13b57f4f6fb32d27140d Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 14 Mar 2023 14:51:24 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E9=A6=96=E9=A1=B5=E5=BA=94=E6=94=B6?=
 =?UTF-8?q?=E8=B4=A6=E6=AC=BE=E7=BB=9F=E8=AE=A1=E5=88=97=E8=A1=A8=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=A2=9E=E5=8A=A0=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/index/contoller/IndexController.java |  4 +-
 .../com/jero/index/service/IndexService.java  | 10 ++--
 .../project/mapper/PayWorkingGroupMapper.java |  2 +-
 .../mapper/xml/PayWorkingGroupMapper.xml      | 55 ++++++++++++++-----
 4 files changed, 50 insertions(+), 21 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/index/contoller/IndexController.java b/jero-boot-incoming-payment/src/main/java/com/jero/index/contoller/IndexController.java
index f768e86b..7f3e452f 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/index/contoller/IndexController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/index/contoller/IndexController.java
@@ -120,11 +120,13 @@ public class IndexController {
     public Result<?> uncollectedList(
             @RequestParam(name="type",defaultValue = "1")String type,
             @RequestParam(name="departCode",required = false)String departCode,
+            @RequestParam(name="column",required = false)String column,
+            @RequestParam(name="order",required = false)String order,
             @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
 
         Page<AllProjectStatistics> page = new Page<>(pageNo, pageSize);
-        HashMap<String, Object> hashMap = indexService.uncollectedList(type,departCode,page);
+        HashMap<String, Object> hashMap = indexService.uncollectedList(type,departCode,page,column,order);
 
         return Result.OK(hashMap);
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/index/service/IndexService.java b/jero-boot-incoming-payment/src/main/java/com/jero/index/service/IndexService.java
index 9819b147..54787fec 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/index/service/IndexService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/index/service/IndexService.java
@@ -359,21 +359,21 @@ public class IndexService {
         return uncollectedPieChartVO;
     }
 
-    public HashMap<String, Object> uncollectedList(String type, String departCode, Page<AllProjectStatistics> page) {
+    public HashMap<String, Object> uncollectedList(String type, String departCode, Page<AllProjectStatistics> page, String column, String order) {
         IPage<AllProjectStatistics> pageList = new Page<>();
 
         switch (type) {
             case "1":
-                pageList = payWorkingGroupMapper.invoiceAmountList(page, null, 90, departCode);
+                pageList = payWorkingGroupMapper.invoiceAmountList(page, null, 90, departCode,column,order);
                 break;
             case "2":
-                pageList = payWorkingGroupMapper.invoiceAmountList(page, 91, 180, departCode);
+                pageList = payWorkingGroupMapper.invoiceAmountList(page, 91, 180, departCode,column,order);
                 break;
             case "3":
-                pageList = payWorkingGroupMapper.invoiceAmountList(page, 181, 360, departCode);
+                pageList = payWorkingGroupMapper.invoiceAmountList(page, 181, 360, departCode,column,order);
                 break;
             case "4":
-                pageList = payWorkingGroupMapper.invoiceAmountList(page, 361, null, departCode);
+                pageList = payWorkingGroupMapper.invoiceAmountList(page, 361, null, departCode,column,order);
                 break;
         }
         if (pageList.getRecords() != null) {
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java
index 1ea89d56..f4761483 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java
@@ -244,7 +244,7 @@ public interface PayWorkingGroupMapper extends BaseMapper<PayWorkingGroup> {
 
     BigDecimal invoiceAmount(@Param("start") Integer start, @Param("end") Integer end, @Param("departCode") String departCode);
 
-    IPage<AllProjectStatistics> invoiceAmountList(Page<AllProjectStatistics> page, @Param("start") Integer start, @Param("end") Integer end, @Param("departCode") String departCode);
+    IPage<AllProjectStatistics> invoiceAmountList(Page<AllProjectStatistics> page, @Param("start") Integer start, @Param("end") Integer end, @Param("departCode") String departCode, @Param("column") String column, @Param("order") String order);
 
     AllMoney invoiceAmountList33(@Param("start") Integer start, @Param("end") Integer end, @Param("departCode") String departCode);
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
index 820228c2..8fd8834d 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
@@ -2413,7 +2413,8 @@
     </select>
 
     <select id="invoiceAmountList" resultType="com.jero.statistics.entity.AllProjectStatistics">
-        SELECT DISTINCT v.projectId,
+        select * from
+        (SELECT DISTINCT v.projectId,
                projectName,
                principalName,
                chargeCompanyTemporaryName,
@@ -2429,23 +2430,49 @@
         FROM v_statistical v
                  left join pay_mail_bill_project pmbp on v.projectId = pmbp.project_id
                  left join pay_mail_bill pmb on pmb.id = pmbp.bill_id
-        <where>
-            <if test="end != null">
-                bill_date >= DATE_SUB(CURDATE(), INTERVAL #{end} DAY)
+            <where>
+                <if test="end != null">
+                    bill_date >= DATE_SUB(CURDATE(), INTERVAL #{end} DAY)
+                </if>
+                <if test="start != null">
+                    AND bill_date <![CDATA[<=]]> DATE_SUB(CURDATE(), INTERVAL #{start} DAY)
+                </if>
+                <if test="start == null">
+                    AND bill_date <![CDATA[<=]]> CURDATE()
+                </if>
+                <if test="departCode != null and departCode != ''">
+                    and departCode = #{departCode}
+                </if>
+                <!-- 开票未来款 -->
+                AND (comeAllMoney <![CDATA[<]]> billMoney or
+                     (comeAllMoney is null and billMoney is not null and billMoney != 0))
+            </where>) p
+        <if test="column != null and column != ''">
+            <if test="column == 'allMoney' and order == 'desc'">
+                order by allMoney desc
             </if>
-            <if test="start != null">
-                AND bill_date <![CDATA[<=]]> DATE_SUB(CURDATE(), INTERVAL #{start} DAY)
+            <if test="column == 'comeAllMoney' and order == 'desc'">
+                order by comeAllMoney desc
             </if>
-            <if test="start == null">
-                AND bill_date <![CDATA[<=]]> CURDATE()
+            <if test="column == 'billMoney' and order == 'desc'">
+                order by billMoney desc
             </if>
-            <if test="departCode != null and departCode != ''">
-                and departCode = #{departCode}
+            <if test="column == 'confirmAmount' and order == 'desc'">
+                order by confirmAmount desc
             </if>
-            <!-- 开票未来款 -->
-            AND (comeAllMoney <![CDATA[<]]> billMoney or
-                 (comeAllMoney is null and billMoney is not null and billMoney != 0))
-        </where>
+            <if test="column == 'confirmAmount' and order == 'asc'">
+                order by confirmAmount
+            </if>
+            <if test="column == 'allMoney' and order == 'asc'">
+                order by allMoney
+            </if>
+            <if test="column == 'comeAllMoney' and order == 'asc'">
+                order by comeAllMoney
+            </if>
+            <if test="column == 'billMoney' and order == 'asc'">
+                order by billMoney
+            </if>
+        </if>
     </select>
 
     <select id="invoiceAmountList33" resultType="com.jero.statistics.entity.AllMoney">