添加窗口大厅站点选项

base-manager/src/main/resources/sqlmap/module/app/AppDatasetMapperExt.xml

@@ -57,7 +57,42 @@
                 </if>-->
             </trim>
         </trim>
-        <include refid="_orderCols_"/>
+        <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
+            order by
+
+            CASE
+            WHEN fieldType = 'date' THEN  STR_TO_DATE(fieldValue, '%Y-%m-%d')
+            ELSE NULL
+            END
+
+            <trim prefix="," suffixOverrides=","  suffix="">
+                <if test="orderCol.containsKey('id')">
+                    a.id
+                    <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('appId')">
+                    a.appId
+                    <if test='orderCol.appId != null and "DESC".equalsIgnoreCase(orderCol.appId)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('createTime')">
+                    a.createTime
+                    <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('updateUserId')">
+                    a.updateUserId
+                    <if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('updateTime')">
+                    a.updateTime
+                    <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
+                    ,
+                </if>
+            </trim>
+        </if>
     </select>
 
     <!-- 条件映射 -->

base-manager/src/test/java/com/mortals/httpclient/app/AppDatasetController.http

@@ -20,13 +20,6 @@ Content-Type: application/json
 {
   "siteId": 1,
   "appId": 79,
-  "orConditionList": [ {
-    "fieldCode":"year",
-    "fieldValue":"2022"
-  },{
-    "fieldCode":"yOrm",
-    "fieldValue":"0"
-  }],
   "page": 1,
   "size": 10
 }