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
+68 -62
View File
@@ -389,58 +389,61 @@ namespace Lskj.Business.Impl
string otherfield = string.Empty;
string detailCond = string.Empty;
string sumCond = string.Empty;
if (HasExistsColumn("p_systembillDetail", "dataAlignment"))//检查数据库表是否包含某列
otherfield = "dataAlignment,fontName,";
if (HasExistsColumn("p_systembillDetail", "ifmerge"))
otherfield += "ifmerge,";
if (HasExistsColumn("p_systembillDetail", "bandTitle"))
otherfield += "bandTitle,";
if (HasExistsColumn("p_systembillDetail", "bandFields"))
otherfield += "bandFields,";
if (HasExistsColumn("p_systembillDetail", "sumText"))
detailCond += ",a.sumText";
if (HasExistsColumn("p_systembillDetail", "AutoPadDataReleColName"))
detailCond += ",a.AutoPadDataReleColName";
if (HasExistsColumn("p_systembillDetail", "sumCond"))
sumCond += ",a.sumCond";
if (HasExistsColumn("p_systembillDetail", "enableCond"))
sumCond += ",a.enableCond";
if (HasExistsColumn("p_systembillDetail", "disableCond"))
sumCond += ",a.disableCond";
if (HasExistsColumn("p_systembillDetail", "labelText"))
sumCond += ",a.labelText";
if (HasExistsColumn("p_systembillDetail", "canCopy"))
DataTable dataTable = GetTableColumns("p_systembillDetail");
//dataTable.Columns.Contains("bandTitle")
if (dataTable.Columns.Contains("dataAlignment"))//检查数据库表是否包含某列
otherfield = "dataAlignment,fontName,";
if (dataTable.Columns.Contains("ifmerge"))
otherfield += "ifmerge,";
if (dataTable.Columns.Contains("bandTitle"))
otherfield += "bandTitle,";
if (dataTable.Columns.Contains("bandFields"))
otherfield += "bandFields,";
if (dataTable.Columns.Contains("sumText"))
detailCond += ",a.sumText";
if (dataTable.Columns.Contains("AutoPadDataReleColName"))
detailCond += ",a.AutoPadDataReleColName";
if (dataTable.Columns.Contains("sumCond"))
sumCond += ",a.sumCond";
if (dataTable.Columns.Contains("enableCond"))
sumCond += ",a.enableCond";
if (dataTable.Columns.Contains("disableCond"))
sumCond += ",a.disableCond";
if (dataTable.Columns.Contains("labelText"))
sumCond += ",a.labelText";
if (dataTable.Columns.Contains("canCopy"))
sumCond += ",a.canCopy";
if (HasExistsColumn("p_systembillDetail", "addModuleId"))
if (dataTable.Columns.Contains("addModuleId"))
sumCond += ",a.addModuleId";
if (HasExistsColumn("p_systembillDetail", "UnionCompare"))
if (dataTable.Columns.Contains("UnionCompare"))
sumCond += ",a.UnionCompare";
if (HasExistsColumn("p_systembillDetail", "isExportColumns"))
if (dataTable.Columns.Contains("isExportColumns"))
sumCond += ",a.isExportColumns";
if (HasExistsColumn("p_systembillDetail", "Summation"))
if (dataTable.Columns.Contains("Summation"))
sumCond += ",a.Summation";
if (HasExistsColumn("p_systembillDetail", "IsRadio"))
if (dataTable.Columns.Contains("IsRadio"))
sumCond += ",a.IsRadio";
if (HasExistsColumn("p_systembillDetail", "SearchBoxAddition"))
if (dataTable.Columns.Contains("SearchBoxAddition"))
sumCond += ",a.SearchBoxAddition ";
if (HasExistsColumn("p_systembillDetail", "RepeatedVerification"))
if (dataTable.Columns.Contains("RepeatedVerification"))
sumCond += ",a.RepeatedVerification ";
if (HasExistsColumn("p_systembillDetail", "LookUpWidth"))
if (dataTable.Columns.Contains("LookUpWidth"))
sumCond += ",a.LookUpWidth ";
if (HasExistsColumn("p_systembillDetail", "LookUpFieldsWidth"))
if (dataTable.Columns.Contains("LookUpFieldsWidth"))
sumCond += ",a.LookUpFieldsWidth ";
if (HasExistsColumn("p_systembillDetail", "PrivilegeView"))
if (dataTable.Columns.Contains("PrivilegeView"))
sumCond += ",a.PrivilegeView ";
if (HasExistsColumn("p_systembillDetail", "PrivilegeOper"))
if (dataTable.Columns.Contains("PrivilegeOper"))
sumCond += ",a.PrivilegeOper ";
if (HasExistsColumn("p_systembillDetail", "ProhibitPaste"))
if (dataTable.Columns.Contains("ProhibitPaste"))
sumCond += ",a.ProhibitPaste ";
if (HasExistsColumn("p_systembillDetail", "FormatEditBox"))
if (dataTable.Columns.Contains("FormatEditBox"))
sumCond += ",a.FormatEditBox ";
if (HasExistsColumn("p_systembillDetail", "PromptText"))
if (dataTable.Columns.Contains("PromptText"))
sumCond += ",a.PromptText ";
if (HasExistsColumn("p_systembillDetail", "SplicingConditions"))
if (dataTable.Columns.Contains("SplicingConditions"))
sumCond += ",a.SplicingConditions ";
string columsSql = string.Format(@"SELECT DISTINCT
@@ -480,58 +483,61 @@ namespace Lskj.Business.Impl
string otherfield = string.Empty;
string detailCond = string.Empty;
string sumCond = string.Empty;
if (HasExistsColumn("p_systembillDetail", "dataAlignment"))//检查数据库表是否包含某列
DataTable dataTable = GetTableColumns("p_systembillDetail");
if (dataTable.Columns.Contains("dataAlignment"))//检查数据库表是否包含某列
otherfield = "dataAlignment,fontName,";
if (HasExistsColumn("p_systembillDetail", "ifmerge"))
if (dataTable.Columns.Contains("ifmerge"))
otherfield += "ifmerge,";
if (HasExistsColumn("p_systembillDetail", "bandTitle"))
if (dataTable.Columns.Contains("bandTitle"))
otherfield += "bandTitle,";
if (HasExistsColumn("p_systembillDetail", "bandFields"))
if (dataTable.Columns.Contains("bandFields"))
otherfield += "bandFields,";
if (HasExistsColumn("p_systembillDetail", "sumText"))
if (dataTable.Columns.Contains("sumText"))
detailCond += ",a.sumText";
if (HasExistsColumn("p_systembillDetail", "AutoPadDataReleColName"))
if (dataTable.Columns.Contains("AutoPadDataReleColName"))
detailCond += ",a.AutoPadDataReleColName";
if (HasExistsColumn("p_systembillDetail", "sumCond"))
if (dataTable.Columns.Contains("sumCond"))
sumCond += ",a.sumCond";
if (HasExistsColumn("p_systembillDetail", "enableCond"))
if (dataTable.Columns.Contains("enableCond"))
sumCond += ",a.enableCond";
if (HasExistsColumn("p_systembillDetail", "labelText"))
if (dataTable.Columns.Contains("labelText"))
sumCond += ",a.labelText";
if (HasExistsColumn("p_systembillDetail", "disableCond"))
if (dataTable.Columns.Contains("disableCond"))
sumCond += ",a.disableCond";
if (HasExistsColumn("p_systembillDetail", "canCopy"))
if (dataTable.Columns.Contains("canCopy"))
sumCond += ",a.canCopy";
if (HasExistsColumn("p_systembillDetail", "addModuleId"))
if (dataTable.Columns.Contains("addModuleId"))
sumCond += ",a.addModuleId";
if (HasExistsColumn("p_systembillDetail", "UnionCompare"))
if (dataTable.Columns.Contains("UnionCompare"))
sumCond += ",a.UnionCompare";
if (HasExistsColumn("p_systembillDetail", "isExportColumns"))
if (dataTable.Columns.Contains("isExportColumns"))
sumCond += ",a.isExportColumns";
if (HasExistsColumn("p_systembillDetail", "Summation"))
if (dataTable.Columns.Contains("Summation"))
sumCond += ",a.Summation";
if (HasExistsColumn("p_systembillDetail", "IsRadio"))
if (dataTable.Columns.Contains("IsRadio"))
sumCond += ",a.IsRadio";
if (HasExistsColumn("p_systembillDetail", "SearchBoxAddition"))
if (dataTable.Columns.Contains("SearchBoxAddition"))
sumCond += ",a.SearchBoxAddition ";
if (HasExistsColumn("p_systembillDetail", "RepeatedVerification"))
if (dataTable.Columns.Contains("RepeatedVerification"))
sumCond += ",a.RepeatedVerification ";
if (HasExistsColumn("p_systembillDetail", "LookUpWidth"))
if (dataTable.Columns.Contains("LookUpWidth"))
sumCond += ",a.LookUpWidth ";
if (HasExistsColumn("p_systembillDetail", "LookUpFieldsWidth"))
if (dataTable.Columns.Contains("LookUpFieldsWidth"))
sumCond += ",a.LookUpFieldsWidth ";
if (HasExistsColumn("p_systembillDetail", "PrivilegeView"))
if (dataTable.Columns.Contains("PrivilegeView"))
sumCond += ",a.PrivilegeView ";
if (HasExistsColumn("p_systembillDetail", "PrivilegeOper"))
if (dataTable.Columns.Contains("PrivilegeOper"))
sumCond += ",a.PrivilegeOper ";
if (HasExistsColumn("p_systembillDetail", "ProhibitPaste"))
if (dataTable.Columns.Contains("ProhibitPaste"))
sumCond += ",a.ProhibitPaste ";
if (HasExistsColumn("p_systembillDetail", "FormatEditBox"))
if (dataTable.Columns.Contains("FormatEditBox"))
sumCond += ",a.FormatEditBox ";
if (HasExistsColumn("p_systembillDetail", "PromptText"))
if (dataTable.Columns.Contains("PromptText"))
sumCond += ",a.PromptText ";
if (HasExistsColumn("p_systembillDetail", "SplicingConditions"))
if (dataTable.Columns.Contains("SplicingConditions"))
sumCond += ",a.SplicingConditions ";
string columsSql = string.Format(@"SELECT DISTINCT