From 7412e411a711958687f4fb50042c847a47b1cc2c Mon Sep 17 00:00:00 2001 From: yhw0507 Date: Tue, 20 Sep 2022 11:47:25 +0800 Subject: [PATCH 1/3] =?UTF-8?q?20220919=E7=89=88=E6=9C=AC=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=95=B4=E7=90=86=EF=BC=8C=E9=83=A8=E9=97=A8=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E5=88=97=E8=A1=A8=E5=8F=8A=E5=AF=BC=E5=87=BA=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...V2022-09-16 lpf.sql => SGGLDB_V2022-09-16.sql} | 0 ...V2022-09-18 lpf.sql => SGGLDB_V2022-09-18.sql} | 0 .../版本日志/SGGLDB_V2022-09-19修改明细.txt | 9 + .../{ => 已更新脚本}/SGGLDB_V2022-09-08.sql | 0 .../SGGLDB_V2022-09-08修改明细.txt | 0 .../{ => 已更新脚本}/SGGLDB_V2022-09-12.sql | 0 .../SGGLDB_V2022-09-12修改明细.txt | 0 .../{ => 已更新脚本}/SGGLDB_V2022-09-13.sql | 0 .../SGGLDB_V2022-09-13修改明细.txt | 0 .../{ => 已更新脚本}/SGGLDB_V2022-09-14.sql | 0 .../SGGLDB_V2022-09-14修改明细.txt | 0 .../{ => 已更新脚本}/SGGLDB_V2022-09-15.sql | 0 .../SGGLDB_V2022-09-15修改明细.txt | 0 SGGL/BLL/BLL.csproj | 16 +- SGGL/BLL/BaseInfo/PositionService.cs | 11 + SGGL/BLL/Person/Person_PersonsService.cs | 14 +- SGGL/FineUIPro.Web/ErrLog.txt | 23 + SGGL/FineUIPro.Web/Person/CompanyPerson.aspx | 32 +- .../Person/CompanyPerson.aspx.designer.cs | 9 + SGGL/FineUIPro.Web/Person/DepartPerson.aspx | 94 +- .../FineUIPro.Web/Person/DepartPerson.aspx.cs | 20 + .../Person/DepartPerson.aspx.designer.cs | 31 +- SGGL/FineUIPro.Web/Person/PersonLib.aspx.cs | 18 +- SGGL/FineUIPro.Web/common/PageBase.cs | 82 +- SGGL/Model/Model.cs | 1350 ++--------------- 25 files changed, 361 insertions(+), 1348 deletions(-) rename DataBase/版本日志/{SGGLDB_V2022-09-16 lpf.sql => SGGLDB_V2022-09-16.sql} (100%) rename DataBase/版本日志/{SGGLDB_V2022-09-18 lpf.sql => SGGLDB_V2022-09-18.sql} (100%) create mode 100644 DataBase/版本日志/SGGLDB_V2022-09-19修改明细.txt rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2022-09-08.sql (100%) rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2022-09-08修改明细.txt (100%) rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2022-09-12.sql (100%) rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2022-09-12修改明细.txt (100%) rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2022-09-13.sql (100%) rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2022-09-13修改明细.txt (100%) rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2022-09-14.sql (100%) rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2022-09-14修改明细.txt (100%) rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2022-09-15.sql (100%) rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2022-09-15修改明细.txt (100%) diff --git a/DataBase/版本日志/SGGLDB_V2022-09-16 lpf.sql b/DataBase/版本日志/SGGLDB_V2022-09-16.sql similarity index 100% rename from DataBase/版本日志/SGGLDB_V2022-09-16 lpf.sql rename to DataBase/版本日志/SGGLDB_V2022-09-16.sql diff --git a/DataBase/版本日志/SGGLDB_V2022-09-18 lpf.sql b/DataBase/版本日志/SGGLDB_V2022-09-18.sql similarity index 100% rename from DataBase/版本日志/SGGLDB_V2022-09-18 lpf.sql rename to DataBase/版本日志/SGGLDB_V2022-09-18.sql diff --git a/DataBase/版本日志/SGGLDB_V2022-09-19修改明细.txt b/DataBase/版本日志/SGGLDB_V2022-09-19修改明细.txt new file mode 100644 index 00000000..e12cbccb --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2022-09-19修改明细.txt @@ -0,0 +1,9 @@ + +--ADD BY YangHongwei 2022-09-19 +1、部门人员列表员工类型取值修改。 +2、人员历史数据中当前项目当前岗位为空的情况进行初始化取值处理。 +3、部门员工列表自定义列导出功能实现。 +--END + + + diff --git a/DataBase/版本日志/SGGLDB_V2022-09-08.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-08.sql similarity index 100% rename from DataBase/版本日志/SGGLDB_V2022-09-08.sql rename to DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-08.sql diff --git a/DataBase/版本日志/SGGLDB_V2022-09-08修改明细.txt b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-08修改明细.txt similarity index 100% rename from DataBase/版本日志/SGGLDB_V2022-09-08修改明细.txt rename to DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-08修改明细.txt diff --git a/DataBase/版本日志/SGGLDB_V2022-09-12.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-12.sql similarity index 100% rename from DataBase/版本日志/SGGLDB_V2022-09-12.sql rename to DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-12.sql diff --git a/DataBase/版本日志/SGGLDB_V2022-09-12修改明细.txt b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-12修改明细.txt similarity index 100% rename from DataBase/版本日志/SGGLDB_V2022-09-12修改明细.txt rename to DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-12修改明细.txt diff --git a/DataBase/版本日志/SGGLDB_V2022-09-13.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-13.sql similarity index 100% rename from DataBase/版本日志/SGGLDB_V2022-09-13.sql rename to DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-13.sql diff --git a/DataBase/版本日志/SGGLDB_V2022-09-13修改明细.txt b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-13修改明细.txt similarity index 100% rename from DataBase/版本日志/SGGLDB_V2022-09-13修改明细.txt rename to DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-13修改明细.txt diff --git a/DataBase/版本日志/SGGLDB_V2022-09-14.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-14.sql similarity index 100% rename from DataBase/版本日志/SGGLDB_V2022-09-14.sql rename to DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-14.sql diff --git a/DataBase/版本日志/SGGLDB_V2022-09-14修改明细.txt b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-14修改明细.txt similarity index 100% rename from DataBase/版本日志/SGGLDB_V2022-09-14修改明细.txt rename to DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-14修改明细.txt diff --git a/DataBase/版本日志/SGGLDB_V2022-09-15.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-15.sql similarity index 100% rename from DataBase/版本日志/SGGLDB_V2022-09-15.sql rename to DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-15.sql diff --git a/DataBase/版本日志/SGGLDB_V2022-09-15修改明细.txt b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-15修改明细.txt similarity index 100% rename from DataBase/版本日志/SGGLDB_V2022-09-15修改明细.txt rename to DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-15修改明细.txt diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index 9f4892c2..66fdf8d6 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -64,9 +64,7 @@ ..\FineUIPro\Reference BLL\Interop.WIA.dll True - - ..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll - + ..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1000\lib\net20\Microsoft.Office.Interop.Excel.dll True @@ -113,25 +111,13 @@ - - ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll - ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll - - - ..\packages\System.Text.Encodings.Web.5.0.0\lib\net461\System.Text.Encodings.Web.dll - - - ..\packages\System.Text.Json.5.0.0\lib\net461\System.Text.Json.dll - ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/SGGL/BLL/BaseInfo/PositionService.cs b/SGGL/BLL/BaseInfo/PositionService.cs index 05e917af..52b670a5 100644 --- a/SGGL/BLL/BaseInfo/PositionService.cs +++ b/SGGL/BLL/BaseInfo/PositionService.cs @@ -20,6 +20,17 @@ namespace BLL return Funs.DB.Base_Position.FirstOrDefault(e => e.PositionId == positionId); } + public static string GetPositionNameById(string positionId) + { + string name =string.Empty; + var getData= Funs.DB.Base_Position.FirstOrDefault(e => e.PositionId == positionId); + if (getData != null) + { + name = getData.PositionName; + } + return name; + + } /// /// 添加职务 /// diff --git a/SGGL/BLL/Person/Person_PersonsService.cs b/SGGL/BLL/Person/Person_PersonsService.cs index a604d7d1..4652ba16 100644 --- a/SGGL/BLL/Person/Person_PersonsService.cs +++ b/SGGL/BLL/Person/Person_PersonsService.cs @@ -107,6 +107,7 @@ namespace BLL WorkPostName = WorkPostService.getWorkPostNamesWorkPostIds(x.WorkPostId), x.PostTitleId, PostTitleName = PostTitleService.getPostTitleNameById(x.PostTitleId), + x.PostTitleDate, x.IsOffice, x.RoleIds, RoleName = RoleService.getRoleNamesRoleIds(x.RoleIds), @@ -124,10 +125,21 @@ namespace BLL x.PersonType, PersonTypeName = DropListService.getPersonTypeNameByValue(x.PersonType), x.ValidityDate, + x.IntoDate, + x.WorkDate, + x.RetirementDate, + PositionName = PositionService.GetPositionNameById(x.PositionId), + x.Graduate, + x.ForeignLanguage, + NationName = BasicDataService.GetDictNameByDictCode(x.Nation), + PoliticsStatusName = BasicDataService.GetDictNameByDictCode(x.PoliticsStatus), + MaritalStatusName = BasicDataService.GetDictNameByDictCode(x.MaritalStatus), + x.RelativeName, + x.RelativeTel, }; } #endregion - + #region 根据主键获取人员信息 /// /// 根据主键获取人员信息 diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt index 39f7ac69..9fc6f434 100644 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ b/SGGL/FineUIPro.Web/ErrLog.txt @@ -135,3 +135,26 @@ IP地址:::1 出错时间:09/13/2022 10:46:27 + +错误信息开始=====> +错误类型:HttpCompileException +错误信息:e:\SEDIN\SGGL_SeDin_New\SGGL\FineUIPro.Web\Person\DepartPersonShowColumn.aspx(20): error CS1061: “ASP.person_departpersonshowcolumn_aspx”不包含“btSearch_Click”的定义，并且找不到可接受类型为“ASP.person_departpersonshowcolumn_aspx”的第一个参数的扩展方法“btSearch_Click”(是否缺少 using 指令或程序集引用?) +错误堆栈: + 在 System.Web.Compilation.BuildManager.PostProcessFoundBuildResult(BuildResult result, Boolean keyFromVPP, VirtualPath virtualPath) + 在 System.Web.Compilation.BuildManager.GetBuildResultFromCacheInternal(String cacheKey, Boolean keyFromVPP, VirtualPath virtualPath, Int64 hashCode, Boolean ensureIsUpToDate) + 在 System.Web.Compilation.BuildManager.GetVPathBuildResultFromCacheInternal(VirtualPath virtualPath, Boolean ensureIsUpToDate) + 在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate) + 在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate) + 在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound) + 在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp) + 在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath) + 在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path) + 在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute() + 在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step) + 在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously) +出错时间:09/20/2022 11:07:49 +出错文件:http://localhost:8008/Person/DepartPersonShowColumn.aspx +IP地址:::1 + +出错时间:09/20/2022 11:07:49 + diff --git a/SGGL/FineUIPro.Web/Person/CompanyPerson.aspx b/SGGL/FineUIPro.Web/Person/CompanyPerson.aspx index 4404fae8..3319a6f2 100644 --- a/SGGL/FineUIPro.Web/Person/CompanyPerson.aspx +++ b/SGGL/FineUIPro.Web/Person/CompanyPerson.aspx @@ -31,11 +31,11 @@ LabelAlign="Right" AutoPostBack="true" EmptyText="项目" OnSelectedIndexChanged="btSearch_Click"> - - + - @@ -51,8 +51,12 @@ - + + + + + @@ -67,12 +71,12 @@ - + - <%-- --%> - - - <%-- + <%-- @@ -118,7 +122,7 @@ + /// + /// + protected void btnOut_Click(object sender, EventArgs e) + { + Response.ClearContent(); + string filename = Funs.GetNewFileName(); + Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("部门人员列表" + filename, System.Text.Encoding.UTF8) + ".xls"); + Response.ContentType = "application/excel"; + Response.ContentEncoding = Encoding.UTF8; + this.Grid1.PageSize = this.Grid1.RecordCount; + this.BindGrid(); + Response.Write(GetGridTableHtml(Grid1)); + Response.End(); + } + #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/Person/DepartPerson.aspx.designer.cs b/SGGL/FineUIPro.Web/Person/DepartPerson.aspx.designer.cs index d9b42254..040a613e 100644 --- a/SGGL/FineUIPro.Web/Person/DepartPerson.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/Person/DepartPerson.aspx.designer.cs @@ -131,6 +131,24 @@ namespace FineUIPro.Web.Person /// protected global::FineUIPro.Button btnImport; + /// + /// btnOut 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnOut; + + /// + /// lblNumber 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblNumber; + /// /// lbSex 控件。 /// @@ -141,13 +159,13 @@ namespace FineUIPro.Web.Person protected global::System.Web.UI.WebControls.Label lbSex; /// - /// Label1 控件。 + /// lbAge 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::System.Web.UI.WebControls.Label Label1; + protected global::System.Web.UI.WebControls.Label lbAge; /// /// lbIsPost 控件。 @@ -158,6 +176,15 @@ namespace FineUIPro.Web.Person /// protected global::System.Web.UI.WebControls.Label lbIsPost; + /// + /// lbNativePlace 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lbNativePlace; + /// /// ToolbarSeparator1 控件。 /// diff --git a/SGGL/FineUIPro.Web/Person/PersonLib.aspx.cs b/SGGL/FineUIPro.Web/Person/PersonLib.aspx.cs index 816197d2..a70eb1ca 100644 --- a/SGGL/FineUIPro.Web/Person/PersonLib.aspx.cs +++ b/SGGL/FineUIPro.Web/Person/PersonLib.aspx.cs @@ -88,7 +88,7 @@ namespace FineUIPro.Web.Person } } - if (this.CurrUser.PersonId == Const.hfnbdId) + if (this.CurrUser.PersonId == Const.hfnbdId || this.CurrUser.PersonId == Const.sysglyId) { this.btnIDCard.Hidden = false; } @@ -243,6 +243,8 @@ namespace FineUIPro.Web.Person protected void btnIDCard_Click(object sender, EventArgs e) { int countRecod = 0; + int pCountRecod = 0; + string info=string.Empty; var getPerson = (from x in Funs.DB.Person_Persons where x.IdentityCard != null && x.IdentityCard.Length > 1 && !x.Birthday.HasValue && x.IsCardNoOK.Value select x).Take(1000); @@ -264,7 +266,19 @@ namespace FineUIPro.Web.Person Funs.DB.SubmitChanges(); countRecod++; } - Alert.ShowInTop("操作完成，共处理" + countRecod.ToString() + "条人员信息", MessageBoxIcon.Success); + info = "操作完成，共处理人员按身份证设置年龄" + countRecod.ToString() + "条。"; + + var getPPersons = (from x in Funs.DB.SitePerson_Person + join y in Funs.DB.Person_Persons on x.PersonId equals y.PersonId + where x.States == Const.ProjectPersonStates_1 && y.CurrentProjectId == null + select x).Take(1000); + foreach (var pitem in getPPersons) + { + SitePerson_PersonItemService.SetPersonItemInOut(pitem); + pCountRecod++; + } + + info+= "共处理人员所在当前项目取值" + pCountRecod.ToString() + "条。"; } } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/PageBase.cs b/SGGL/FineUIPro.Web/common/PageBase.cs index c0b71269..f9a0bd3c 100644 --- a/SGGL/FineUIPro.Web/common/PageBase.cs +++ b/SGGL/FineUIPro.Web/common/PageBase.cs @@ -1196,7 +1196,10 @@ namespace FineUIPro.Web foreach (GridColumn column in grid.Columns) { - sb.AppendFormat("{0}", column.HeaderText); + if (column.ColumnID != "Actions" && !column.Hidden) + { + sb.AppendFormat("{0}", column.HeaderText); + } } sb.Append(""); foreach (GridRow row in grid.Rows) @@ -1204,41 +1207,60 @@ namespace FineUIPro.Web sb.Append(""); foreach (GridColumn column in grid.Columns) { - string html = row.Values[column.ColumnIndex].ToString(); - if (column.ColumnID == "tfNumber" && (row.FindControl("labNumber") as AspNet.Label) != null) + if (column.ColumnID != "Actions" && !column.Hidden) { - html = (row.FindControl("labNumber") as AspNet.Label).Text; - } - if (column.ColumnID == "tfTeamType" && (row.FindControl("lbTeamType") as AspNet.Label) != null) - { - html = (row.FindControl("lbTeamType") as AspNet.Label).Text; - } - if (column.ColumnID == "tfI" && (row.FindControl("tfI") as AspNet.Label) != null) - { - html = (row.FindControl("lbI") as AspNet.Label).Text; - } - if (column.ColumnID == "tfCompileMan" && (row.FindControl("tfCompileMan") as AspNet.Label) != null) - { - html = (row.FindControl("lblCompileMan") as AspNet.Label).Text; - } - if (column.ColumnID == "tfSpecialEquipmentId") - { - html = (row.FindControl("lblSpecialEquipmentId") as AspNet.Label).Text; - } - // 处理CheckBox - if (html.Contains("f-grid-static-checkbox")) - { - if (!html.Contains("f-checked")) + string html = row.Values[column.ColumnIndex].ToString(); + if (column.ColumnID == "tfNumber" && (row.FindControl("labNumber") as AspNet.Label) != null) { - html = "×"; + html = (row.FindControl("labNumber") as AspNet.Label).Text; } - else + if (column.ColumnID == "tfNumber" && (row.FindControl("lblNumber") as AspNet.Label) != null) { - html = "√"; + html = (row.FindControl("lblNumber") as AspNet.Label).Text; } + if (column.ColumnID == "tfTeamType" && (row.FindControl("lbTeamType") as AspNet.Label) != null) + { + html = (row.FindControl("lbTeamType") as AspNet.Label).Text; + } + if (column.ColumnID == "tfI" && (row.FindControl("lbI") as AspNet.Label) != null) + { + html = (row.FindControl("lbI") as AspNet.Label).Text; + } + if (column.ColumnID == "tfCompileMan" && (row.FindControl("lblCompileMan") as AspNet.Label) != null) + { + html = (row.FindControl("lblCompileMan") as AspNet.Label).Text; + } + if (column.ColumnID == "tfSpecialEquipmentId" && (row.FindControl("lblSpecialEquipmentId") as AspNet.Label) != null) + { + html = (row.FindControl("lblSpecialEquipmentId") as AspNet.Label).Text; + } + if (column.ColumnID == "tfSex" && (row.FindControl("lbSex") as AspNet.Label) != null) + { + html = (row.FindControl("lbSex") as AspNet.Label).Text; + } + if (column.ColumnID == "tfAge" && (row.FindControl("lbAge") as AspNet.Label) != null) + { + html = (row.FindControl("lbAge") as AspNet.Label).Text; + } + if (column.ColumnID == "tfIsPost" && (row.FindControl("lbIsPost") as AspNet.Label) != null) + { + html = (row.FindControl("lbIsPost") as AspNet.Label).Text; + } + // 处理CheckBox + if (html.Contains("f-grid-static-checkbox")) + { + if (!html.Contains("f-checked")) + { + html = "×"; + } + else + { + html = "√"; + } + } + sb.AppendFormat("{0}", html); + // sb.AppendFormat("{0}", html); } - sb.AppendFormat("{0}", html); - // sb.AppendFormat("{0}", html); } sb.Append(""); diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index c672e14c..915e3a8d 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -347,12 +347,6 @@ namespace Model partial void InsertCheck_TechnicalContactListApprove(Check_TechnicalContactListApprove instance); partial void UpdateCheck_TechnicalContactListApprove(Check_TechnicalContactListApprove instance); partial void DeleteCheck_TechnicalContactListApprove(Check_TechnicalContactListApprove instance); - partial void InsertConManager_LongList(ConManager_LongList instance); - partial void UpdateConManager_LongList(ConManager_LongList instance); - partial void DeleteConManager_LongList(ConManager_LongList instance); - partial void InsertConManager_SubAchievement(ConManager_SubAchievement instance); - partial void UpdateConManager_SubAchievement(ConManager_SubAchievement instance); - partial void DeleteConManager_SubAchievement(ConManager_SubAchievement instance); partial void InsertCostGoods_CostManage(CostGoods_CostManage instance); partial void UpdateCostGoods_CostManage(CostGoods_CostManage instance); partial void DeleteCostGoods_CostManage(CostGoods_CostManage instance); @@ -758,9 +752,6 @@ namespace Model partial void InsertPerson_Persons(Person_Persons instance); partial void UpdatePerson_Persons(Person_Persons instance); partial void DeletePerson_Persons(Person_Persons instance); - partial void InsertPerson_PersonsCertificate(Person_PersonsCertificate instance); - partial void UpdatePerson_PersonsCertificate(Person_PersonsCertificate instance); - partial void DeletePerson_PersonsCertificate(Person_PersonsCertificate instance); partial void InsertPerson_PersonTrain(Person_PersonTrain instance); partial void UpdatePerson_PersonTrain(Person_PersonTrain instance); partial void DeletePerson_PersonTrain(Person_PersonTrain instance); @@ -2295,22 +2286,6 @@ namespace Model } } - public System.Data.Linq.Table ConManager_LongList - { - get - { - return this.GetTable(); - } - } - - public System.Data.Linq.Table ConManager_SubAchievement - { - get - { - return this.GetTable(); - } - } - public System.Data.Linq.Table CostGoods_CostManage { get @@ -3399,14 +3374,6 @@ namespace Model } } - public System.Data.Linq.Table Person_PersonsCertificate - { - get - { - return this.GetTable(); - } - } - public System.Data.Linq.Table Person_PersonTrain { get @@ -50033,802 +50000,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.ConManager_LongList")] - public partial class ConManager_LongList : INotifyPropertyChanging, INotifyPropertyChanged - { - - private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); - - private string _ConManagerLongListId; - - private System.Nullable _State; - - private string _SubUnitName; - - private string _SubUnitNature; - - private string _Corporate; - - private string _Address; - - private string _CollCropCode; - - private string _RegisteredCapital; - - private string _SubjectNatureLevel; - - private string _OtherNatureLevel; - - private string _MainBusiness; - - private string _OpeningBank_TT; - - private string _BankAccount_TT; - - private string _OpeningBank_electrophore; - - private string _BankAccount_electrophore; - - private string _LineNumber_electrophore; - - private string _LinkUserName; - - private string _LinkUserPosition; - - private string _LinkUserMobile; - - private string _LinkUserEMail; - - private string _Personal_all; - - private string _Personal_Skilled; - - private string _Personal_Manager; - - private string _Personal_Reg; - - private string _AchievementId; - - private string _IsQualifiedSub; - - #region 可扩展性方法定义 - partial void OnLoaded(); - partial void OnValidate(System.Data.Linq.ChangeAction action); - partial void OnCreated(); - partial void OnConManagerLongListIdChanging(string value); - partial void OnConManagerLongListIdChanged(); - partial void OnStateChanging(System.Nullable value); - partial void OnStateChanged(); - partial void OnSubUnitNameChanging(string value); - partial void OnSubUnitNameChanged(); - partial void OnSubUnitNatureChanging(string value); - partial void OnSubUnitNatureChanged(); - partial void OnCorporateChanging(string value); - partial void OnCorporateChanged(); - partial void OnAddressChanging(string value); - partial void OnAddressChanged(); - partial void OnCollCropCodeChanging(string value); - partial void OnCollCropCodeChanged(); - partial void OnRegisteredCapitalChanging(string value); - partial void OnRegisteredCapitalChanged(); - partial void OnSubjectNatureLevelChanging(string value); - partial void OnSubjectNatureLevelChanged(); - partial void OnOtherNatureLevelChanging(string value); - partial void OnOtherNatureLevelChanged(); - partial void OnMainBusinessChanging(string value); - partial void OnMainBusinessChanged(); - partial void OnOpeningBank_TTChanging(string value); - partial void OnOpeningBank_TTChanged(); - partial void OnBankAccount_TTChanging(string value); - partial void OnBankAccount_TTChanged(); - partial void OnOpeningBank_electrophoreChanging(string value); - partial void OnOpeningBank_electrophoreChanged(); - partial void OnBankAccount_electrophoreChanging(string value); - partial void OnBankAccount_electrophoreChanged(); - partial void OnLineNumber_electrophoreChanging(string value); - partial void OnLineNumber_electrophoreChanged(); - partial void OnLinkUserNameChanging(string value); - partial void OnLinkUserNameChanged(); - partial void OnLinkUserPositionChanging(string value); - partial void OnLinkUserPositionChanged(); - partial void OnLinkUserMobileChanging(string value); - partial void OnLinkUserMobileChanged(); - partial void OnLinkUserEMailChanging(string value); - partial void OnLinkUserEMailChanged(); - partial void OnPersonal_allChanging(string value); - partial void OnPersonal_allChanged(); - partial void OnPersonal_SkilledChanging(string value); - partial void OnPersonal_SkilledChanged(); - partial void OnPersonal_ManagerChanging(string value); - partial void OnPersonal_ManagerChanged(); - partial void OnPersonal_RegChanging(string value); - partial void OnPersonal_RegChanged(); - partial void OnAchievementIdChanging(string value); - partial void OnAchievementIdChanged(); - partial void OnIsQualifiedSubChanging(string value); - partial void OnIsQualifiedSubChanged(); - #endregion - - public ConManager_LongList() - { - OnCreated(); - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConManagerLongListId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] - public string ConManagerLongListId - { - get - { - return this._ConManagerLongListId; - } - set - { - if ((this._ConManagerLongListId != value)) - { - this.OnConManagerLongListIdChanging(value); - this.SendPropertyChanging(); - this._ConManagerLongListId = value; - this.SendPropertyChanged("ConManagerLongListId"); - this.OnConManagerLongListIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_State", DbType="Int")] - public System.Nullable State - { - get - { - return this._State; - } - set - { - if ((this._State != value)) - { - this.OnStateChanging(value); - this.SendPropertyChanging(); - this._State = value; - this.SendPropertyChanged("State"); - this.OnStateChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubUnitName", DbType="NVarChar(200)")] - public string SubUnitName - { - get - { - return this._SubUnitName; - } - set - { - if ((this._SubUnitName != value)) - { - this.OnSubUnitNameChanging(value); - this.SendPropertyChanging(); - this._SubUnitName = value; - this.SendPropertyChanged("SubUnitName"); - this.OnSubUnitNameChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubUnitNature", DbType="NVarChar(200)")] - public string SubUnitNature - { - get - { - return this._SubUnitNature; - } - set - { - if ((this._SubUnitNature != value)) - { - this.OnSubUnitNatureChanging(value); - this.SendPropertyChanging(); - this._SubUnitNature = value; - this.SendPropertyChanged("SubUnitNature"); - this.OnSubUnitNatureChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Corporate", DbType="NVarChar(200)")] - public string Corporate - { - get - { - return this._Corporate; - } - set - { - if ((this._Corporate != value)) - { - this.OnCorporateChanging(value); - this.SendPropertyChanging(); - this._Corporate = value; - this.SendPropertyChanged("Corporate"); - this.OnCorporateChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Address", DbType="NVarChar(200)")] - public string Address - { - get - { - return this._Address; - } - set - { - if ((this._Address != value)) - { - this.OnAddressChanging(value); - this.SendPropertyChanging(); - this._Address = value; - this.SendPropertyChanged("Address"); - this.OnAddressChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CollCropCode", DbType="NVarChar(200)")] - public string CollCropCode - { - get - { - return this._CollCropCode; - } - set - { - if ((this._CollCropCode != value)) - { - this.OnCollCropCodeChanging(value); - this.SendPropertyChanging(); - this._CollCropCode = value; - this.SendPropertyChanged("CollCropCode"); - this.OnCollCropCodeChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RegisteredCapital", DbType="NVarChar(50)")] - public string RegisteredCapital - { - get - { - return this._RegisteredCapital; - } - set - { - if ((this._RegisteredCapital != value)) - { - this.OnRegisteredCapitalChanging(value); - this.SendPropertyChanging(); - this._RegisteredCapital = value; - this.SendPropertyChanged("RegisteredCapital"); - this.OnRegisteredCapitalChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubjectNatureLevel", DbType="NVarChar(200)")] - public string SubjectNatureLevel - { - get - { - return this._SubjectNatureLevel; - } - set - { - if ((this._SubjectNatureLevel != value)) - { - this.OnSubjectNatureLevelChanging(value); - this.SendPropertyChanging(); - this._SubjectNatureLevel = value; - this.SendPropertyChanged("SubjectNatureLevel"); - this.OnSubjectNatureLevelChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OtherNatureLevel", DbType="NVarChar(200)")] - public string OtherNatureLevel - { - get - { - return this._OtherNatureLevel; - } - set - { - if ((this._OtherNatureLevel != value)) - { - this.OnOtherNatureLevelChanging(value); - this.SendPropertyChanging(); - this._OtherNatureLevel = value; - this.SendPropertyChanged("OtherNatureLevel"); - this.OnOtherNatureLevelChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MainBusiness", DbType="NVarChar(1000)")] - public string MainBusiness - { - get - { - return this._MainBusiness; - } - set - { - if ((this._MainBusiness != value)) - { - this.OnMainBusinessChanging(value); - this.SendPropertyChanging(); - this._MainBusiness = value; - this.SendPropertyChanged("MainBusiness"); - this.OnMainBusinessChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OpeningBank_TT", DbType="NVarChar(100)")] - public string OpeningBank_TT - { - get - { - return this._OpeningBank_TT; - } - set - { - if ((this._OpeningBank_TT != value)) - { - this.OnOpeningBank_TTChanging(value); - this.SendPropertyChanging(); - this._OpeningBank_TT = value; - this.SendPropertyChanged("OpeningBank_TT"); - this.OnOpeningBank_TTChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BankAccount_TT", DbType="NVarChar(100)")] - public string BankAccount_TT - { - get - { - return this._BankAccount_TT; - } - set - { - if ((this._BankAccount_TT != value)) - { - this.OnBankAccount_TTChanging(value); - this.SendPropertyChanging(); - this._BankAccount_TT = value; - this.SendPropertyChanged("BankAccount_TT"); - this.OnBankAccount_TTChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OpeningBank_electrophore", DbType="NVarChar(100)")] - public string OpeningBank_electrophore - { - get - { - return this._OpeningBank_electrophore; - } - set - { - if ((this._OpeningBank_electrophore != value)) - { - this.OnOpeningBank_electrophoreChanging(value); - this.SendPropertyChanging(); - this._OpeningBank_electrophore = value; - this.SendPropertyChanged("OpeningBank_electrophore"); - this.OnOpeningBank_electrophoreChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BankAccount_electrophore", DbType="NVarChar(100)")] - public string BankAccount_electrophore - { - get - { - return this._BankAccount_electrophore; - } - set - { - if ((this._BankAccount_electrophore != value)) - { - this.OnBankAccount_electrophoreChanging(value); - this.SendPropertyChanging(); - this._BankAccount_electrophore = value; - this.SendPropertyChanged("BankAccount_electrophore"); - this.OnBankAccount_electrophoreChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LineNumber_electrophore", DbType="NVarChar(100)")] - public string LineNumber_electrophore - { - get - { - return this._LineNumber_electrophore; - } - set - { - if ((this._LineNumber_electrophore != value)) - { - this.OnLineNumber_electrophoreChanging(value); - this.SendPropertyChanging(); - this._LineNumber_electrophore = value; - this.SendPropertyChanged("LineNumber_electrophore"); - this.OnLineNumber_electrophoreChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LinkUserName", DbType="NVarChar(50)")] - public string LinkUserName - { - get - { - return this._LinkUserName; - } - set - { - if ((this._LinkUserName != value)) - { - this.OnLinkUserNameChanging(value); - this.SendPropertyChanging(); - this._LinkUserName = value; - this.SendPropertyChanged("LinkUserName"); - this.OnLinkUserNameChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LinkUserPosition", DbType="NVarChar(100)")] - public string LinkUserPosition - { - get - { - return this._LinkUserPosition; - } - set - { - if ((this._LinkUserPosition != value)) - { - this.OnLinkUserPositionChanging(value); - this.SendPropertyChanging(); - this._LinkUserPosition = value; - this.SendPropertyChanged("LinkUserPosition"); - this.OnLinkUserPositionChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LinkUserMobile", DbType="NVarChar(50)")] - public string LinkUserMobile - { - get - { - return this._LinkUserMobile; - } - set - { - if ((this._LinkUserMobile != value)) - { - this.OnLinkUserMobileChanging(value); - this.SendPropertyChanging(); - this._LinkUserMobile = value; - this.SendPropertyChanged("LinkUserMobile"); - this.OnLinkUserMobileChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LinkUserEMail", DbType="NVarChar(50)")] - public string LinkUserEMail - { - get - { - return this._LinkUserEMail; - } - set - { - if ((this._LinkUserEMail != value)) - { - this.OnLinkUserEMailChanging(value); - this.SendPropertyChanging(); - this._LinkUserEMail = value; - this.SendPropertyChanged("LinkUserEMail"); - this.OnLinkUserEMailChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Personal_all", DbType="NVarChar(200)")] - public string Personal_all - { - get - { - return this._Personal_all; - } - set - { - if ((this._Personal_all != value)) - { - this.OnPersonal_allChanging(value); - this.SendPropertyChanging(); - this._Personal_all = value; - this.SendPropertyChanged("Personal_all"); - this.OnPersonal_allChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Personal_Skilled", DbType="NVarChar(200)")] - public string Personal_Skilled - { - get - { - return this._Personal_Skilled; - } - set - { - if ((this._Personal_Skilled != value)) - { - this.OnPersonal_SkilledChanging(value); - this.SendPropertyChanging(); - this._Personal_Skilled = value; - this.SendPropertyChanged("Personal_Skilled"); - this.OnPersonal_SkilledChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Personal_Manager", DbType="NVarChar(200)")] - public string Personal_Manager - { - get - { - return this._Personal_Manager; - } - set - { - if ((this._Personal_Manager != value)) - { - this.OnPersonal_ManagerChanging(value); - this.SendPropertyChanging(); - this._Personal_Manager = value; - this.SendPropertyChanged("Personal_Manager"); - this.OnPersonal_ManagerChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Personal_Reg", DbType="NVarChar(200)")] - public string Personal_Reg - { - get - { - return this._Personal_Reg; - } - set - { - if ((this._Personal_Reg != value)) - { - this.OnPersonal_RegChanging(value); - this.SendPropertyChanging(); - this._Personal_Reg = value; - this.SendPropertyChanged("Personal_Reg"); - this.OnPersonal_RegChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AchievementId", DbType="NVarChar(50)")] - public string AchievementId - { - get - { - return this._AchievementId; - } - set - { - if ((this._AchievementId != value)) - { - this.OnAchievementIdChanging(value); - this.SendPropertyChanging(); - this._AchievementId = value; - this.SendPropertyChanged("AchievementId"); - this.OnAchievementIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsQualifiedSub", DbType="NVarChar(50)")] - public string IsQualifiedSub - { - get - { - return this._IsQualifiedSub; - } - set - { - if ((this._IsQualifiedSub != value)) - { - this.OnIsQualifiedSubChanging(value); - this.SendPropertyChanging(); - this._IsQualifiedSub = value; - this.SendPropertyChanged("IsQualifiedSub"); - this.OnIsQualifiedSubChanged(); - } - } - } - - public event PropertyChangingEventHandler PropertyChanging; - - public event PropertyChangedEventHandler PropertyChanged; - - protected virtual void SendPropertyChanging() - { - if ((this.PropertyChanging != null)) - { - this.PropertyChanging(this, emptyChangingEventArgs); - } - } - - protected virtual void SendPropertyChanged(String propertyName) - { - if ((this.PropertyChanged != null)) - { - this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); - } - } - } - - [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.ConManager_SubAchievement")] - public partial class ConManager_SubAchievement : INotifyPropertyChanging, INotifyPropertyChanged - { - - private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); - - private string _AchievementId; - - private string _ProjectName; - - private string _Remark; - - private string _HonorAward; - - #region 可扩展性方法定义 - partial void OnLoaded(); - partial void OnValidate(System.Data.Linq.ChangeAction action); - partial void OnCreated(); - partial void OnAchievementIdChanging(string value); - partial void OnAchievementIdChanged(); - partial void OnProjectNameChanging(string value); - partial void OnProjectNameChanged(); - partial void OnRemarkChanging(string value); - partial void OnRemarkChanged(); - partial void OnHonorAwardChanging(string value); - partial void OnHonorAwardChanged(); - #endregion - - public ConManager_SubAchievement() - { - OnCreated(); - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AchievementId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] - public string AchievementId - { - get - { - return this._AchievementId; - } - set - { - if ((this._AchievementId != value)) - { - this.OnAchievementIdChanging(value); - this.SendPropertyChanging(); - this._AchievementId = value; - this.SendPropertyChanged("AchievementId"); - this.OnAchievementIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectName", DbType="NVarChar(200)")] - public string ProjectName - { - get - { - return this._ProjectName; - } - set - { - if ((this._ProjectName != value)) - { - this.OnProjectNameChanging(value); - this.SendPropertyChanging(); - this._ProjectName = value; - this.SendPropertyChanged("ProjectName"); - this.OnProjectNameChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(1000)")] - public string Remark - { - get - { - return this._Remark; - } - set - { - if ((this._Remark != value)) - { - this.OnRemarkChanging(value); - this.SendPropertyChanging(); - this._Remark = value; - this.SendPropertyChanged("Remark"); - this.OnRemarkChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HonorAward", DbType="NVarChar(1000)")] - public string HonorAward - { - get - { - return this._HonorAward; - } - set - { - if ((this._HonorAward != value)) - { - this.OnHonorAwardChanging(value); - this.SendPropertyChanging(); - this._HonorAward = value; - this.SendPropertyChanged("HonorAward"); - this.OnHonorAwardChanged(); - } - } - } - - public event PropertyChangingEventHandler PropertyChanging; - - public event PropertyChangedEventHandler PropertyChanged; - - protected virtual void SendPropertyChanging() - { - if ((this.PropertyChanging != null)) - { - this.PropertyChanging(this, emptyChangingEventArgs); - } - } - - protected virtual void SendPropertyChanged(String propertyName) - { - if ((this.PropertyChanged != null)) - { - this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); - } - } - } - [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.CostGoods_CostManage")] public partial class CostGoods_CostManage : INotifyPropertyChanging, INotifyPropertyChanged { @@ -66891,6 +66062,8 @@ namespace Model private string _ImportType; + private string _DataClassification; + private string _FileName; private string _FilePath; @@ -66909,8 +66082,6 @@ namespace Model private string _CreateDate; - private string _DataClassification; - #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -66923,6 +66094,8 @@ namespace Model partial void OnUnitWorkIdChanged(); partial void OnImportTypeChanging(string value); partial void OnImportTypeChanged(); + partial void OnDataClassificationChanging(string value); + partial void OnDataClassificationChanged(); partial void OnFileNameChanging(string value); partial void OnFileNameChanged(); partial void OnFilePathChanging(string value); @@ -66941,8 +66114,6 @@ namespace Model partial void OnCreateManChanged(); partial void OnCreateDateChanging(string value); partial void OnCreateDateChanged(); - partial void OnDataClassificationChanging(string value); - partial void OnDataClassificationChanged(); #endregion public HJGL_DesignBasisDataImport() @@ -67030,6 +66201,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DataClassification", DbType="VarChar(50)")] + public string DataClassification + { + get + { + return this._DataClassification; + } + set + { + if ((this._DataClassification != value)) + { + this.OnDataClassificationChanging(value); + this.SendPropertyChanging(); + this._DataClassification = value; + this.SendPropertyChanged("DataClassification"); + this.OnDataClassificationChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FileName", DbType="VarChar(500)")] public string FileName { @@ -67210,26 +66401,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DataClassification", DbType="VarChar(50)")] - public string DataClassification - { - get - { - return this._DataClassification; - } - set - { - if ((this._DataClassification != value)) - { - this.OnDataClassificationChanging(value); - this.SendPropertyChanging(); - this._DataClassification = value; - this.SendPropertyChanged("DataClassification"); - this.OnDataClassificationChanged(); - } - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -67263,10 +66434,10 @@ namespace Model private string _UnitWorkId; - private System.Nullable _Version; - private string _DataClassification; + private System.Nullable _Version; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -67277,10 +66448,10 @@ namespace Model partial void OnProjectIdChanged(); partial void OnUnitWorkIdChanging(string value); partial void OnUnitWorkIdChanged(); - partial void OnVersionChanging(System.Nullable value); - partial void OnVersionChanged(); partial void OnDataClassificationChanging(string value); partial void OnDataClassificationChanged(); + partial void OnVersionChanging(System.Nullable value); + partial void OnVersionChanged(); #endregion public HJGL_DesignBasisDataImportVerSionLog() @@ -67348,26 +66519,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Version", DbType="Decimal(18,1)")] - public System.Nullable Version - { - get - { - return this._Version; - } - set - { - if ((this._Version != value)) - { - this.OnVersionChanging(value); - this.SendPropertyChanging(); - this._Version = value; - this.SendPropertyChanged("Version"); - this.OnVersionChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DataClassification", DbType="VarChar(50)")] public string DataClassification { @@ -67388,6 +66539,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Version", DbType="Decimal(18,1)")] + public System.Nullable Version + { + get + { + return this._Version; + } + set + { + if ((this._Version != value)) + { + this.OnVersionChanging(value); + this.SendPropertyChanging(); + this._Version = value; + this.SendPropertyChanged("Version"); + this.OnVersionChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -74212,7 +73383,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] public string PipelineCode { get @@ -124885,284 +124056,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Person_PersonsCertificate")] - public partial class Person_PersonsCertificate : INotifyPropertyChanging, INotifyPropertyChanged - { - - private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); - - private string _PersonsCertificateId; - - private string _PersonId; - - private string _CertificateId; - - private string _CertificateCode; - - private string _SendUnit; - - private System.Nullable _SendDate; - - private System.Nullable _RegisterDate; - - private string _Major; - - private System.Nullable _ValidityDate; - - private string _Url; - - #region 可扩展性方法定义 - partial void OnLoaded(); - partial void OnValidate(System.Data.Linq.ChangeAction action); - partial void OnCreated(); - partial void OnPersonsCertificateIdChanging(string value); - partial void OnPersonsCertificateIdChanged(); - partial void OnPersonIdChanging(string value); - partial void OnPersonIdChanged(); - partial void OnCertificateIdChanging(string value); - partial void OnCertificateIdChanged(); - partial void OnCertificateCodeChanging(string value); - partial void OnCertificateCodeChanged(); - partial void OnSendUnitChanging(string value); - partial void OnSendUnitChanged(); - partial void OnSendDateChanging(System.Nullable value); - partial void OnSendDateChanged(); - partial void OnRegisterDateChanging(System.Nullable value); - partial void OnRegisterDateChanged(); - partial void OnMajorChanging(string value); - partial void OnMajorChanged(); - partial void OnValidityDateChanging(System.Nullable value); - partial void OnValidityDateChanged(); - partial void OnUrlChanging(string value); - partial void OnUrlChanged(); - #endregion - - public Person_PersonsCertificate() - { - OnCreated(); - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PersonsCertificateId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] - public string PersonsCertificateId - { - get - { - return this._PersonsCertificateId; - } - set - { - if ((this._PersonsCertificateId != value)) - { - this.OnPersonsCertificateIdChanging(value); - this.SendPropertyChanging(); - this._PersonsCertificateId = value; - this.SendPropertyChanged("PersonsCertificateId"); - this.OnPersonsCertificateIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PersonId", DbType="NVarChar(50)")] - public string PersonId - { - get - { - return this._PersonId; - } - set - { - if ((this._PersonId != value)) - { - this.OnPersonIdChanging(value); - this.SendPropertyChanging(); - this._PersonId = value; - this.SendPropertyChanged("PersonId"); - this.OnPersonIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CertificateId", DbType="NVarChar(50)")] - public string CertificateId - { - get - { - return this._CertificateId; - } - set - { - if ((this._CertificateId != value)) - { - this.OnCertificateIdChanging(value); - this.SendPropertyChanging(); - this._CertificateId = value; - this.SendPropertyChanged("CertificateId"); - this.OnCertificateIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CertificateCode", DbType="NVarChar(50)")] - public string CertificateCode - { - get - { - return this._CertificateCode; - } - set - { - if ((this._CertificateCode != value)) - { - this.OnCertificateCodeChanging(value); - this.SendPropertyChanging(); - this._CertificateCode = value; - this.SendPropertyChanged("CertificateCode"); - this.OnCertificateCodeChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SendUnit", DbType="NVarChar(500)")] - public string SendUnit - { - get - { - return this._SendUnit; - } - set - { - if ((this._SendUnit != value)) - { - this.OnSendUnitChanging(value); - this.SendPropertyChanging(); - this._SendUnit = value; - this.SendPropertyChanged("SendUnit"); - this.OnSendUnitChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SendDate", DbType="DateTime")] - public System.Nullable SendDate - { - get - { - return this._SendDate; - } - set - { - if ((this._SendDate != value)) - { - this.OnSendDateChanging(value); - this.SendPropertyChanging(); - this._SendDate = value; - this.SendPropertyChanged("SendDate"); - this.OnSendDateChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RegisterDate", DbType="DateTime")] - public System.Nullable RegisterDate - { - get - { - return this._RegisterDate; - } - set - { - if ((this._RegisterDate != value)) - { - this.OnRegisterDateChanging(value); - this.SendPropertyChanging(); - this._RegisterDate = value; - this.SendPropertyChanged("RegisterDate"); - this.OnRegisterDateChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Major", DbType="NVarChar(50)")] - public string Major - { - get - { - return this._Major; - } - set - { - if ((this._Major != value)) - { - this.OnMajorChanging(value); - this.SendPropertyChanging(); - this._Major = value; - this.SendPropertyChanged("Major"); - this.OnMajorChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ValidityDate", DbType="DateTime")] - public System.Nullable ValidityDate - { - get - { - return this._ValidityDate; - } - set - { - if ((this._ValidityDate != value)) - { - this.OnValidityDateChanging(value); - this.SendPropertyChanging(); - this._ValidityDate = value; - this.SendPropertyChanged("ValidityDate"); - this.OnValidityDateChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Url", DbType="NVarChar(2000)")] - public string Url - { - get - { - return this._Url; - } - set - { - if ((this._Url != value)) - { - this.OnUrlChanging(value); - this.SendPropertyChanging(); - this._Url = value; - this.SendPropertyChanged("Url"); - this.OnUrlChanged(); - } - } - } - - public event PropertyChangingEventHandler PropertyChanging; - - public event PropertyChangedEventHandler PropertyChanged; - - protected virtual void SendPropertyChanging() - { - if ((this.PropertyChanging != null)) - { - this.PropertyChanging(this, emptyChangingEventArgs); - } - } - - protected virtual void SendPropertyChanged(String propertyName) - { - if ((this.PropertyChanged != null)) - { - this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); - } - } - } - [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Person_PersonTrain")] public partial class Person_PersonTrain : INotifyPropertyChanging, INotifyPropertyChanged { @@ -138470,6 +137363,8 @@ namespace Model private System.Nullable _Status; + private string _ContactUnitOfPartyA; + private string _ContactPersonOfPartyA; private string _ContactPersonOfPartyB; @@ -138494,8 +137389,6 @@ namespace Model private System.Nullable _IsItACentralizedPurchaseSupplier; - private string _ContactUnitOfPartyA; - private string _Clause; private string _MainContent; @@ -138582,6 +137475,8 @@ namespace Model partial void OnCreateDateChanged(); partial void OnStatusChanging(System.Nullable value); partial void OnStatusChanged(); + partial void OnContactUnitOfPartyAChanging(string value); + partial void OnContactUnitOfPartyAChanged(); partial void OnContactPersonOfPartyAChanging(string value); partial void OnContactPersonOfPartyAChanged(); partial void OnContactPersonOfPartyBChanging(string value); @@ -138606,8 +137501,6 @@ namespace Model partial void OnSubcontractingMethodChanged(); partial void OnIsItACentralizedPurchaseSupplierChanging(System.Nullable value); partial void OnIsItACentralizedPurchaseSupplierChanged(); - partial void OnContactUnitOfPartyAChanging(string value); - partial void OnContactUnitOfPartyAChanged(); partial void OnClauseChanging(string value); partial void OnClauseChanged(); partial void OnMainContentChanging(string value); @@ -139335,6 +138228,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContactUnitOfPartyA", DbType="VarChar(50)")] + public string ContactUnitOfPartyA + { + get + { + return this._ContactUnitOfPartyA; + } + set + { + if ((this._ContactUnitOfPartyA != value)) + { + this.OnContactUnitOfPartyAChanging(value); + this.SendPropertyChanging(); + this._ContactUnitOfPartyA = value; + this.SendPropertyChanged("ContactUnitOfPartyA"); + this.OnContactUnitOfPartyAChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContactPersonOfPartyA", DbType="VarChar(50)")] public string ContactPersonOfPartyA { @@ -139575,26 +138488,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContactUnitOfPartyA", DbType="VarChar(50)")] - public string ContactUnitOfPartyA - { - get - { - return this._ContactUnitOfPartyA; - } - set - { - if ((this._ContactUnitOfPartyA != value)) - { - this.OnContactUnitOfPartyAChanging(value); - this.SendPropertyChanging(); - this._ContactUnitOfPartyA = value; - this.SendPropertyChanged("ContactUnitOfPartyA"); - this.OnContactUnitOfPartyAChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Clause", DbType="NVarChar(1000)")] public string Clause { @@ -181051,8 +179944,6 @@ namespace Model private EntityRef _WBS_UnitWork; - private EntityRef _WBS_WorkPackage; - #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -181086,7 +179977,6 @@ namespace Model this._Base_Unit = default(EntityRef); this._Solution_LargerHazardList = default(EntityRef); this._WBS_UnitWork = default(EntityRef); - this._WBS_WorkPackage = default(EntityRef); OnCreated(); } @@ -181189,10 +180079,6 @@ namespace Model { if ((this._WorkPackageId != value)) { - if (this._WBS_WorkPackage.HasLoadedOrAssignedValue) - { - throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); - } this.OnWorkPackageIdChanging(value); this.SendPropertyChanging(); this._WorkPackageId = value; @@ -181428,40 +180314,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Solution_LargerHazardListItem_WBS_WorkPackage", Storage="_WBS_WorkPackage", ThisKey="WorkPackageId", OtherKey="WorkPackageId", IsForeignKey=true)] - public WBS_WorkPackage WBS_WorkPackage - { - get - { - return this._WBS_WorkPackage.Entity; - } - set - { - WBS_WorkPackage previousValue = this._WBS_WorkPackage.Entity; - if (((previousValue != value) - || (this._WBS_WorkPackage.HasLoadedOrAssignedValue == false))) - { - this.SendPropertyChanging(); - if ((previousValue != null)) - { - this._WBS_WorkPackage.Entity = null; - previousValue.Solution_LargerHazardListItem.Remove(this); - } - this._WBS_WorkPackage.Entity = value; - if ((value != null)) - { - value.Solution_LargerHazardListItem.Add(this); - this._WorkPackageId = value.WorkPackageId; - } - else - { - this._WorkPackageId = default(string); - } - this.SendPropertyChanged("WBS_WorkPackage"); - } - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -203949,7 +202801,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] public string PipelineCode { get @@ -208390,7 +207242,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] public string PipelineCode { get @@ -211120,7 +209972,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] public string PipelineCode { get @@ -212019,7 +210871,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] public string PipelineCode { get @@ -212396,7 +211248,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] public string PipelineCode { get @@ -212589,7 +211441,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] public string PipelineCode { get @@ -212822,7 +211674,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] public string PipelineCode { get @@ -213652,7 +212504,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] public string PipelineCode { get @@ -214637,7 +213489,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] public string PipelineCode { get @@ -216823,7 +215675,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] public string PipelineCode { get @@ -221615,7 +220467,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] public string PipelineCode { get @@ -222245,7 +221097,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] public string PipelineCode { get @@ -222940,7 +221792,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] public string PipelineCode { get @@ -223523,7 +222375,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(200)")] public string PipelineCode { get @@ -232796,8 +231648,6 @@ namespace Model private System.Nullable _Costs; - private EntitySet _Solution_LargerHazardListItem; - private EntitySet _WBS_ControlItemAndCycle; private EntityRef _WBS_UnitWork; @@ -232844,7 +231694,6 @@ namespace Model public WBS_WorkPackage() { - this._Solution_LargerHazardListItem = new EntitySet(new Action(this.attach_Solution_LargerHazardListItem), new Action(this.detach_Solution_LargerHazardListItem)); this._WBS_ControlItemAndCycle = new EntitySet(new Action(this.attach_WBS_ControlItemAndCycle), new Action(this.detach_WBS_ControlItemAndCycle)); this._WBS_UnitWork = default(EntityRef); OnCreated(); @@ -233194,19 +232043,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Solution_LargerHazardListItem_WBS_WorkPackage", Storage="_Solution_LargerHazardListItem", ThisKey="WorkPackageId", OtherKey="WorkPackageId", DeleteRule="NO ACTION")] - public EntitySet Solution_LargerHazardListItem - { - get - { - return this._Solution_LargerHazardListItem; - } - set - { - this._Solution_LargerHazardListItem.Assign(value); - } - } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_WBS_ControlItemAndCycle_WBS_ControlItemAndCycle", Storage="_WBS_ControlItemAndCycle", ThisKey="WorkPackageId", OtherKey="WorkPackageId", DeleteRule="NO ACTION")] public EntitySet WBS_ControlItemAndCycle { @@ -233274,18 +232110,6 @@ namespace Model } } - private void attach_Solution_LargerHazardListItem(Solution_LargerHazardListItem entity) - { - this.SendPropertyChanging(); - entity.WBS_WorkPackage = this; - } - - private void detach_Solution_LargerHazardListItem(Solution_LargerHazardListItem entity) - { - this.SendPropertyChanging(); - entity.WBS_WorkPackage = null; - } - private void attach_WBS_ControlItemAndCycle(WBS_ControlItemAndCycle entity) { this.SendPropertyChanging(); From 8474675b90751dd30807112c4e62ba27c0b207e1 Mon Sep 17 00:00:00 2001 From: yhw0507 Date: Tue, 20 Sep 2022 17:50:09 +0800 Subject: [PATCH 2/3] 20220920 --- SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx.cs | 2 +- SGGL/FineUIPro.Web/HSSE/Manager/HSEDiary.aspx.cs | 1 + SGGL/FineUIPro.Web/HSSE/Manager/HSEDiaryView.aspx | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx.cs b/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx.cs index 84299e95..afd87ee4 100644 --- a/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecord.aspx.cs @@ -57,7 +57,7 @@ namespace FineUIPro.Web.HSSE.EduTrain (CASE WHEN TestPlan.PlanName IS NULL THEN Training.TrainingName ELSE TestPlan.PlanName END) AS PlanName,Person.IdentityCard,WorkPost.WorkPostName,Person.PersonId,SitePerson.SitePersonId, (CASE WHEN TestRecord.TestScores>=60 THEN '是' ELSE '否' END) AS IsPass, ISNULL(TestPlan.Duration,90) AS Duration,ISNULL(TestPlan.TotalScore,100) AS TotalScore,TestPlan.TestPalce,ISNULL(TestPlan.QuestionCount,95) AS QuestionCount,TestRecord.TemporaryUser,Person.PersonName AS TestManName - ,Unit.UnitName + ,Unit.UnitName,Person.Telephone FROM dbo.Training_TestRecord AS TestRecord LEFT JOIN dbo.Training_TestPlan AS TestPlan ON TestPlan.TestPlanId=TestRecord.TestPlanId LEFT JOIN dbo.Training_TestTraining AS Training ON Training.TrainingId = TestRecord.TestType diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/HSEDiary.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Manager/HSEDiary.aspx.cs index fc39c96b..fabc05fe 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/HSEDiary.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Manager/HSEDiary.aspx.cs @@ -102,6 +102,7 @@ namespace FineUIPro.Web.HSSE.Manager /// protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); BindGrid(); } diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/HSEDiaryView.aspx b/SGGL/FineUIPro.Web/HSSE/Manager/HSEDiaryView.aspx index 3b931aff..5078c5a4 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/HSEDiaryView.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Manager/HSEDiaryView.aspx @@ -129,13 +129,13 @@ - + - + From 87582b0fa5eb038d6d51db1bc7ba0d2e90209ad8 Mon Sep 17 00:00:00 2001 From: yhw0507 Date: Thu, 22 Sep 2022 14:28:47 +0800 Subject: [PATCH 3/3] =?UTF-8?q?20220922=201=E3=80=81=E7=84=8A=E5=B7=A5?= =?UTF-8?q?=E4=B8=9A=E7=BB=A9=E5=AD=98=E5=82=A8=E8=BF=87=E7=A8=8B=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E3=80=822=E3=80=81=E4=BA=BA=E5=91=98=E5=BA=93?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=9C=A8=E5=B2=97=E7=A9=BA=E6=97=B6=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E3=80=823=E3=80=81=E5=90=88=E5=90=8C=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=AE=A1=E6=89=B9=E9=A1=B5=E9=80=89=E6=8B=A9=E6=A1=86?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=8A=A0=E8=BD=BD=E9=97=AE=E9=A2=98=E3=80=82?= =?UTF-8?q?4=E3=80=81=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=AE=A2=E9=98=85?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E6=A3=80=E6=9F=A5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBase/版本日志/SGGLDB_V2022-09-22.sql | 116 +++++++++++++ .../版本日志/SGGLDB_V2022-09-22修改明细.txt | 10 ++ .../{ => 已更新脚本}/SGGLDB_V2022-09-16.sql | 0 .../SGGLDB_V2022-09-16修改明细.txt | 0 .../{ => 已更新脚本}/SGGLDB_V2022-09-18.sql | 0 .../SGGLDB_V2022-09-18修改明细.txt | 0 .../SGGLDB_V2022-09-19修改明细.txt | 0 SGGL/BLL/Person/Person_PersonsService.cs | 4 +- SGGL/FineUIPro.Web/ErrLog.txt | 160 ------------------ .../PipePrefabricationRateStatistics.aspx | 3 +- SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs | 2 +- 11 files changed, 131 insertions(+), 164 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_V2022-09-22.sql create mode 100644 DataBase/版本日志/SGGLDB_V2022-09-22修改明细.txt rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2022-09-16.sql (100%) rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2022-09-16修改明细.txt (100%) rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2022-09-18.sql (100%) rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2022-09-18修改明细.txt (100%) rename DataBase/版本日志/{ => 已更新脚本}/SGGLDB_V2022-09-19修改明细.txt (100%) diff --git a/DataBase/版本日志/SGGLDB_V2022-09-22.sql b/DataBase/版本日志/SGGLDB_V2022-09-22.sql new file mode 100644 index 00000000..1f3cc674 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2022-09-22.sql @@ -0,0 +1,116 @@ +--ҵ +ALTER PROC [dbo].[sp_rpt_WelderPerformance] + @unitcode NVARCHAR(50) = NULL, + @UnitWorkId NVARCHAR(50) = NULL, + @steel NVARCHAR(50) = NULL, + @wloName NVARCHAR(50) = NULL, + @date1 DATETIME = NULL, + @date2 DATETIME = NULL, + @projectId NVARCHAR(50) = NULL + +AS +/*ҵ*/ + +SELECT + welder.ProjectId, + welder.WelderCode,-- + welder.PersonName,-- + (CASE WHEN Persons.Sex ='2' THEN 'Ů' ELSE '' END) AS Sex, --Ա + -------------start + CAST(ISNULL(nowtotal_din.nowtotal_din,0) AS DECIMAL(19,2)) AS nowtotal_din, --ֵܴ + ISNULL(nowtotal_din.nowtotal_jot,0) AS nowtotal_jot, --ܺ + ISNULL(nowtotal_Rt.Rt_JotNum,0) AS rt_total_Jot, -- RT + ISNULL(nowtotal_repairjot.nowtotal_repairjot,0) AS nowtotal_repairjot, -- RT޺ + CONVERT(NVARCHAR(10),(CAST((CASE ISNULL(nowtotal_Rt.Rt_JotNum,0) WHEN 0 THEN 0 + ELSE 100.0 * ISNULL(nowtotal_repairjot.nowtotal_repairjot,0)/(1.0 * nowtotal_Rt.Rt_JotNum) END) AS DECIMAL(8,1))))+'%' AS nowrepairrate, -- RTʣڣ + + ISNULL(nowtotalfilm.nowtotalfilm,0) AS nowtotalfilm, --RTƬ + ISNULL(nowtotalfilm.nopassfilm,0) AS nopassfilm, --RTϸƬ + CONVERT(NVARCHAR(10),(CAST((CASE ISNULL(nowtotalfilm.nowtotalfilm,0) WHEN 0 THEN 0 + ELSE 100.0 * ISNULL(nowtotalfilm.nopassfilm,0)/(1.0 * nowtotalfilm.nowtotalfilm) END) AS DECIMAL(8,1))))+'%' + AS nopassfilmrate , ---RTʣƬ + teamGroup.TeamGroupName AS education, --ڰ + welder.States +FROM SitePerson_Person AS welder +LEFT JOIN Person_Persons AS Persons ON welder.PersonId =Persons.PersonId +left join ProjectData_TeamGroup as teamGroup on teamGroup.TeamGroupId=welder.TeamGroupId + --ֵܴ --ܺ +LEFT JOIN (SELECT SUM(jot.Size) AS nowtotal_din + ,COUNT(*) AS nowtotal_jot + ,jot.CoverWelderId + FROM dbo.HJGL_WeldJoint jot + LEFT JOIN dbo.HJGL_Pipeline pipe ON pipe.PipelineId = jot.PipelineId + LEFT JOIN dbo.HJGL_WeldingDaily daily ON daily.WeldingDailyId = jot.WeldingDailyId + LEFT JOIN WBS_UnitWork UnitWork ON UnitWork.UnitWorkId = pipe.UnitWorkId + WHERE jot.WeldingDailyId IS NOT NULL + AND (daily.WeldingDate >= @date1 OR @date1 IS NULL) AND (daily.WeldingDate <= @date2 OR @date2 IS NULL) + AND (pipe.UnitWorkId =@UnitWorkId OR @UnitWorkId IS NULL) + AND (jot.Material1Id=@steel OR @steel IS NULL) + GROUP BY jot.CoverWelderId) AS nowtotal_din ON nowtotal_din.CoverWelderId = welder.PersonId + +--Rt +LEFT JOIN (SELECT COUNT(pointItem.PointBatchItemId) AS Rt_JotNum --RT + ,jot.CoverWelderId + FROM dbo.HJGL_Batch_PointBatchItem pointItem + LEFT JOIN dbo.HJGL_WeldJoint jot ON jot.WeldJointId = pointItem.WeldJointId + LEFT JOIN dbo.HJGL_Batch_PointBatch point ON point.PointBatchId = pointItem.PointBatchId + LEFT JOIN Base_DetectionType ndeType ON ndeType.DetectionTypeId = point.DetectionTypeId + LEFT JOIN dbo.HJGL_Pipeline pipe ON pipe.PipelineId = jot.PipelineId + LEFT JOIN dbo.HJGL_WeldingDaily daily ON daily.WeldingDailyId = jot.WeldingDailyId + WHERE pointItem.PointDate IS NOT NULL + AND ndeType.DetectionTypeCode='RT' --ʾRT + AND (daily.WeldingDate >= @date1 OR @date1 IS NULL) + AND (daily.WeldingDate <= @date2 OR @date2 IS NULL) + AND (pipe.UnitWorkId =@UnitWorkId OR @UnitWorkId IS NULL) + AND (jot.Material1Id=@steel OR @steel IS NULL) + GROUP BY jot.CoverWelderId) AS nowtotal_Rt ON nowtotal_Rt.CoverWelderId = welder.PersonId + -- RT +LEFT JOIN (SELECT COUNT(pointItem.PointBatchItemId) AS nowtotal_repairjot --޿ + ,jot.CoverWelderId + FROM dbo.HJGL_Batch_PointBatchItem pointItem + LEFT JOIN dbo.HJGL_WeldJoint jot ON jot.WeldJointId = pointItem.WeldJointId + LEFT JOIN dbo.HJGL_Batch_PointBatch point ON point.PointBatchId = pointItem.PointBatchId + LEFT JOIN Base_DetectionType ndeType ON ndeType.DetectionTypeId = point.DetectionTypeId + LEFT JOIN dbo.HJGL_Pipeline pipe ON pipe.PipelineId = jot.PipelineId + LEFT JOIN dbo.HJGL_WeldingDaily daily ON daily.WeldingDailyId = jot.WeldingDailyId + LEFT JOIN dbo.HJGL_Batch_BatchTrustItem trustItem ON trustItem.PointBatchItemId = pointItem.PointBatchItemId + LEFT JOIN dbo.HJGL_Batch_NDEItem ndeItem ON ndeItem.TrustBatchItemId = trustItem.TrustBatchItemId + WHERE pointItem.PointDate IS NOT NULL + AND ndeType.DetectionTypeCode='RT' --ʾRT + AND ndeItem.CheckResult='2' + AND (daily.WeldingDate >= @date1 OR @date1 IS NULL) + AND (daily.WeldingDate <= @date2 OR @date2 IS NULL) + AND (pipe.UnitWorkId =@UnitWorkId OR @UnitWorkId IS NULL) + AND (jot.Material1Id=@steel OR @steel IS NULL) + GROUP BY jot.CoverWelderId) AS nowtotal_repairjot ON nowtotal_repairjot.CoverWelderId = welder.PersonId + +--RTƬ +LEFT JOIN (SELECT SUM(ndeItem.TotalFilm) AS nowtotalfilm + ,SUM(ndeItem.PassFilm) AS nowpassfilm + ,SUM(ndeItem.TotalFilm-ndeItem.PassFilm) AS nopassfilm, + jot.CoverWelderId + FROM dbo.HJGL_Batch_NDEItem ndeItem + LEFT JOIN dbo.HJGL_Batch_BatchTrustItem trustItem ON trustItem.TrustBatchItemId = ndeItem.TrustBatchItemId + LEFT JOIN dbo.HJGL_Batch_PointBatchItem pointItem ON pointItem.PointBatchItemId = trustItem.PointBatchItemId + LEFT JOIN dbo.HJGL_Batch_PointBatch point ON point.PointBatchId = pointItem.PointBatchId + LEFT JOIN Base_DetectionType ndeType ON ndeType.DetectionTypeId = point.DetectionTypeId + LEFT JOIN dbo.HJGL_WeldJoint jot ON jot.WeldJointId = pointItem.WeldJointId + LEFT JOIN dbo.HJGL_WeldingDaily daily ON daily.WeldingDailyId = jot.WeldingDailyId + WHERE ndeType.DetectionTypeCode='RT' + AND ndeItem.CheckResult IS NOT NULL --ʾм + AND jot.WeldingDailyId IS NOT NULL + AND (point.UnitWorkId=@UnitWorkId OR @UnitWorkId IS NULL) + AND (jot.Material1Id=@steel OR @steel IS NULL) + AND (daily.WeldingDate >= @date1 OR @date1 IS NULL) AND (daily.WeldingDate <= @date2 OR @date2 IS NULL) + GROUP BY jot.CoverWelderId) AS nowtotalfilm ON nowtotalfilm.CoverWelderId = welder.PersonId + +WHERE (welder.WelderCode IS NOT NULL AND welder.WelderCode!='') AND +(welder.ProjectId = @projectId OR @projectId IS NULL) +AND (welder.UnitId=@unitcode OR @unitcode IS NULL) +AND (welder.WorkPostId='19B8F2A9-28D3-4F20-867A-1B2237C2E228') +AND (welder.PersonId=@wloName OR @wloname IS NULL) +ORDER BY welder.WelderCode + +GO + + diff --git a/DataBase/版本日志/SGGLDB_V2022-09-22修改明细.txt b/DataBase/版本日志/SGGLDB_V2022-09-22修改明细.txt new file mode 100644 index 00000000..5ac896ca --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2022-09-22修改明细.txt @@ -0,0 +1,10 @@ + +--ADD BY YangHongwei 2022-09-22 +1、焊工业绩存储过程修改。 +2、人员库是否在岗空时报错。 +3、合同流程审批页选择框人员加载问题。 +4、小程序订阅推送检查。 +--END + + + diff --git a/DataBase/版本日志/SGGLDB_V2022-09-16.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-16.sql similarity index 100% rename from DataBase/版本日志/SGGLDB_V2022-09-16.sql rename to DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-16.sql diff --git a/DataBase/版本日志/SGGLDB_V2022-09-16修改明细.txt b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-16修改明细.txt similarity index 100% rename from DataBase/版本日志/SGGLDB_V2022-09-16修改明细.txt rename to DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-16修改明细.txt diff --git a/DataBase/版本日志/SGGLDB_V2022-09-18.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-18.sql similarity index 100% rename from DataBase/版本日志/SGGLDB_V2022-09-18.sql rename to DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-18.sql diff --git a/DataBase/版本日志/SGGLDB_V2022-09-18修改明细.txt b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-18修改明细.txt similarity index 100% rename from DataBase/版本日志/SGGLDB_V2022-09-18修改明细.txt rename to DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-18修改明细.txt diff --git a/DataBase/版本日志/SGGLDB_V2022-09-19修改明细.txt b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-19修改明细.txt similarity index 100% rename from DataBase/版本日志/SGGLDB_V2022-09-19修改明细.txt rename to DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-19修改明细.txt diff --git a/SGGL/BLL/Person/Person_PersonsService.cs b/SGGL/BLL/Person/Person_PersonsService.cs index 4652ba16..d042a35c 100644 --- a/SGGL/BLL/Person/Person_PersonsService.cs +++ b/SGGL/BLL/Person/Person_PersonsService.cs @@ -596,7 +596,7 @@ namespace BLL ForeignLanguage = person.ForeignLanguage, CountryCode = person.CountryCode, ProvinceCode = person.ProvinceCode, - IsPost = person.IsPost, + IsPost = person.IsPost ?? true, Graduate = person.Graduate, Major = person.Major, IntoDate = person.IntoDate, @@ -689,7 +689,7 @@ namespace BLL newPerson.ForeignLanguage = person.ForeignLanguage; newPerson.CountryCode = person.CountryCode; newPerson.ProvinceCode = person.ProvinceCode; - newPerson.IsPost = person.IsPost; + newPerson.IsPost = person.IsPost ?? true; newPerson.Graduate = person.Graduate; newPerson.Major = person.Major; newPerson.IntoDate = person.IntoDate; diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt index 9fc6f434..e69de29b 100644 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ b/SGGL/FineUIPro.Web/ErrLog.txt @@ -1,160 +0,0 @@ - -错误信息开始=====> -错误类型:SqlException -错误信息:列名 'Sex' 无效。 -列名 'IsUsed' 无效。 -错误堆栈: - 在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) - 在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) - 在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose) - 在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady) - 在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData() - 在 System.Data.SqlClient.SqlDataReader.get_MetaData() - 在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method) - 在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method) - 在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior) - 在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior) - 在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior) - 在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior) - 在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable) - 在 BLL.SQLHelper.GetDataTableRunProc(String storedProcName, SqlParameter[] parameters) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\BLL\SQLHelper.cs:行号 277 - 在 FineUIPro.Web.HJGL.WeldingReport.WelderPerformance.BindGrid() 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\WeldingReport\WelderPerformance.aspx.cs:行号 90 - 在 FineUIPro.Web.HJGL.WeldingReport.WelderPerformance.BtnAnalyse_Click(Object sender, EventArgs e) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\WeldingReport\WelderPerformance.aspx.cs:行号 137 - 在 FineUIPro.Button.OnClick(EventArgs e) - 在 (Button , EventArgs ) - 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) -出错时间:09/08/2022 19:56:26 -出错文件:http://localhost:8008/HJGL/WeldingReport/WelderPerformance.aspx -IP地址:::1 -操作人员:JT - -出错时间:09/08/2022 19:56:26 - - -错误信息开始=====> -错误类型:SqlException -错误信息:列名 'Sex' 无效。 -列名 'IsUsed' 无效。 -错误堆栈: - 在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) - 在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) - 在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose) - 在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady) - 在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData() - 在 System.Data.SqlClient.SqlDataReader.get_MetaData() - 在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method) - 在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method) - 在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior) - 在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior) - 在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior) - 在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior) - 在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable) - 在 BLL.SQLHelper.GetDataTableRunProc(String storedProcName, SqlParameter[] parameters) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\BLL\SQLHelper.cs:行号 277 - 在 FineUIPro.Web.HJGL.WeldingReport.WelderPerformance.BindGrid() 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\WeldingReport\WelderPerformance.aspx.cs:行号 90 - 在 FineUIPro.Web.HJGL.WeldingReport.WelderPerformance.BtnAnalyse_Click(Object sender, EventArgs e) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\WeldingReport\WelderPerformance.aspx.cs:行号 137 - 在 FineUIPro.Button.OnClick(EventArgs e) - 在 (Button , EventArgs ) - 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) -出错时间:09/08/2022 19:57:31 -出错文件:http://localhost:8008/HJGL/WeldingReport/WelderPerformance.aspx -IP地址:::1 -操作人员:JT - -出错时间:09/08/2022 19:57:31 - - -错误信息开始=====> -错误类型:SqlException -错误信息:列名 'Sex' 无效。 -列名 'IsUsed' 无效。 -错误堆栈: - 在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) - 在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) - 在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose) - 在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady) - 在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData() - 在 System.Data.SqlClient.SqlDataReader.get_MetaData() - 在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method) - 在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method) - 在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior) - 在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior) - 在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior) - 在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior) - 在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable) - 在 BLL.SQLHelper.GetDataTableRunProc(String storedProcName, SqlParameter[] parameters) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\BLL\SQLHelper.cs:行号 277 - 在 FineUIPro.Web.HJGL.WeldingReport.WelderPerformance.BindGrid() 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\WeldingReport\WelderPerformance.aspx.cs:行号 90 - 在 FineUIPro.Web.HJGL.WeldingReport.WelderPerformance.BtnAnalyse_Click(Object sender, EventArgs e) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\WeldingReport\WelderPerformance.aspx.cs:行号 137 - 在 FineUIPro.Button.OnClick(EventArgs e) - 在 (Button , EventArgs ) - 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) -出错时间:09/08/2022 19:57:53 -出错文件:http://localhost:8008/HJGL/WeldingReport/WelderPerformance.aspx -IP地址:::1 -操作人员:JT - -出错时间:09/08/2022 19:57:53 - - -错误信息开始=====> -错误类型:ChangeConflictException -错误信息:2 的 1 更新失败。 -错误堆栈: - 在 System.Data.Linq.ChangeProcessor.SubmitChanges(ConflictMode failureMode) - 在 System.Data.Linq.DataContext.SubmitChanges(ConflictMode failureMode) - 在 System.Data.Linq.DataContext.SubmitChanges() - 在 BLL.ContractService.UpdateContract(PHTGL_Contract contract) 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\BLL\PHTGL\ContractCompile\ContractService.cs:行号 177 - 在 FineUIPro.Web.PHTGL.ContractCompile.ContractFormationEdit.btnSave_Tab1_Click(Object sender, EventArgs e) 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\FineUIPro.Web\PHTGL\ContractCompile\ContractFormationEdit.aspx.cs:行号 564 - 在 FineUIPro.Button.OnClick(EventArgs e) - 在 (Button , EventArgs ) - 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) -出错时间:09/13/2022 10:46:27 -出错文件:http://localhost:8008/PHTGL/ContractCompile/ContractFormationEdit.aspx?ContractId=60594f33-0093-416f-afbf-a7c1bac3170c -IP地址:::1 -操作人员:JT - -出错时间:09/13/2022 10:46:27 - - -错误信息开始=====> -错误类型:HttpCompileException -错误信息:e:\SEDIN\SGGL_SeDin_New\SGGL\FineUIPro.Web\Person\DepartPersonShowColumn.aspx(20): error CS1061: “ASP.person_departpersonshowcolumn_aspx”不包含“btSearch_Click”的定义，并且找不到可接受类型为“ASP.person_departpersonshowcolumn_aspx”的第一个参数的扩展方法“btSearch_Click”(是否缺少 using 指令或程序集引用?) -错误堆栈: - 在 System.Web.Compilation.BuildManager.PostProcessFoundBuildResult(BuildResult result, Boolean keyFromVPP, VirtualPath virtualPath) - 在 System.Web.Compilation.BuildManager.GetBuildResultFromCacheInternal(String cacheKey, Boolean keyFromVPP, VirtualPath virtualPath, Int64 hashCode, Boolean ensureIsUpToDate) - 在 System.Web.Compilation.BuildManager.GetVPathBuildResultFromCacheInternal(VirtualPath virtualPath, Boolean ensureIsUpToDate) - 在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate) - 在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate) - 在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound) - 在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp) - 在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath) - 在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path) - 在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute() - 在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step) - 在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously) -出错时间:09/20/2022 11:07:49 -出错文件:http://localhost:8008/Person/DepartPersonShowColumn.aspx -IP地址:::1 - -出错时间:09/20/2022 11:07:49 - diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/PipePrefabricationRateStatistics.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingReport/PipePrefabricationRateStatistics.aspx index 111694d6..d751e65e 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/PipePrefabricationRateStatistics.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/PipePrefabricationRateStatistics.aspx @@ -31,7 +31,8 @@ - + diff --git a/SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs b/SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs index 9bdd1563..4e0ec9dc 100644 --- a/SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs @@ -76,7 +76,7 @@ namespace FineUIPro.Web.Person this.txtPersonName.Text = person.PersonName; this.txtJobNum.Text = person.JobNum; this.drpUnit.SelectedValue = person.UnitId; - this.ckIsPost.Checked = person.IsPost.Value; + this.ckIsPost.Checked = person.IsPost ?? true; if (!string.IsNullOrEmpty(person.DepartId)) { this.drpDepart.SelectedValue = person.DepartId;