diff --git a/.gitignore b/.gitignore index b787626..5b872bc 100644 --- a/.gitignore +++ b/.gitignore @@ -107,3 +107,9 @@ HJGL_ZH/BLL/bin/Release/NPOI.OpenXmlFormats.dll /HJGL_ZH/Model /HJGL_ZH_2024.10.21.rar /HJGL_ZH/WebAPI/Areas/HelpPage/SampleGeneration +/HJGL_ZH/UpgradeLog2.htm +/HJGL_ZH/Model/bin/Release/Model.dll +/HJGL_ZH/Model/bin/Release/Model.pdb +/HJGL_ZH/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache +/HJGL_ZH/Model/obj/Debug/Model.csprojAssemblyReference.cache +/HJGL_ZH/WebAPI/WebAPI.csproj.user diff --git a/HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/PassFileOneQueStatistic.aspx.cs b/HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/PassFileOneQueStatistic.aspx.cs index cea3159..25171ce 100644 --- a/HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/PassFileOneQueStatistic.aspx.cs +++ b/HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/PassFileOneQueStatistic.aspx.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Data.SqlClient; using System.Data; using BLL; +using System.Linq; namespace FineUIPro.Web.HJGL.CheckManage { diff --git a/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/InspectionBatchItem.aspx.cs b/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/InspectionBatchItem.aspx.cs index 07be7cd..22b3b35 100644 --- a/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/InspectionBatchItem.aspx.cs +++ b/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/InspectionBatchItem.aspx.cs @@ -118,7 +118,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { string strSql = "select v.*,newid() as New_ID from (SELECT distinct * FROM HJGL_View_InspectionBatch WHERE 1=1"; List listStr = new List(); - if (this.drpProjectId.SelectedValue != null && this.drpProjectId.SelectedValue!="null") + if (this.drpProjectId.SelectedValue != null && this.drpProjectId.SelectedValue != "null") { strSql += " AND ProjectId = @ProjectId"; listStr.Add(new SqlParameter("@ProjectId", this.drpProjectId.SelectedValue)); @@ -155,7 +155,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { this.GetShowColumn(c.Columns); } - + } #endregion @@ -192,7 +192,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport // BindGrid(); //} //#endregion - + #region 分页 protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) { @@ -227,7 +227,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport #endregion #region 导出 - + /// 导出按钮 /// /// @@ -244,23 +244,19 @@ namespace FineUIPro.Web.HJGL.WeldingReport // n++; //} - Model.Sys_UserShowColumns c = BLL.Sys_UserShowColumnsService.GetColumnsByUserId(this.CurrUser.UserId, "3"); - List columns = new List(); - if (c != null) - { - string[] items = c.Columns.Split(','); - columns = new List(items); - } - else - { - for (int i=1; i <= Grid1.Columns.Count; i++) - { - columns.Add(i.ToString()); - } - } - if (!columns.Contains("0")) + Model.Sys_UserShowColumns c = BLL.Sys_UserShowColumnsService.GetColumnsByUserId(this.CurrUser.UserId, "3"); + List columns = new List(); + if (c != null) { - columns.Add("0"); + string[] items = ("0," + c.Columns).Split(','); + columns = new List(items); + } + else + { + for (int i = 1; i <= Grid1.Columns.Count; i++) + { + columns.Add(i.ToString()); + } } Response.ClearContent(); string filename = Funs.GetNewFileName(); @@ -295,9 +291,9 @@ namespace FineUIPro.Web.HJGL.WeldingReport { if (column.ColumnIndex == 0) { - sb.AppendFormat("{0}", column.HeaderText); + sb.AppendFormat("{0}", column.HeaderText); } - if (column.ColumnIndex == 1) + else if (column.ColumnIndex == 1) { sb.AppendFormat("{0}", column.HeaderText); } @@ -389,6 +385,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport } } sb.Append(""); + int a = 1; foreach (GridRow row in grid.Rows) { sb.Append(""); @@ -398,6 +395,10 @@ namespace FineUIPro.Web.HJGL.WeldingReport if (columnIndexs.Contains(columnIndex)) { string html = value.ToString(); + if (columnIndex == 0) + { + html = a.ToString(); + } if (html.StartsWith(Grid.TEMPLATE_PLACEHOLDER_PREFIX)) { // 模板列 @@ -430,6 +431,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport } columnIndex++; } + a++; sb.Append(""); } sb.Append(""); diff --git a/HJGL_ZH/Model/bin/Release/Model.dll b/HJGL_ZH/Model/bin/Release/Model.dll deleted file mode 100644 index fbf7897..0000000 Binary files a/HJGL_ZH/Model/bin/Release/Model.dll and /dev/null differ diff --git a/HJGL_ZH/Model/bin/Release/Model.pdb b/HJGL_ZH/Model/bin/Release/Model.pdb deleted file mode 100644 index 980ad8f..0000000 Binary files a/HJGL_ZH/Model/bin/Release/Model.pdb and /dev/null differ diff --git a/HJGL_ZH/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache b/HJGL_ZH/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache deleted file mode 100644 index 8e1bb6c..0000000 --- a/HJGL_ZH/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache +++ /dev/null @@ -1 +0,0 @@ -57339f4a363b9faca664a99231f321d7a604e379b8ea1faf26c3882a6bc59476 diff --git a/HJGL_ZH/Model/obj/Debug/Model.csprojAssemblyReference.cache b/HJGL_ZH/Model/obj/Debug/Model.csprojAssemblyReference.cache deleted file mode 100644 index 3588c06..0000000 Binary files a/HJGL_ZH/Model/obj/Debug/Model.csprojAssemblyReference.cache and /dev/null differ diff --git a/HJGL_ZH/WebAPI/WebAPI.csproj.user b/HJGL_ZH/WebAPI/WebAPI.csproj.user deleted file mode 100644 index ca0d73e..0000000 --- a/HJGL_ZH/WebAPI/WebAPI.csproj.user +++ /dev/null @@ -1,38 +0,0 @@ - - - - true - - - - - - - Debug|Any CPU - - - - - - - - CurrentPage - True - False - False - False - - - - - - - - - True - True - - - - - \ No newline at end of file