SVN r1103

SVN-Revision: r1103
This commit is contained in:
cyf
2026-01-30 07:38:00 +00:00
parent ddaf751b19
commit 5ccfe15fee
12 changed files with 258 additions and 154 deletions
+18 -14
View File
@@ -904,35 +904,38 @@ namespace Lskj.Business.Impl
public static DataTable GetCustomQueryFields(string formKey)
{
string field = string.Empty;
if (HasExistsColumn("p_systembillsourcecond", "FontSize"))
DataTable dataTable = GetTableColumns("p_systembillsourcecond");
if (dataTable.Columns.Contains("FontSize"))
{
field = ",FontSize";
}
if (HasExistsColumn("p_systembillsourcecond", "FontColor"))
if (dataTable.Columns.Contains("FontColor"))
{
field += ",FontColor";
}
if (HasExistsColumn("p_systembillsourcecond", "refreshSource"))
if (dataTable.Columns.Contains("refreshSource"))
{
field += ",refreshSource";
}
if (HasExistsColumn("p_systembillsourcecond", "clickAfterEmpty"))
if (dataTable.Columns.Contains("clickAfterEmpty"))
{
field += ",clickAfterEmpty";
}
if (HasExistsColumn("p_systembillsourcecond", "RefreshButton"))
if (dataTable.Columns.Contains("RefreshButton"))
{
field += ",RefreshButton";
}
if (HasExistsColumn("p_systembillsourcecond", "AddOrderByCond"))
if (dataTable.Columns.Contains("AddOrderByCond"))
{
field += ",AddOrderByCond";
}
if (HasExistsColumn("p_systembillsourcecond", "montage"))
if (dataTable.Columns.Contains("montage"))
{
field += ",montage";
}
if (HasExistsColumn("p_systembillsourcecond", "nullable"))
if (dataTable.Columns.Contains("nullable"))
{
field += ",nullable";
}
@@ -940,30 +943,31 @@ namespace Lskj.Business.Impl
{
field += ",0 nullable";
}
if (HasExistsColumn("p_systembillsourcecond", "LookUpFieldsWidth"))
if (dataTable.Columns.Contains("LookUpFieldsWidth"))
{
field += ",LookUpFieldsWidth";
}
if (HasExistsColumn("p_systembillsourcecond", "ScanAfterEmpty"))
if (dataTable.Columns.Contains("ScanAfterEmpty"))
{
field += ",ScanAfterEmpty";
}
if (HasExistsColumn("p_systembillsourcecond", "ImportReturnValue"))
if (dataTable.Columns.Contains("ImportReturnValue"))
{
field += ",ImportReturnValue";
}
if (HasExistsColumn("p_systembillsourcecond", "ImportCurrentValue"))
if (dataTable.Columns.Contains("ImportCurrentValue"))
{
field += ",ImportCurrentValue";
}
if (HasExistsColumn("p_systembillsourcecond", "UnionFields"))
if (dataTable.Columns.Contains("UnionFields"))
{
field += ",UnionFields";
}
if (HasExistsColumn("p_systembillsourcecond", "UnionValue"))
if (dataTable.Columns.Contains("UnionValue"))
{
field += ",UnionValue";
}
string sqlValue = string.Format(@"select id,controlLeft,controlTop,controlWidth,controlHeight,controlType as fieldTypeId,controlName as fieldName,controlLabel as userName,'' DataFormat,
defaultValue,sourceSql as lookupSql,keyField as lookupKeyField,resultField as lookupResult,edited,checkCond,InputHintText{0}
from p_systembillsourcecond