From 90c86c95de1d20a3c3a44cab3482388a8c221a5e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 05 十二月 2024 10:32:59 +0800
Subject: [PATCH] UI数据查询调整
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsBaseServiceI.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsBaseServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsBaseServiceI.java
index 491fee7..e89b4a6 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsBaseServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsBaseServiceI.java
@@ -63,7 +63,7 @@
}
}
String baseSql = "select oid,to_char(ts,'yyyy-mm-dd hh24:mi:ss') as ts,creator,to_char(createTime,'yyyy-mm-dd hh24:mi:ss') as createTime,modifier,to_char(modifyTime,'yyyy-mm-dd hh24:mi:ss') as modifyTime,name,label," +
- ("plenum".equalsIgnoreCase(tableName)?" '' as " :"") + "description from " + tableName
+ ("plenumtype".equalsIgnoreCase(tableName)?" '' as " :"") + "description from " + tableName
+ (StringUtils.isNotBlank(whereSql)?(" where " + whereSql):"");
baseSql += " order by lower(name) asc ";
String sql = (StringUtils.isNotBlank(pageSql)?" select oid,ts,creator,createTime,modifier,modifyTime,name,label,description from (select A.* , rownum RN from (":"")
@@ -99,7 +99,7 @@
dataList.add(obj);
});
dataGrid.setData(dataList);
- List<Map> maps = boService.queryBySqlForMap("select count(oid) as total from plbtmtype " + (StringUtils.isNotBlank(whereSql)?(" where " + whereSql):""), null);
+ List<Map> maps = boService.queryBySqlForMap("select count(*) as total from "+ tableName + (StringUtils.isNotBlank(whereSql)?(" where " + whereSql):""), null);
dataGrid.setTotal(VciBaseUtil.getInt(maps.get(0).get("total").toString()));
}
return dataGrid;
@@ -122,7 +122,9 @@
pageHelper = new PageHelper(-1);
}
//鏈夐渶瑕佽浆鎹㈢殑灞炴��
- pageHelper.addDefaultAsc("name");
+ if(StringUtils.isBlank(pageHelper.getSort()) && StringUtils.isBlank(pageHelper.getOrder())) {//濡傛灉娌℃湁璁剧疆鎺掑簭瀛楁锛屽垯榛樿涓�涓�
+ pageHelper.addDefaultAsc("name");
+ }
VciQueryWrapperForDO queryWrapperForDO = new VciQueryWrapperForDO(baseQueryObject.getConditionMap(), tClass,pageHelper);
queryWrapperForDO.setConditionMap(queryWrapperForDO.switchConditionMap());
queryWrapperForDO.wrapperSql();
@@ -142,6 +144,5 @@
}
return dataGrid;
}
-
}
--
Gitblit v1.9.3