From cfb16a4268d4afc5e487d15fbb8a0b220d85c2db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BA=A2=E5=8D=AB=20=E6=9D=A8?= Date: Fri, 21 Jul 2023 18:17:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?20230721=20=E6=A0=87=E5=87=86=E8=A7=84?= =?UTF-8?q?=E8=8C=83=E8=BE=A8=E8=AF=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBase/版本日志/SGGLDB_V2023-07-21.sql | 44 +++++++++ .../ConstructionStandardIdentifyEdit.aspx | 12 +-- .../ConstructionStandardIdentifyEdit.aspx.cs | 53 +++++++++-- SGGL/Model/Model.cs | 89 ++++++++++++++++++- 4 files changed, 186 insertions(+), 12 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_V2023-07-21.sql diff --git a/DataBase/版本日志/SGGLDB_V2023-07-21.sql b/DataBase/版本日志/SGGLDB_V2023-07-21.sql new file mode 100644 index 00000000..8eadd009 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2023-07-21.sql @@ -0,0 +1,44 @@ +ALTER VIEW [dbo].[View_InformationProject_ConstructionStandardSelectedItem] +/*׼淶ʶѡбͼ*/ +AS +SELECT Item.ConstructionStandardSelectedItemId, + Item.ConstructionStandardIdentifyId, + Item.StandardId, + Identify.ProjectId, + List.StandardGrade, + List.StandardNo, + List.StandardName, + List.AttachUrl, + List.IsSelected1, + List.IsSelected2, + List.IsSelected3, + List.IsSelected4, + List.IsSelected5, + List.IsSelected6, + List.IsSelected7, + List.IsSelected8, + List.IsSelected9, + List.IsSelected10, + List.IsSelected11, + List.IsSelected12, + List.IsSelected13, + List.IsSelected14, + List.IsSelected15, + List.IsSelected16, + List.IsSelected17, + List.IsSelected18, + List.IsSelected19, + List.IsSelected20, + List.IsSelected21, + List.IsSelected22, + List.IsSelected23, + List.IsSelected90 +FROM dbo.Law_HSSEStandardsList AS List +LEFT JOIN dbo.InformationProject_ConstructionStandardSelectedItem AS Item ON List.StandardId =Item.StandardId +LEFT JOIN dbo.InformationProject_ConstructionStandardIdentify AS Identify ON Item.ConstructionStandardIdentifyId =Identify.ConstructionStandardIdentifyId + + + +GO + + diff --git a/SGGL/FineUIPro.Web/HSSE/InformationProject/ConstructionStandardIdentifyEdit.aspx b/SGGL/FineUIPro.Web/HSSE/InformationProject/ConstructionStandardIdentifyEdit.aspx index 8c1435a4..552dbbcf 100644 --- a/SGGL/FineUIPro.Web/HSSE/InformationProject/ConstructionStandardIdentifyEdit.aspx +++ b/SGGL/FineUIPro.Web/HSSE/InformationProject/ConstructionStandardIdentifyEdit.aspx @@ -10,7 +10,7 @@ 编辑标准规范辨识 - +
@@ -37,9 +37,9 @@ - + - @@ -49,10 +49,10 @@ + EnableColumnLines="true" EnableCheckBoxSelect="true"> diff --git a/SGGL/FineUIPro.Web/HSSE/InformationProject/ConstructionStandardIdentifyEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/InformationProject/ConstructionStandardIdentifyEdit.aspx.cs index 2476e4d9..4f4a65d2 100644 --- a/SGGL/FineUIPro.Web/HSSE/InformationProject/ConstructionStandardIdentifyEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/InformationProject/ConstructionStandardIdentifyEdit.aspx.cs @@ -143,13 +143,56 @@ namespace FineUIPro.Web.HSSE.InformationProject /// private void BindGrid() { - var q = from x in Funs.DB.View_InformationProject_ConstructionStandardSelectedItem - where x.StandardName != null - select x; - if (!this.ckbAll.Checked) + IQueryable q; + if (this.ckbAll.Checked) { - q = q.Where(e => e.ConstructionStandardIdentifyId == this.ConstructionStandardIdentifyId); + q = from x in Funs.DB.Law_HSSEStandardsList + join y in Funs.DB.InformationProject_ConstructionStandardSelectedItem on x.StandardId equals y.StandardId + join z in Funs.DB.InformationProject_ConstructionStandardIdentify on y.ConstructionStandardIdentifyId equals z.ConstructionStandardIdentifyId + where x.StandardName != null && z.ProjectId == this.CurrUser.LoginProjectId + select new Model.View_InformationProject_ConstructionStandardSelectedItem + { + ConstructionStandardSelectedItemId =y.ConstructionStandardSelectedItemId, + ConstructionStandardIdentifyId = y.ConstructionStandardIdentifyId, + ProjectId = this.CurrUser.LoginProjectId, + StandardId = x.StandardId, + StandardGrade = x.StandardGrade, + StandardNo = x.StandardNo, + StandardName = x.StandardName, + AttachUrl = x.AttachUrl, + IsSelected1 = x.IsSelected1, + IsSelected2 = x.IsSelected2, + IsSelected3 = x.IsSelected3, + IsSelected4 = x.IsSelected4, + IsSelected5 = x.IsSelected5, + IsSelected6 = x.IsSelected6, + IsSelected7 = x.IsSelected7, + IsSelected8 = x.IsSelected8, + IsSelected9 = x.IsSelected9, + IsSelected10 = x.IsSelected10, + IsSelected11 = x.IsSelected11, + IsSelected12 = x.IsSelected12, + IsSelected13 = x.IsSelected13, + IsSelected14 = x.IsSelected14, + IsSelected15 = x.IsSelected15, + IsSelected16 = x.IsSelected16, + IsSelected17 = x.IsSelected17, + IsSelected18 = x.IsSelected18, + IsSelected19 = x.IsSelected19, + IsSelected20 = x.IsSelected20, + IsSelected21 = x.IsSelected21, + IsSelected22 = x.IsSelected22, + IsSelected23 = x.IsSelected23, + IsSelected90 = x.IsSelected90 + }; } + else + { + q = from x in Funs.DB.View_InformationProject_ConstructionStandardSelectedItem + where x.ConstructionStandardIdentifyId == this.ConstructionStandardIdentifyId + select x; + } + if (!string.IsNullOrEmpty(this.txtStandardGrade.Text.Trim())) { q = q.Where(e => e.StandardGrade.Contains(this.txtStandardGrade.Text.Trim())); diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 4577002e..cfb8d5ab 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -10804,6 +10804,8 @@ namespace Model private EntityRef _Person_Persons; + private EntitySet _ActionPlan_ActionPlanListApprove; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -10842,6 +10844,7 @@ namespace Model { this._Base_Project = default(EntityRef); this._Person_Persons = default(EntityRef); + this._ActionPlan_ActionPlanListApprove = new EntitySet(new Action(this.attach_ActionPlan_ActionPlanListApprove), new Action(this.detach_ActionPlan_ActionPlanListApprove)); OnCreated(); } @@ -11201,6 +11204,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ActionPlan_ActionPlanListApprove_ActionPlan_ActionPlanList", Storage="_ActionPlan_ActionPlanListApprove", ThisKey="ActionPlanListId", OtherKey="ActionPlanListId", DeleteRule="NO ACTION")] + public EntitySet ActionPlan_ActionPlanListApprove + { + get + { + return this._ActionPlan_ActionPlanListApprove; + } + set + { + this._ActionPlan_ActionPlanListApprove.Assign(value); + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -11220,6 +11236,18 @@ namespace Model this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); } } + + private void attach_ActionPlan_ActionPlanListApprove(ActionPlan_ActionPlanListApprove entity) + { + this.SendPropertyChanging(); + entity.ActionPlan_ActionPlanList = this; + } + + private void detach_ActionPlan_ActionPlanListApprove(ActionPlan_ActionPlanListApprove entity) + { + this.SendPropertyChanging(); + entity.ActionPlan_ActionPlanList = null; + } } [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.ActionPlan_ActionPlanListApprove")] @@ -11252,6 +11280,8 @@ namespace Model private System.Nullable _IsPushOa; + private EntityRef _ActionPlan_ActionPlanList; + private EntityRef _Person_Persons; #region 可扩展性方法定义 @@ -11286,6 +11316,7 @@ namespace Model public ActionPlan_ActionPlanListApprove() { + this._ActionPlan_ActionPlanList = default(EntityRef); this._Person_Persons = default(EntityRef); OnCreated(); } @@ -11321,6 +11352,10 @@ namespace Model { if ((this._ActionPlanListId != value)) { + if (this._ActionPlan_ActionPlanList.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } this.OnActionPlanListIdChanging(value); this.SendPropertyChanging(); this._ActionPlanListId = value; @@ -11534,6 +11569,40 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ActionPlan_ActionPlanListApprove_ActionPlan_ActionPlanList", Storage="_ActionPlan_ActionPlanList", ThisKey="ActionPlanListId", OtherKey="ActionPlanListId", IsForeignKey=true)] + public ActionPlan_ActionPlanList ActionPlan_ActionPlanList + { + get + { + return this._ActionPlan_ActionPlanList.Entity; + } + set + { + ActionPlan_ActionPlanList previousValue = this._ActionPlan_ActionPlanList.Entity; + if (((previousValue != value) + || (this._ActionPlan_ActionPlanList.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._ActionPlan_ActionPlanList.Entity = null; + previousValue.ActionPlan_ActionPlanListApprove.Remove(this); + } + this._ActionPlan_ActionPlanList.Entity = value; + if ((value != null)) + { + value.ActionPlan_ActionPlanListApprove.Add(this); + this._ActionPlanListId = value.ActionPlanListId; + } + else + { + this._ActionPlanListId = default(string); + } + this.SendPropertyChanged("ActionPlan_ActionPlanList"); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ActionPlan_ActionPlanListApprove_Person_Persons", Storage="_Person_Persons", ThisKey="ApproveMan", OtherKey="PersonId", IsForeignKey=true)] public Person_Persons Person_Persons { @@ -276119,6 +276188,8 @@ namespace Model private string _StandardId; + private string _ProjectId; + private string _StandardGrade; private string _StandardNo; @@ -276179,7 +276250,7 @@ namespace Model { } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionStandardSelectedItemId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionStandardSelectedItemId", DbType="NVarChar(50)")] public string ConstructionStandardSelectedItemId { get @@ -276227,6 +276298,22 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + this._ProjectId = value; + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_StandardGrade", DbType="NChar(12)")] public string StandardGrade { From 3c141d87101cef17ab8cc312741ba08a525fa073 Mon Sep 17 00:00:00 2001 From: yhw0507 Date: Mon, 24 Jul 2023 14:49:45 +0800 Subject: [PATCH 2/2] 20230724 --- DataBase/版本日志/SGGLDB_V2023-07-23.sql | 4 + SGGL/BLL/BaseInfo/CertificateService.cs | 2 + SGGL/BLL/DropListService.cs | 23 +++++ SGGL/BLL/Person/Person_PersonsService.cs | 7 +- SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx | 37 ++++--- .../BaseInfo/Certificate.aspx.cs | 32 +++++- .../BaseInfo/Certificate.aspx.designer.cs | 72 +++++++++----- SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 2 +- SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs | 7 +- SGGL/Model/Model.cs | 97 +++++-------------- 10 files changed, 161 insertions(+), 122 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_V2023-07-23.sql diff --git a/DataBase/版本日志/SGGLDB_V2023-07-23.sql b/DataBase/版本日志/SGGLDB_V2023-07-23.sql new file mode 100644 index 00000000..c6e804dc --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2023-07-23.sql @@ -0,0 +1,4 @@ +ALTER TABLE Base_Certificate ADD Type VARCHAR(10) NULL +GO +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ͣ1ظڣ2ܣ3豸-1' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_Certificate', @level2type=N'COLUMN',@level2name=N'Type' +GO diff --git a/SGGL/BLL/BaseInfo/CertificateService.cs b/SGGL/BLL/BaseInfo/CertificateService.cs index 04f8b360..9b2f6113 100644 --- a/SGGL/BLL/BaseInfo/CertificateService.cs +++ b/SGGL/BLL/BaseInfo/CertificateService.cs @@ -34,6 +34,7 @@ namespace BLL CertificateName = certificate.CertificateName, CertificateType = certificate.CertificateType, IsRegisterHSSE = certificate.IsRegisterHSSE, + Type= certificate.Type, Remark = certificate.Remark }; db.Base_Certificate.InsertOnSubmit(newCertificate); @@ -54,6 +55,7 @@ namespace BLL newCertificate.CertificateName = certificate.CertificateName; newCertificate.CertificateType = certificate.CertificateType; newCertificate.IsRegisterHSSE = certificate.IsRegisterHSSE; + newCertificate.Type = certificate.Type; newCertificate.Remark = certificate.Remark; db.SubmitChanges(); } diff --git a/SGGL/BLL/DropListService.cs b/SGGL/BLL/DropListService.cs index 6911bff9..8b080c2d 100644 --- a/SGGL/BLL/DropListService.cs +++ b/SGGL/BLL/DropListService.cs @@ -34,6 +34,10 @@ { dropName.DataSource = HSSE_getContractType(); } + else if (groupId == Group_CertificateType) + { + dropName.DataSource = HSSE_getCertificateType(); + } dropName.DataBind(); if (isShowPlease) { @@ -102,6 +106,11 @@ /// 合同类型 组id /// public const string Group_ContractType = "ContractType"; + + /// + /// 证书类型 组id + /// + public const string Group_CertificateType = "CertificateType"; #endregion #region 公共平台 @@ -348,6 +357,20 @@ list[2] = new ListItem("以完成一定工作量", "3"); return list; } + + /// + /// 证书类型 + /// + /// + public static ListItem[] HSSE_getCertificateType() + { + ListItem[] list = new ListItem[4]; + list[0] = new ListItem("特岗", "1"); + list[1] = new ListItem("安管", "2"); + list[2] = new ListItem("特种设备", "3"); + list[3] = new ListItem("其他", "-1"); + return list; + } #endregion #endregion diff --git a/SGGL/BLL/Person/Person_PersonsService.cs b/SGGL/BLL/Person/Person_PersonsService.cs index c27e2085..5f3a5849 100644 --- a/SGGL/BLL/Person/Person_PersonsService.cs +++ b/SGGL/BLL/Person/Person_PersonsService.cs @@ -59,10 +59,9 @@ namespace BLL } if (!string.IsNullOrEmpty(projetcId) && projetcId != Const._Null) { - getDataList = from x in getDataList - join y in db.SitePerson_PersonItem on x.PersonId equals y.PersonId - where y.ProjectId == projetcId && !y.OutTime.HasValue - select x; + var idLists=(from x in db.SitePerson_PersonItem where x.ProjectId == projetcId && !x.OutTime.HasValue + select x.PersonId).Distinct().ToList(); + getDataList = getDataList.Where(x => idLists.Contains(x.PersonId)); } if (!string.IsNullOrEmpty(personType) && personType != Const._Null) diff --git a/SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx b/SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx index 1fd9ae69..cd268280 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx +++ b/SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx @@ -21,20 +21,20 @@ - - + + - + - + @@ -43,8 +43,13 @@ RendererFunction="renderIsHsse" HeaderText="注安师" HeaderTextAlign="Center" TextAlign="Center"> - + + + + + + @@ -62,7 +67,7 @@ + LabelWidth="110px" BodyPadding="5px" Width="450px" > @@ -141,6 +147,8 @@ var txtNameClientID = '<%= txtCertificateName.ClientID %>'; var drpCertificateTypeClientID = '<%= drpCertificateType.ClientID %>'; var ckbIsRegisterHSSEClientID = '<%= ckbIsRegisterHSSE.ClientID %>'; + + var drpTypeClientID = '<%= drpType.ClientID %>'; var txtRemarkClientID = '<%=txtRemark.ClientID %>'; function onGridRowSelect(event, rowId) { @@ -158,6 +166,7 @@ F(txtNameClientID).setValue(rowValue['CertificateName']); F(drpCertificateTypeClientID).setValue(rowValue['CertificateType']); F(ckbIsRegisterHSSEClientID).setValue(rowValue['IsRegisterHSSE']); + F(drpTypeClientID).setValue(rowValue['Type']); F(txtRemarkClientID).setValue(rowValue['Remark']); // 更新保存按钮文本 diff --git a/SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx.cs b/SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx.cs index 8f42129b..961dc17b 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx.cs +++ b/SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx.cs @@ -24,6 +24,7 @@ namespace FineUIPro.Web.BaseInfo this.GetButtonPower(); Funs.DropDownPageSize(this.ddlPageSize); Funs.FineUIPleaseSelect(this.drpCertificateType); + BLL.DropListService.InitConstDropDownList(this.drpType, DropListService.Group_CertificateType, true); ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); // 绑定表格 BindGrid(); @@ -190,6 +191,10 @@ namespace FineUIPro.Web.BaseInfo { this.ckbIsRegisterHSSE.Checked = true; } + if (!string.IsNullOrEmpty(certificate.Type)) + { + this.drpType.SelectedValue = certificate.Type; + } this.txtRemark.Text = certificate.Remark; hfFormID.Text = Id; this.btnDelete.Enabled = true; @@ -219,9 +224,13 @@ namespace FineUIPro.Web.BaseInfo { certificate.CertificateType = this.drpCertificateType.SelectedValue; } + if (this.drpType.SelectedValue != BLL.Const._Null) + { + certificate.Type = this.drpType.SelectedValue; + } if (string.IsNullOrEmpty(strRowID)) { - certificate.CertificateId = SQLHelper.GetNewID(typeof(Model.Base_Certificate)); + certificate.CertificateId = SQLHelper.GetNewID(); BLL.CertificateService.AddCertificate(certificate); BLL.LogService.AddSys_Log(this.CurrUser, certificate.CertificateCode, certificate.CertificateId, BLL.Const.CertificateMenuId, BLL.Const.BtnAdd); } @@ -302,5 +311,26 @@ namespace FineUIPro.Web.BaseInfo } } #endregion + + #region 根据身份证号码获取年龄 + /// + /// 根据身份证号码获取年龄 + /// + /// + /// + protected string ConvertType(object Type) + { + string name = string.Empty; + if (Type != null) + { + var doplist = DropListService.HSSE_getCertificateType().FirstOrDefault(x => x.Value == Type.ToString()); + if (doplist != null) + { + name = doplist.Text; + } + } + return name; + } + #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx.designer.cs b/SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx.designer.cs index 24e3ba02..59640ba2 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.BaseInfo { - - - public partial class Certificate { - +namespace FineUIPro.Web.BaseInfo +{ + + + public partial class Certificate + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel1; - + /// /// Grid1 控件。 /// @@ -47,7 +49,16 @@ namespace FineUIPro.Web.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + + /// + /// Label1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label1; + /// /// ToolbarSeparator1 控件。 /// @@ -56,7 +67,7 @@ namespace FineUIPro.Web.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; - + /// /// ToolbarText1 控件。 /// @@ -65,7 +76,7 @@ namespace FineUIPro.Web.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarText ToolbarText1; - + /// /// ddlPageSize 控件。 /// @@ -74,7 +85,7 @@ namespace FineUIPro.Web.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList ddlPageSize; - + /// /// SimpleForm1 控件。 /// @@ -83,7 +94,7 @@ namespace FineUIPro.Web.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.SimpleForm SimpleForm1; - + /// /// hfFormID 控件。 /// @@ -92,7 +103,7 @@ namespace FineUIPro.Web.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox hfFormID; - + /// /// txtCertificateCode 控件。 /// @@ -101,7 +112,7 @@ namespace FineUIPro.Web.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtCertificateCode; - + /// /// txtCertificateName 控件。 /// @@ -110,7 +121,7 @@ namespace FineUIPro.Web.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtCertificateName; - + /// /// drpCertificateType 控件。 /// @@ -119,7 +130,7 @@ namespace FineUIPro.Web.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpCertificateType; - + /// /// ckbIsRegisterHSSE 控件。 /// @@ -128,7 +139,16 @@ namespace FineUIPro.Web.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.CheckBox ckbIsRegisterHSSE; - + + /// + /// drpType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpType; + /// /// txtRemark 控件。 /// @@ -137,7 +157,7 @@ namespace FineUIPro.Web.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtRemark; - + /// /// Toolbar1 控件。 /// @@ -146,7 +166,7 @@ namespace FineUIPro.Web.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// btnNew 控件。 /// @@ -155,7 +175,7 @@ namespace FineUIPro.Web.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnNew; - + /// /// btnDelete 控件。 /// @@ -164,7 +184,7 @@ namespace FineUIPro.Web.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnDelete; - + /// /// ToolbarFill1 控件。 /// @@ -173,7 +193,7 @@ namespace FineUIPro.Web.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// btnSave 控件。 /// @@ -182,7 +202,7 @@ namespace FineUIPro.Web.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSave; - + /// /// Menu1 控件。 /// @@ -191,7 +211,7 @@ namespace FineUIPro.Web.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Menu Menu1; - + /// /// btnMenuEdit 控件。 /// @@ -200,7 +220,7 @@ namespace FineUIPro.Web.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuButton btnMenuEdit; - + /// /// btnMenuDelete 控件。 /// diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 72c76f81..8199eadb 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -13946,7 +13946,7 @@ True 0 / - http://localhost:6562/ + http://localhost:12528/ False False diff --git a/SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs b/SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs index a07adb31..01520e0b 100644 --- a/SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs @@ -916,11 +916,8 @@ namespace FineUIPro.Web.Person left join Base_Project P on C.ProjectId=P.ProjectId where 1=1 "; List listStr = new List(); - if (this.CurrUser.PersonId != BLL.Const.sysglyId && this.CurrUser.PersonId != BLL.Const.hfnbdId) - { - strSql += " AND C.UserId=@UserId "; - listStr.Add(new SqlParameter("@UserId", this.PersonId)); - } + strSql += " AND C.UserId=@UserId "; + listStr.Add(new SqlParameter("@UserId", this.PersonId ?? "")); SqlParameter[] parameter = listStr.ToArray(); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index cfb8d5ab..9811acb6 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -10804,8 +10804,6 @@ namespace Model private EntityRef _Person_Persons; - private EntitySet _ActionPlan_ActionPlanListApprove; - #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -10844,7 +10842,6 @@ namespace Model { this._Base_Project = default(EntityRef); this._Person_Persons = default(EntityRef); - this._ActionPlan_ActionPlanListApprove = new EntitySet(new Action(this.attach_ActionPlan_ActionPlanListApprove), new Action(this.detach_ActionPlan_ActionPlanListApprove)); OnCreated(); } @@ -11204,19 +11201,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ActionPlan_ActionPlanListApprove_ActionPlan_ActionPlanList", Storage="_ActionPlan_ActionPlanListApprove", ThisKey="ActionPlanListId", OtherKey="ActionPlanListId", DeleteRule="NO ACTION")] - public EntitySet ActionPlan_ActionPlanListApprove - { - get - { - return this._ActionPlan_ActionPlanListApprove; - } - set - { - this._ActionPlan_ActionPlanListApprove.Assign(value); - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -11236,18 +11220,6 @@ namespace Model this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); } } - - private void attach_ActionPlan_ActionPlanListApprove(ActionPlan_ActionPlanListApprove entity) - { - this.SendPropertyChanging(); - entity.ActionPlan_ActionPlanList = this; - } - - private void detach_ActionPlan_ActionPlanListApprove(ActionPlan_ActionPlanListApprove entity) - { - this.SendPropertyChanging(); - entity.ActionPlan_ActionPlanList = null; - } } [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.ActionPlan_ActionPlanListApprove")] @@ -11280,8 +11252,6 @@ namespace Model private System.Nullable _IsPushOa; - private EntityRef _ActionPlan_ActionPlanList; - private EntityRef _Person_Persons; #region 可扩展性方法定义 @@ -11316,7 +11286,6 @@ namespace Model public ActionPlan_ActionPlanListApprove() { - this._ActionPlan_ActionPlanList = default(EntityRef); this._Person_Persons = default(EntityRef); OnCreated(); } @@ -11352,10 +11321,6 @@ namespace Model { if ((this._ActionPlanListId != value)) { - if (this._ActionPlan_ActionPlanList.HasLoadedOrAssignedValue) - { - throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); - } this.OnActionPlanListIdChanging(value); this.SendPropertyChanging(); this._ActionPlanListId = value; @@ -11429,7 +11394,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(2000)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(200)")] public string ApproveIdea { get @@ -11569,40 +11534,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ActionPlan_ActionPlanListApprove_ActionPlan_ActionPlanList", Storage="_ActionPlan_ActionPlanList", ThisKey="ActionPlanListId", OtherKey="ActionPlanListId", IsForeignKey=true)] - public ActionPlan_ActionPlanList ActionPlan_ActionPlanList - { - get - { - return this._ActionPlan_ActionPlanList.Entity; - } - set - { - ActionPlan_ActionPlanList previousValue = this._ActionPlan_ActionPlanList.Entity; - if (((previousValue != value) - || (this._ActionPlan_ActionPlanList.HasLoadedOrAssignedValue == false))) - { - this.SendPropertyChanging(); - if ((previousValue != null)) - { - this._ActionPlan_ActionPlanList.Entity = null; - previousValue.ActionPlan_ActionPlanListApprove.Remove(this); - } - this._ActionPlan_ActionPlanList.Entity = value; - if ((value != null)) - { - value.ActionPlan_ActionPlanListApprove.Add(this); - this._ActionPlanListId = value.ActionPlanListId; - } - else - { - this._ActionPlanListId = default(string); - } - this.SendPropertyChanged("ActionPlan_ActionPlanList"); - } - } - } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ActionPlan_ActionPlanListApprove_Person_Persons", Storage="_Person_Persons", ThisKey="ApproveMan", OtherKey="PersonId", IsForeignKey=true)] public Person_Persons Person_Persons { @@ -15770,6 +15701,8 @@ namespace Model private System.Nullable _IsRegisterHSSE; + private string _Type; + private EntitySet _QualityAudit_EquipmentPersonQuality; private EntitySet _QualityAudit_PersonQuality; @@ -15790,6 +15723,8 @@ namespace Model partial void OnCertificateTypeChanged(); partial void OnIsRegisterHSSEChanging(System.Nullable value); partial void OnIsRegisterHSSEChanged(); + partial void OnTypeChanging(string value); + partial void OnTypeChanged(); #endregion public Base_Certificate() @@ -15919,6 +15854,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Type", DbType="VarChar(10)")] + public string Type + { + get + { + return this._Type; + } + set + { + if ((this._Type != value)) + { + this.OnTypeChanging(value); + this.SendPropertyChanging(); + this._Type = value; + this.SendPropertyChanged("Type"); + this.OnTypeChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_QualityAudit_EquipmentPersonQuality_Base_Certificate", Storage="_QualityAudit_EquipmentPersonQuality", ThisKey="CertificateId", OtherKey="CertificateId", DeleteRule="NO ACTION")] public EntitySet QualityAudit_EquipmentPersonQuality { @@ -148750,7 +148705,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(3000)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(500)")] public string AttentPerson { get