SVN r1103
SVN-Revision: r1103
This commit is contained in:
@@ -854,47 +854,49 @@ namespace Lskj.Business.Impl
|
||||
if (string.IsNullOrEmpty(whereCond))
|
||||
whereCond = " and orderid > 0 ";
|
||||
|
||||
if (BaseImpl.HasExistsColumn("p_systembillauditAttach", "rightVisible"))
|
||||
DataTable dataTable = GetTableColumns("p_systembillauditAttach");
|
||||
|
||||
if (dataTable.Columns.Contains("rightVisible"))
|
||||
{
|
||||
columnStr = ",rightVisible";
|
||||
}
|
||||
if (BaseImpl.HasExistsColumn("p_systembillauditAttach", "DetailIsSave"))
|
||||
if (dataTable.Columns.Contains("DetailIsSave"))
|
||||
{
|
||||
DetailIsSave = ",DetailIsSave";
|
||||
}
|
||||
if (BaseImpl.HasExistsColumn("p_systembillauditAttach", "unionmodule") && BaseImpl.HasExistsColumn("p_systembillauditAttach", "unionValue") && BaseImpl.HasExistsColumn("p_systembillauditAttach", "unionParentField") && BaseImpl.HasExistsColumn("p_systembillauditAttach", "unionCond"))
|
||||
if (dataTable.Columns.Contains("unionmodule") && dataTable.Columns.Contains("unionValue") && dataTable.Columns.Contains("unionParentField") && dataTable.Columns.Contains("unionCond"))
|
||||
{
|
||||
unionCond = ",unionmodule unionModule,unionValue,unionParentField,unionCond";
|
||||
}
|
||||
if (BaseImpl.HasExistsColumn("p_systembillauditAttach", "privilegeoper"))
|
||||
if (dataTable.Columns.Contains("privilegeoper"))
|
||||
{
|
||||
fields += ",privilegeoper";
|
||||
}
|
||||
if (BaseImpl.HasExistsColumn("p_systembillauditAttach", "enablecond"))
|
||||
if (dataTable.Columns.Contains("enablecond"))
|
||||
{
|
||||
fields += " ,enablecond";
|
||||
}
|
||||
if (BaseImpl.HasExistsColumn("p_systembillauditAttach", "DBClickEvent"))
|
||||
if (dataTable.Columns.Contains("DBClickEvent"))
|
||||
{
|
||||
fields += " ,DBClickEvent";
|
||||
}
|
||||
if (BaseImpl.HasExistsColumn("p_systembillauditAttach", "LoadFilter"))
|
||||
if (dataTable.Columns.Contains("LoadFilter"))
|
||||
{
|
||||
fields += " ,LoadFilter";
|
||||
}
|
||||
if (BaseImpl.HasExistsColumn("p_systembillauditAttach", "IsUnioDetail"))
|
||||
if (dataTable.Columns.Contains("IsUnioDetail"))
|
||||
{
|
||||
fields += " ,IsUnioDetail";
|
||||
}
|
||||
if (BaseImpl.HasExistsColumn("p_systembillauditAttach", "gridDetailCheck"))
|
||||
if (dataTable.Columns.Contains("gridDetailCheck"))
|
||||
{
|
||||
fields += " ,gridDetailCheck";
|
||||
}
|
||||
if (BaseImpl.HasExistsColumn("p_systembillauditAttach", "DetailSearch"))
|
||||
if (dataTable.Columns.Contains("DetailSearch"))
|
||||
{
|
||||
fields += " ,DetailSearch";
|
||||
}
|
||||
if (BaseImpl.HasExistsColumn("p_systembillauditAttach", "DragExecuteSql"))
|
||||
if (dataTable.Columns.Contains("DragExecuteSql"))
|
||||
{
|
||||
fields += " ,DragExecuteSql";
|
||||
}
|
||||
@@ -969,6 +971,29 @@ namespace Lskj.Business.Impl
|
||||
//string sqlValue = string.Format("select case when stepcode=0 then stepName else REPLACE(REPLACE(REPLACE(operDirection,'R','退'),'F','审'),'Q','关闭') end as sh,* from {0} where flowSourceKey=@flowSourceKey {1} order by id asc", tableName, fields);
|
||||
string sqlValue = string.Format("select case when stepcode=0 then stepName else REPLACE(REPLACE(REPLACE(REPLACE(operDirection,'R','退'),'F','审'),'Q','关闭'),'J','转交') end as sh,* from {0} where flowSourceKey=@flowSourceKey {1} order by id asc", tableName, fields);
|
||||
|
||||
if (Business.Impl.LanguageTranslation.Translatable)
|
||||
{
|
||||
string retreat = Business.Impl.LanguageTranslation.GetTranslatedText("退");
|
||||
string review = Business.Impl.LanguageTranslation.GetTranslatedText("审");
|
||||
string close = Business.Impl.LanguageTranslation.GetTranslatedText("关闭");
|
||||
string forward = Business.Impl.LanguageTranslation.GetTranslatedText("转交");
|
||||
string first = Business.Impl.LanguageTranslation.GetTranslatedText("首次提交");
|
||||
sqlValue = string.Format(@"SELECT
|
||||
REPLACE(
|
||||
CASE
|
||||
WHEN stepcode=0 THEN stepName
|
||||
ELSE REPLACE(REPLACE(REPLACE(REPLACE(operDirection,'R','{2}'),'F','{3}'),'Q','{4}'),'J','{5}')
|
||||
END,
|
||||
'首次提交',
|
||||
'{6}'
|
||||
) AS sh,
|
||||
*
|
||||
from {0} where flowSourceKey=@flowSourceKey {1} order by id asc", tableName, fields, retreat, review, close, forward, first);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
return SqlHelper.ExecuteDataTable(sqlValue, new SqlParameter[] { new SqlParameter("@flowSourceKey", paramaryValue), new SqlParameter("@flowSource", modeCode) });
|
||||
}
|
||||
/// <summary>
|
||||
|
||||
Reference in New Issue
Block a user