From 92776fde1cc36b37ee59228bce6e45a04cbae519 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Fri, 4 Jul 2025 15:44:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/BlHousingestateInfoMapper.xml  | 151 +++++++++++-------
 .../jeecg/modules/zh/view/hy/entity/Hy.java   |   4 +-
 2 files changed, 92 insertions(+), 63 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/housingestateInfo/mapper/xml/BlHousingestateInfoMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/housingestateInfo/mapper/xml/BlHousingestateInfoMapper.xml
index ef97f5e..3526cf0 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/housingestateInfo/mapper/xml/BlHousingestateInfoMapper.xml
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/housingestateInfo/mapper/xml/BlHousingestateInfoMapper.xml
@@ -21,84 +21,113 @@
 
     <select id="queryXqHyTdzlList" parameterType="org.jeecg.modules.zh.view.hy.entity.Hy" resultType="org.jeecg.modules.zh.view.hy.entity.Hy">
         select
-        a.housingestate_id as housingestateId,
-        b.name as housingestateName,
-        round(sum(a.weight),2) as weight
-        from bl_order_info a
-        inner join bl_housingestate_info b on a.housingestate_id = b.housingestate_id
-        and a.add_time  >= #{hy.beginTime}
-        and a.add_time  &lt;= #{hy.endTime}
-        group by a.housingestate_id,b.name
-        ORDER BY weight desc
+            @row_num := @row_num + 1 AS rowNumber,
+            t.*
+        from (SELECT @row_num := 0) r,
+            (
+            select
+                a.housingestate_id as housingestateId,
+                b.name as housingestateName,
+                round(sum(a.weight),2) as weight
+            from bl_order_info a
+            inner join bl_housingestate_info b on a.housingestate_id = b.housingestate_id
+            and a.add_time  >= #{hy.beginTime}
+            and a.add_time  &lt;= #{hy.endTime}
+            group by a.housingestate_id,b.name
+        ) t
+        ORDER BY t.weight desc
     </select>
 
     <select id="queryXqHyXzList" parameterType="org.jeecg.modules.zh.view.hy.entity.Hy" resultType="org.jeecg.modules.zh.view.hy.entity.Hy">
         select
-        a.housingestate_id as housingestateId,
-        b.name as housingestateName,
-        count(a.phone) as cn
-        from bl_user_info a
-        inner join bl_housingestate_info b on a.housingestate_id = b.housingestate_id
-        where a.register_date >= #{hy.beginTime}
-        and a.register_date &lt;= #{hy.endTime}
-        group by a.housingestate_id,b.name
-        ORDER BY cn desc
+            @row_num := @row_num + 1 AS rowNumber,
+            t.*
+        from (SELECT @row_num := 0) r,
+        (
+            select
+                a.housingestate_id as housingestateId,
+                b.name as housingestateName,
+                count(a.phone) as cn
+            from bl_user_info a
+            inner join bl_housingestate_info b on a.housingestate_id = b.housingestate_id
+            where a.register_date >= #{hy.beginTime}
+            and a.register_date &lt;= #{hy.endTime}
+            group by a.housingestate_id,b.name
+        ) t
+        ORDER BY t.cn desc
     </select>
 
     <select id="queryXqHyTdcsList" parameterType="org.jeecg.modules.zh.view.hy.entity.Hy" resultType="org.jeecg.modules.zh.view.hy.entity.Hy">
         select
-            a.housingestate_id as housingestateId,
-            b.name as housingestateName,
-            count(a.id) as cn
-        from bl_order_info a
-        inner join bl_housingestate_info b on a.housingestate_id = b.housingestate_id
-        where a.add_time  >= #{hy.beginTime}
-        and a.add_time  &lt;= #{hy.endTime}
-        group by a.housingestate_id,b.name
-        order by cn desc
+            @row_num := @row_num + 1 AS rowNumber,
+            t.*
+        from (SELECT @row_num := 0) r,
+        (
+            select
+                a.housingestate_id as housingestateId,
+                b.name as housingestateName,
+                count(a.id) as cn
+            from bl_order_info a
+            inner join bl_housingestate_info b on a.housingestate_id = b.housingestate_id
+            where a.add_time  >= #{hy.beginTime}
+            and a.add_time  &lt;= #{hy.endTime}
+            group by a.housingestate_id,b.name
+        ) t
+        ORDER BY t.cn desc
     </select>
 
 
     <select id="queryXzhyDetailList" parameterType="org.jeecg.modules.zh.view.hy.entity.Hy" resultType="org.jeecg.modules.zh.view.hy.entity.Hy">
         select
