:feat:增加排序字段

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/service/impl/GameServerServiceImpl.java

@@ -511,8 +511,12 @@ public class GameServerServiceImpl implements IGameServerService {
     @Override
     public Page<GSGameServerDayVO> getGSGameServerDataDay(GSGameServerDayDTO dto) {
         Criteria cri = getGameServerDayCriteria(dto);
+        Criteria orderCri = Cnd.cri();
+        if (StringUtils.isNotBlank(dto.getSortType())) {
+            cri.getOrderBy().orderBy("a.dt", dto.getSortType());
+        }
         Pager pager = dao.createPager(dto.getPageNum(), dto.getPageSize());
-        Sql sql = Sqls.create(getGSGameServerDateSql(cri));
+        Sql sql = Sqls.create(getGSGameServerDateSql(cri, orderCri));
         sql.setCallback(Sqls.callback.entities());
         sql.setEntity(dao.getEntity(GSGameServerDayVO.class));
         sql.setPager(pager);
@@ -762,9 +766,6 @@ public class GameServerServiceImpl implements IGameServerService {
     private Criteria getGameServerDayCriteria(GSGameServerDayDTO dto) {
         //创建查询条件
         Criteria cri = Cnd.cri();
-        if(StringUtils.isNotBlank(dto.getSortType())){
-            cri.getOrderBy().orderBy("a.dt", dto.getSortType());
-        }
         if (StringUtils.isNotEmpty(dto.getSourceSystem())) {
             cri.where().andEquals("a.source_system", dto.getSourceSystem());
         }
@@ -783,7 +784,7 @@ public class GameServerServiceImpl implements IGameServerService {
         return cri;
     }
 
-    private String getGSGameServerDateSql(Criteria cri) {
+    private String getGSGameServerDateSql(Criteria cri, Criteria orderCri) {
         return """
                 select
                     """ + getRemainDaySql() + """
@@ -803,7 +804,7 @@ public class GameServerServiceImpl implements IGameServerService {
                 left join game_dw_parent.dw_game_server_day_parent c  on a.source_system =c.source_system  and a.server_id =c.server_id and a.parent_game_id=c.parent_game_id and a.dt = c.dt
                 left join game_dw_parent.dw_game_server_active_order_day_parent d on a.source_system = d.source_system  and a.server_id =d.server_id and a.parent_game_id=d.parent_game_id and a.dt = d.dt
                 """ + cri + """
-                order by a.dt desc
+                """ + orderCri + """
                 """;
     }