From 4c4d96d09921f4aadf6e0663bc377c1ca2ca70a7 Mon Sep 17 00:00:00 2001
From: huangqizhen <15552608129@163.com>
Date: Sat, 12 Apr 2025 17:33:24 +0800
Subject: [PATCH] =?UTF-8?q?4.12=20=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/example/demo/controller/DouController.java |  7 +++-
 src/main/java/com/example/demo/domain/dou/Yve.java |  2 ++
 src/main/resources/mapperLink/DouMapper.xml        | 40 +++++++++++++---------
 3 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/example/demo/controller/DouController.java b/src/main/java/com/example/demo/controller/DouController.java
index 1c4615c..08ea751 100644
--- a/src/main/java/com/example/demo/controller/DouController.java
+++ b/src/main/java/com/example/demo/controller/DouController.java
@@ -1,7 +1,10 @@
 package com.example.demo.controller;
 
 
-import com.example.demo.domain.dou.*;
+
+import com.example.demo.domain.dou.Records;
+import com.example.demo.domain.dou.Searchinfo;
+import com.example.demo.domain.dou.YveTotal;
 import com.example.demo.domain.vo.Page;
 import com.example.demo.domain.vo.Result;
 import com.example.demo.sevice.DouService;
@@ -32,8 +35,10 @@ public class DouController {
     @RequestMapping("/getYve")
     public Result getYve(@RequestBody Page page){
         if (ObjectUtils.isEmpty(page.getPageNum())) {
+            System.out.println(page.getYve()+"-----");
             return Result.success(douService.getYve(page.getYve()));
         } else {
+            System.out.println(page.getYve()+"++++");
             return Result.success(douService.searchForPage(page.getPageNum(), page.getPageSize(), page.getYve()));
         }
     }
diff --git a/src/main/java/com/example/demo/domain/dou/Yve.java b/src/main/java/com/example/demo/domain/dou/Yve.java
index 8d17395..0fb653e 100644
--- a/src/main/java/com/example/demo/domain/dou/Yve.java
+++ b/src/main/java/com/example/demo/domain/dou/Yve.java
@@ -21,4 +21,6 @@ public class Yve implements Serializable {
     private Integer jinbiBuy;
     private Integer jinbiCostTotal;
     private String token;
+    private String sortField;
+    private String sortOrder;
 }
diff --git a/src/main/resources/mapperLink/DouMapper.xml b/src/main/resources/mapperLink/DouMapper.xml
index 23bd93c..d200cb7 100644
--- a/src/main/resources/mapperLink/DouMapper.xml
+++ b/src/main/resources/mapperLink/DouMapper.xml
@@ -26,25 +26,31 @@
     </select>
     <select id="getYve" resultType="com.example.demo.domain.dou.Yve">
         SELECT
-            fm.nickname,
-            fm.jwcode,
-            fm.ip_address,
-            fy.jinbi_free,
-            fy.jinbi_buy,
-            fy.jinbi_cost_total,
-            fy.jinbi
+        fm.nickname,
+        fm.jwcode,
+        fm.ip_address,
+        fy.jinbi_free,
+        fy.jinbi_buy,
+        fy.jinbi_cost_total,
+        fy.jinbi
         FROM fx_member fm
-                 LEFT JOIN fx_yaoqing fy ON fm.id = fy.uid
-        WHERE  employee!=1
-       <where>
-           <if test="jwcode != null and jwcode.length>0">
-              and fm.jwcode = #{jwcode}
-           </if>
-           <if test="ipAddress != null and ipAddress.length>0">
-               and fm.ip_address = #{ipAddress}
-           </if>
-       </where>
+        LEFT JOIN fx_yaoqing fy ON fm.id = fy.uid
+        <where>
+            employee != 1
+            <if test="jwcode != null and jwcode.length > 0">
+                and fm.jwcode = #{jwcode}
+            </if>
+            <if test="ipAddress != null and ipAddress.length > 0">
+                and fm.ip_address = #{ipAddress}
+            </if>
+        </where>
+        <choose>
+            <when test="sortField != null and sortField.length > 0 or sortOrder != null and sortOrder.length > 0">
+                ORDER BY ${sortField} ${sortOrder}
+            </when>
+        </choose>
     </select>
+
     <select id="getYveTotal" resultType="com.example.demo.domain.dou.YveTotal">
         SELECT sum(jinbi_buy) as jinbiBuy,
                SUM(jinbi_free) as jinbiFree,