-        a.phone,a.register_date,a.deliveries,a.violations,a.delivered_at,a.status,b.name as housingestateName,c.content
-        from bl_user_info a
-        inner join bl_housingestate_info b on a.housingestate_id = b.housingestate_id
-        left join bl_device_info c on a.imei = c.imei
-        <where>
-            <if test="hy.housingestateId != null and hy.housingestateId !=''">
-                and a.housingestate_id = #{hy.housingestateId}
-            </if>
-            <if test="hy.beginTime != null and hy.beginTime !=''">
-                and a.register_date  >= #{hy.beginTime}
-            </if>
-            <if test="hy.endTime != null and hy.endTime !=''">
-                and a.register_date  &lt;= #{hy.endTime}
-            </if>
-        </where>
-        
+            @row_num := @row_num + 1 AS rowNumber,
+            t.*
+        from (SELECT @row_num := 0) r,
+        (
+            select
+            a.phone,a.register_date,a.deliveries,a.violations,a.delivered_at,a.status,b.name as housingestateName,c.content,a.imei
+            from bl_user_info a
+            inner join bl_housingestate_info b on a.housingestate_id = b.housingestate_id
+            left join bl_device_info c on a.imei = c.imei
+            <where>
+                <if test="hy.housingestateId != null and hy.housingestateId !=''">
+                    and a.housingestate_id = #{hy.housingestateId}
+                </if>
+                <if test="hy.beginTime != null and hy.beginTime !=''">
+                    and a.register_date  >= #{hy.beginTime}
+                </if>
+                <if test="hy.endTime != null and hy.endTime !=''">
+                    and a.register_date  &lt;= #{hy.endTime}
+                </if>
+            </where>
+        ) t
+        ORDER BY t.imei desc
     </select>
 
     <select id="queryTdcsDetailList" parameterType="org.jeecg.modules.zh.view.hy.entity.Hy" resultType="org.jeecg.modules.zh.view.hy.entity.Hy">
         select
-        a.phone,a.add_time,a.weight,a.invalid,b.name as housingestateName,d.content,a.cause
-        from bl_order_info a
-        inner join bl_housingestate_info b on a.housingestate_id = b.housingestate_id
-        inner join bl_user_info c on a.phone = c.phone
-        inner join bl_device_info d on a.imei = d.imei
-        <where>
-            <if test="hy.housingestateId != null and hy.housingestateId !=''">
-                and a.housingestate_id = #{hy.housingestateId}
-            </if>
-            <if test="hy.beginTime != null and hy.beginTime !=''">
-                and a.add_time  >= #{hy.beginTime}
-            </if>
-            <if test="hy.endTime != null and hy.endTime !=''">
-                and a.add_time  &lt;= #{hy.endTime}
-            </if>
-        </where>
-        order by a.add_time desc
-
+            @row_num := @row_num + 1 AS rowNumber,
+            t.*
+        from (SELECT @row_num := 0) r,
+        (
+            select
+            a.phone,a.add_time,a.weight,a.invalid,b.name as housingestateName,d.content,a.cause
+            from bl_order_info a
+            inner join bl_housingestate_info b on a.housingestate_id = b.housingestate_id
+            inner join bl_user_info c on a.phone = c.phone
+            inner join bl_device_info d on a.imei = d.imei
+            <where>
+                <if test="hy.housingestateId != null and hy.housingestateId !=''">
+                    and a.housingestate_id = #{hy.housingestateId}
+                </if>
+                <if test="hy.beginTime != null and hy.beginTime !=''">
+                    and a.add_time  >= #{hy.beginTime}
+                </if>
+                <if test="hy.endTime != null and hy.endTime !=''">
+                    and a.add_time  &lt;= #{hy.endTime}
+                </if>
+            </where>
+        ) t
+        ORDER BY t.add_time desc
     </select>
 
 </mapper>
\ No newline at end of file
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/entity/Hy.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/entity/Hy.java
index aa84fe2..dc13b77 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/entity/Hy.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/zh/view/hy/entity/Hy.java
@@ -1,5 +1,6 @@
 package org.jeecg.modules.zh.view.hy.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -38,8 +39,7 @@ public class Hy implements Serializable {
     private String deliveredAt;//最后投递时间
     private String status;//用户状态：0:拉黑 1:正常
     private String cause;//原因
-
-
+    private Integer rowNumber;
 
 }