From 9584cf19e124b2599c480ed90fac017abf629dd5 Mon Sep 17 00:00:00 2001
From: syruan <15555146157@163.com>
Date: Sun, 4 Jan 2026 14:10:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mappers/bases/StatisticsMapper.xml    | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/main/resources/mappers/bases/StatisticsMapper.xml b/src/main/resources/mappers/bases/StatisticsMapper.xml
index 864a2b2..5c01029 100644
--- a/src/main/resources/mappers/bases/StatisticsMapper.xml
+++ b/src/main/resources/mappers/bases/StatisticsMapper.xml
@@ -19,6 +19,7 @@
 		FROM pa_type
 		where pa_type.`level`=3 AND is_active=1 and  (num=0 or num is null)
 	</select>
+
 	<select id="findByPage" resultType="com.bonus.gzgqj.business.bases.entity.PaTypeVo">
 		select   pt.id, pt.parent_id parentId,pt.name model ,pt.num,
 		IFNULL(pt.price,0) as price,pt.unit ,pt.weight,pt.is_consumables ,
@@ -42,17 +43,9 @@
 		<if test='isWarn=="2"'>
 			and	pt.num>0
 		</if>
-		ORDER BY
-		CASE
-		WHEN pt.name REGEXP '^[0-9]+$' THEN 1
-		ELSE 0
-		END,
-		CASE
-		WHEN pt.name REGEXP '^[0-9]+$' THEN CAST(pt.name AS UNSIGNED)
-		ELSE NULL
-		END,
-		pt.name ASC
+		ORDER BY pt2.name, pt1.name, pt.name
 	</select>
+
 	<!--工程统计领料单查询-->
 	<select id="getProListPage" resultType="com.bonus.gzgqj.business.bases.entity.ProjectInfoVo">
 		SELECT pro.id proId,pro.name  proName,tpa.lyNum lyNum,tpa.lydNum,mm.money lyMoney