From df13f27e9cae2d7b112ef0dda85cba456ecef32b Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 26 二月 2025 16:45:09 +0800
Subject: [PATCH] 远场和近场的数据解析的单位和指标需要重新对应+报告生成放在复核结束里面

---
 user-server/src/main/resources/mapper/EnumMapper.xml |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/user-server/src/main/resources/mapper/EnumMapper.xml b/user-server/src/main/resources/mapper/EnumMapper.xml
index 9f3dee1..cca68ea 100644
--- a/user-server/src/main/resources/mapper/EnumMapper.xml
+++ b/user-server/src/main/resources/mapper/EnumMapper.xml
@@ -14,15 +14,9 @@
             <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
     </resultMap>
 
-    <sql id="Base_Column_List">
-        id,label,value,
-        create_user,create_time,update_user,
-        update_time
-    </sql>
-
     <select id="selectEnumPageList" resultType="com.yuanchu.mom.pojo.Enums">
         select * from (
-        select e.id,e.category,e.label,e.value, u2.name create_user_name,e.create_time, u3.name update_user_name, e.update_time
+        select e.id,e.category,e.label,e.value,e.order_num,e.type , u2.name create_user_name,e.create_time, u3.name update_user_name, e.update_time,e.create_user
         from enums e
         left join user u2 on u2.id = e.create_user
         left join user u3 on u3.id = e.update_user
@@ -31,4 +25,11 @@
             ${ew.customSqlSegment}
         </if>
     </select>
+   
+    <select id="selectEnumByCategory" resultType="com.yuanchu.mom.pojo.Enums">
+        select e.id,e.category,e.label,e.value,e.order_num,e.type
+        from enums e
+        where e.category=#{category}
+        order by e.order_num
+    </select>
 </mapper>

--
Gitblit v1.9.3