QueryService entfernt

This commit is contained in:
Christian
2017-08-23 17:11:53 +02:00
parent 680b08d003
commit 36d19d213e
41 changed files with 1427 additions and 2275 deletions

View File

@@ -13,7 +13,7 @@ using BeWo.Service.ServiceContracts;
using BS.Shared;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using Newtonsoft.Json;
using Utils = BeWo.Service.Core.Utils;
namespace BeWo.Service.ServiceImplementations
@@ -21,10 +21,11 @@ namespace BeWo.Service.ServiceImplementations
[ServiceBehavior(InstanceContextMode = InstanceContextMode.PerCall, ConcurrencyMode = ConcurrencyMode.Single)]
public class QueryServiceImp : IQueryService
{
public DataTable ExecuteQuery(long pQueryOid, List<QueryParamDC> parameter)
public string ExecuteQuery(long pQueryOid, List<QueryParamDC> parameter)
{
try
{
DataTable table = null;
Query lQuery = DAOFactory.GenericDAO.LoadByID<Query>(pQueryOid);
string sql = lQuery.Sql;
@@ -35,9 +36,14 @@ namespace BeWo.Service.ServiceImplementations
sql = this.ReplaceQueryParameter(sql, parameter);
}
return DAOFactory.AdoDAO.ExecuteQuery(sql).Tables[0];
table = DAOFactory.AdoDAO.ExecuteQuery(sql).Tables[0];
}
return new DataTable("emptytable");
if (table == null)
{
table = new DataTable("emptytable");
}
var temp = BS.Shared.Core.Utils.XMLSerializeToString(table);
return temp;
}
catch (Exception e)
{
@@ -85,7 +91,7 @@ namespace BeWo.Service.ServiceImplementations
}
}
public string PrepareQueryReport(DataTable dataTable, string id)
public string PrepareQueryReport(string dataTableJsonString, string id)
{
try
{
@@ -94,7 +100,11 @@ namespace BeWo.Service.ServiceImplementations
var lDir = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, MultitenancyOperationContextExt.Current.Tenant + @"\temp");
var lPath = Path.Combine(lDir, lResult);
BS.Shared.Core.Utils.XMLSerialize(lPath, dataTable);
var table = BS.Shared.Core.Utils.XMLDeserializeFromString<DataTable>(dataTableJsonString);
BS.Shared.Core.Utils.XMLSerialize(lPath, table);
return lResult;
}