From 889842eb8b64a0b72c449ce23ff21e4e8c935cae Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 26 七月 2024 16:06:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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 f3a72a9..841f993 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
@@ -1,5 +1,7 @@
package com.vci.web.service;
+import com.vci.corba.common.PLException;
+import com.vci.corba.omd.data.BusinessObject;
import com.vci.starter.web.pagemodel.BaseQueryObject;
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.pagemodel.PageHelper;
@@ -62,13 +64,13 @@
}
}
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 (":"")
+ baseSql+ pageSql ;
WebBoServiceI boService = ApplicationContextProvider.getApplicationContext().getBean(WebBoServiceI.class);
- List<com.vci.client.bof.ClientBusinessObject> dataMap = boService.queryBySql(sql, null);
+ List<BusinessObject> dataMap = boService.queryBySql(sql, null);
DataGrid<T> dataGrid = new DataGrid<>();
if(!CollectionUtils.isEmpty(dataMap)){
List<T> dataList = new ArrayList<>();
@@ -98,7 +100,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;
@@ -141,6 +143,5 @@
}
return dataGrid;
}
-
}
--
Gitblit v1.9.3