diff --git a/DataBase/版本日志/SGGLDB_V2024-02-28.sql b/DataBase/版本日志/SGGLDB_V2024-02-28.sql new file mode 100644 index 00000000..0789e374 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2024-02-28.sql @@ -0,0 +1,10 @@ +ALTER TABLE ProjectSupervision_RectifyItem ADD HiddenHazardType NVARCHAR(50) NULL +GO +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'1-һ㣬2-ϴ3-ش' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ProjectSupervision_RectifyItem', @level2type=N'COLUMN',@level2name=N'HiddenHazardType' +GO +ALTER TABLE ProjectSupervision_RectifyItem ALTER COLUMN WrongContent NVARCHAR(500) NULL +GO +ALTER TABLE ProjectSupervision_RectifyItem ALTER COLUMN Requirement NVARCHAR(500) NULL +GO +ALTER TABLE ProjectSupervision_RectifyItem ALTER COLUMN RectifyResults NVARCHAR(500) NULL +GO \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentQualityEdit.aspx b/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentQualityEdit.aspx index a966adf7..a743aae7 100644 --- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentQualityEdit.aspx +++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentQualityEdit.aspx @@ -42,7 +42,7 @@ - - + 隐患整改 - + @@ -19,31 +19,33 @@ - + - - + - - + + + <%-- - + --%> @@ -51,25 +53,25 @@ - + - + + + - - + - @@ -149,7 +163,7 @@ - + @@ -157,6 +171,6 @@ Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px" Height="500px"> - + diff --git a/SGGL/FineUIPro.Web/OfficeCheck/Check/RectifyEdit.aspx.cs b/SGGL/FineUIPro.Web/OfficeCheck/Check/RectifyEdit.aspx.cs index 7c057bb3..3de15077 100644 --- a/SGGL/FineUIPro.Web/OfficeCheck/Check/RectifyEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/OfficeCheck/Check/RectifyEdit.aspx.cs @@ -1,8 +1,6 @@ using BLL; -using FineUIPro.Web.DataShow; using Model; using Newtonsoft.Json.Linq; -using NPOI.SS.Formula.Functions; using System; using System.Collections.Generic; using System.Data; @@ -51,7 +49,7 @@ namespace FineUIPro.Web.OfficeCheck.Check this.btnSave.Hidden = true; this.btnAdd.Hidden = true; this.btnSubmit.Hidden = true; - this.Grid1.Columns[8].Hidden = true; + this.Grid1.Columns[9].Hidden = true; } this.CheckNoticeId = Request.Params["CheckNoticeId"]; @@ -71,16 +69,14 @@ namespace FineUIPro.Web.OfficeCheck.Check this.txtCheckPerson.Text = getRectify.CheckManNames; this.txtRectifyNoticesCode.Text = getRectify.RectifyCode; this.txtCheckedDate.Text = getRectify.CheckedDate.ToString(); - if (!string.IsNullOrEmpty(getRectify.HiddenHazardType)) - { - this.drpHiddenHazardType.SelectedValue = getRectify.HiddenHazardType; - } + //if (!string.IsNullOrEmpty(getRectify.HiddenHazardType)) + //{ + // this.drpHiddenHazardType.SelectedValue = getRectify.HiddenHazardType; + //} if (!string.IsNullOrEmpty(getRectify.SignPerson)) { this.drpSignPerson.SelectedValue = getRectify.SignPerson; - } - BindGrid(); - + } if (getRectify.States == Const.State_1 || getRectify.States == Const.State_2) { this.btnSure.Hidden = false; @@ -112,6 +108,7 @@ namespace FineUIPro.Web.OfficeCheck.Check this.txtCheckedDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); } + BindGrid(); rectifyItemLists.Clear(); } } @@ -132,10 +129,24 @@ namespace FineUIPro.Web.OfficeCheck.Check /// public void BindGrid() { - string strSql = @"select RectifyItemId, RectifyId, WrongContent, Requirement, LimitTime, RectifyResults, IsRectify from ProjectSupervision_RectifyItem "; - List listStr = new List(); - strSql += "where RectifyId = @RectifyId"; - listStr.Add(new SqlParameter("@RectifyId", this.hdRectifyNoticesId.Text)); + string strSql = string.Empty; + List listStr = new List(); + if (Funs.DB.ProjectSupervision_RectifyItem.FirstOrDefault(x => x.RectifyId == this.hdRectifyNoticesId.Text) != null) + { + strSql = @"select RectifyItemId,WrongContent,Requirement,LimitTime,RectifyResults,IsRectify,HiddenHazardType,null as CheckReportItemId + from ProjectSupervision_RectifyItem + where RectifyId = @RectifyId"; + listStr.Add(new SqlParameter("@RectifyId", this.hdRectifyNoticesId.Text)); + } + else + { + strSql = @"select newid() as RectifyItemId,UnConformItem as WrongContent,null as Requirement,null as LimitTime, null as RectifyResults,0 as IsRectify,'1' as HiddenHazardType,item.CheckReportItemId + from ProjectSupervision_CheckReportItem as item + left join ProjectSupervision_CheckReport as Report on item.CheckReportId=Report.CheckReportId + where Report.CheckNoticeId = @CheckNoticeId"; + listStr.Add(new SqlParameter("@CheckNoticeId", this.CheckNoticeId)); + } + SqlParameter[] parameter = listStr.ToArray(); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); var table = this.GetPagedDataTable(Grid1, tb); @@ -149,7 +160,7 @@ namespace FineUIPro.Web.OfficeCheck.Check { addViewTestPlanTrainingList(); Model.ProjectSupervision_RectifyItem notice = new Model.ProjectSupervision_RectifyItem(); - notice.RectifyItemId = SQLHelper.GetNewID(typeof(Model.ProjectSupervision_RectifyItem)); + notice.RectifyItemId = SQLHelper.GetNewID(); rectifyItemLists.Add(notice); //将gd数据保存在list中 Grid1.DataSource = rectifyItemLists; @@ -171,8 +182,9 @@ namespace FineUIPro.Web.OfficeCheck.Check string rectifyNoticesItemId = values.Value("RectifyItemId"); string requirement = values.Value("Requirement"); string rectifyResults = values.Value("RectifyResults"); - System.Web.UI.WebControls.TextBox txtlimitTim = (System.Web.UI.WebControls.TextBox)Grid1.Rows[i].FindControl("txtLimitTimes"); - System.Web.UI.WebControls.DropDownList drpIsRect = (System.Web.UI.WebControls.DropDownList)Grid1.Rows[i].FindControl("drpIsRectify"); + TextBox txtlimitTim = (TextBox)Grid1.Rows[i].FindControl("txtLimitTimes"); + + var item = new ProjectSupervision_RectifyItem(); item.RectifyItemId = rectifyNoticesItemId; item.RectifyId = hdRectifyNoticesId.Text.Trim(); @@ -180,6 +192,10 @@ namespace FineUIPro.Web.OfficeCheck.Check item.Requirement = requirement; item.LimitTime = Funs.GetNewDateTime(txtlimitTim.Text); item.RectifyResults = rectifyResults; + DropDownList drpIsRect = (DropDownList)Grid1.Rows[i].FindControl("drpIsRectify"); + item.IsRectify =Convert.ToBoolean( drpIsRect.SelectedValue); + DropDownList drpHiddenHazardType = (DropDownList)Grid1.Rows[i].FindControl("drpHiddenHazardTypeify"); + item.HiddenHazardType = drpHiddenHazardType.SelectedValue; rectifyItemLists.Add(item); } } @@ -242,7 +258,15 @@ namespace FineUIPro.Web.OfficeCheck.Check string itemId = Grid1.DataKeys[e.RowIndex][0].ToString(); if (e.CommandName == "AttachUrl") { - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/Rectify&menuId={1}&type=0&strParam=1", itemId, BLL.Const.CheckInfoMenuId))); + if (Funs.DB.ProjectSupervision_RectifyItem.FirstOrDefault(x => x.RectifyItemId == itemId) != null) + { + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/Rectify&menuId={1}&type=0&strParam=1", itemId, BLL.Const.CheckInfoMenuId))); + } + else + { + string checkReportItemId= Grid1.Rows[e.RowIndex].Values[10].ToString(); + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/Rectify&menuId={1}&type=0&strParam=1", checkReportItemId, BLL.Const.CheckInfoMenuId))); + } } if (e.CommandName == "delete") { @@ -276,6 +300,13 @@ namespace FineUIPro.Web.OfficeCheck.Check drpIsRectify.SelectedValue = "false"; } } + + System.Web.UI.WebControls.DropDownList drpHiddenHazardType = (System.Web.UI.WebControls.DropDownList)(this.Grid1.Rows[i].FindControl("drpHiddenHazardType")); + HiddenField hdHiddenHazardType = (HiddenField)(this.Grid1.Rows[i].FindControl("hdHiddenHazardType")); + if (!string.IsNullOrEmpty(hdHiddenHazardType.Text)) + { + drpHiddenHazardType.SelectedValue = hdHiddenHazardType.Text; + } } } #endregion @@ -345,10 +376,10 @@ namespace FineUIPro.Web.OfficeCheck.Check { Notices.CheckedDate = Convert.ToDateTime(this.txtCheckedDate.Text.Trim()); } - if (this.drpHiddenHazardType.SelectedValue != BLL.Const._Null) - { - Notices.HiddenHazardType = this.drpHiddenHazardType.SelectedValue; - } + //if (this.drpHiddenHazardType.SelectedValue != BLL.Const._Null) + //{ + // Notices.HiddenHazardType = this.drpHiddenHazardType.SelectedValue; + //} if (this.drpSignPerson.SelectedValue != BLL.Const._Null) { Notices.SignPerson = this.drpSignPerson.SelectedValue; @@ -398,6 +429,7 @@ namespace FineUIPro.Web.OfficeCheck.Check string rectifyResults = values.Value("RectifyResults"); System.Web.UI.WebControls.TextBox txtlimitTim = (System.Web.UI.WebControls.TextBox)Grid1.Rows[i].FindControl("txtLimitTimes"); System.Web.UI.WebControls.DropDownList drpIsRect = (System.Web.UI.WebControls.DropDownList)Grid1.Rows[i].FindControl("drpIsRectify"); + System.Web.UI.WebControls.DropDownList drpHiddenHazardType = (System.Web.UI.WebControls.DropDownList)Grid1.Rows[i].FindControl("drpHiddenHazardType"); string limitTime = txtlimitTim.Text.Trim(); Model.ProjectSupervision_RectifyItem rectifyNoticesItem = Funs.DB.ProjectSupervision_RectifyItem.FirstOrDefault(e => e.RectifyItemId == rectifyNoticesItemId); if (rectifyNoticesItem != null) @@ -408,6 +440,7 @@ namespace FineUIPro.Web.OfficeCheck.Check rectifyNoticesItem.Requirement = requirement.Trim(); rectifyNoticesItem.LimitTime = Funs.GetNewDateTime(limitTime); rectifyNoticesItem.RectifyResults = rectifyResults.Trim(); + rectifyNoticesItem.HiddenHazardType = drpHiddenHazardType.SelectedValue; rectifyNoticesItem.IsRectify = Convert.ToBoolean(drpIsRect.SelectedValue); Funs.DB.SubmitChanges(); if (rectifyNoticesItem.IsRectify == true) @@ -417,7 +450,6 @@ namespace FineUIPro.Web.OfficeCheck.Check } else { - var item = new ProjectSupervision_RectifyItem(); item.RectifyItemId = rectifyNoticesItemId; item.RectifyId = this.hdRectifyNoticesId.Text.Trim(); @@ -425,9 +457,17 @@ namespace FineUIPro.Web.OfficeCheck.Check item.Requirement = requirement.Trim(); item.LimitTime = Funs.GetNewDateTime(limitTime); item.RectifyResults = rectifyResults.Trim(); + item.HiddenHazardType = drpHiddenHazardType.SelectedValue; item.IsRectify = Convert.ToBoolean(drpIsRect.SelectedValue); Funs.DB.ProjectSupervision_RectifyItem.InsertOnSubmit(item); Funs.DB.SubmitChanges(); + + string hdCheckReportItemId = values.Value("CheckReportItemId"); + var getAtt = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == hdCheckReportItemId + "#1"); + if (getAtt != null) + { + UploadFileService.SaveAttachUrl(getAtt.AttachSource, getAtt.AttachUrl, BLL.Const.CheckInfoMenuId, item.RectifyItemId + "#1"); + } } } if (j == data.Count) diff --git a/SGGL/FineUIPro.Web/OfficeCheck/Check/RectifyEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/OfficeCheck/Check/RectifyEdit.aspx.designer.cs index 5155165d..8fec0a02 100644 --- a/SGGL/FineUIPro.Web/OfficeCheck/Check/RectifyEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/OfficeCheck/Check/RectifyEdit.aspx.designer.cs @@ -95,15 +95,6 @@ namespace FineUIPro.Web.OfficeCheck.Check /// protected global::FineUIPro.DatePicker txtCheckedDate; - /// - /// drpHiddenHazardType 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DropDownList drpHiddenHazardType; - /// /// Toolbar1 控件。 /// @@ -194,6 +185,24 @@ namespace FineUIPro.Web.OfficeCheck.Check /// protected global::FineUIPro.TextBox tWrongContent; + /// + /// drpHiddenHazardType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.DropDownList drpHiddenHazardType; + + /// + /// hdHiddenHazardType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField hdHiddenHazardType; + /// /// tRequirement 控件。 /// diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 738f10eb..1adff4c6 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -204153,6 +204153,8 @@ namespace Model private string _States; + private string _HiddenHazardType; + private EntityRef _ProjectSupervision_Rectify; #region 可扩展性方法定义 @@ -204175,6 +204177,8 @@ namespace Model partial void OnIsRectifyChanged(); partial void OnStatesChanging(string value); partial void OnStatesChanged(); + partial void OnHiddenHazardTypeChanging(string value); + partial void OnHiddenHazardTypeChanged(); #endregion public ProjectSupervision_RectifyItem() @@ -204347,6 +204351,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HiddenHazardType", DbType="NVarChar(50)")] + public string HiddenHazardType + { + get + { + return this._HiddenHazardType; + } + set + { + if ((this._HiddenHazardType != value)) + { + this.OnHiddenHazardTypeChanging(value); + this.SendPropertyChanging(); + this._HiddenHazardType = value; + this.SendPropertyChanged("HiddenHazardType"); + this.OnHiddenHazardTypeChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ProjectSupervision_RectifyItem_ProjectSupervision_Rectify", Storage="_ProjectSupervision_Rectify", ThisKey="RectifyId", OtherKey="RectifyId", IsForeignKey=true)] public ProjectSupervision_Rectify ProjectSupervision_Rectify {