diff --git a/DataBase/版本日志/SGGLDB_WH_2023-09-05.sql b/DataBase/版本日志/SGGLDB_WH_2023-09-05.sql new file mode 100644 index 00000000..a220c6c1 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2023-09-05.sql @@ -0,0 +1,108 @@ +--ȫʩurlijʩ +update sys_menu set url='CQMS/Solution/ConstructSolution.aspx' +where url='HSSE/Solution/ConstructSolution.aspx' and menuname='ʩ' and MenuType='Menu_HSSE' + +--α꽫ȫʩݲʩ +DECLARE @ConstructSolutionId nvarchar(50), +@ProjectId nvarchar(50), +@ConstructSolutionName nvarchar(50),-- +@UnitId nvarchar(50),--ʩλ +@SolutinType nvarchar(50),-- +@ConstructSolutionCode nvarchar(50),-- +@CompileDate datetime,--ʱ +@CompileMan nvarchar(50),-- +@States nvarchar(20), --ȫ״̬ +@State nvarchar(20)--״̬ + + +DECLARE My_Cursor CURSOR --α +FOR ( SELECT ConstructSolutionId, ProjectId,UnitId,SolutinType,ConstructSolutionCode +,ConstructSolutionName,CompileDate,CompileMan,States FROM Solution_ConstructSolution ) +OPEN My_Cursor;--α +FETCH NEXT FROM My_Cursor INTO @ConstructSolutionId,@ProjectId,@UnitId,@SolutinType,@ConstructSolutionCode, +@ConstructSolutionName, +@CompileDate,@CompileMan,@States;--ȡһ +WHILE @@FETCH_STATUS=0 + --α״̬жϣΪ0֤αֵ + BEGIN + --״̬ + if(@States='2') + begin + set @State='3'--״̬ѱպ + end + else + begin + set @State='1'--δպ + end + + --ݲʩ + INSERT INTO Solution_CQMSConstructSolution(ConstructSolutionId,ProjectId,Code + ,SolutionName,UnitId,SolutionType,CompileDate,CompileMan,State) + values(@ConstructSolutionId,@ProjectId,@ConstructSolutionCode, + @ConstructSolutionName,@UnitId,@SolutinType, + @CompileDate,@CompileMan,@State); + --븽 + insert into AttachFile(AttachFileId,ToKeyId,AttachSource,AttachUrl,menuid,AttachPath,ImageByte) + select newid(),ToKeyId,AttachSource,AttachUrl,'91C4BFDB-0A51-4992-99CC-EB4EC185593D',AttachPath,ImageByte from AttachFile + where ToKeyId=@ConstructSolutionId + + + FETCH NEXT + FROM + My_Cursor INTO @ConstructSolutionId,@ProjectId,@UnitId,@SolutinType,@ConstructSolutionCode, + @ConstructSolutionName, + @CompileDate,@CompileMan,@States; + + END CLOSE My_Cursor;--رα +DEALLOCATE My_Cursor;--ͷα +GO + +--insert into Technique_CheckItemSet(CheckItemSetId,CheckItemName,SupCheckItem,CheckType,MapCode,IsEndLever,SortIndex) +--values('43594e1e-66e2-4664-bad7-feb12ea4844a','ۺ','0','2','10','0','4') +--ɾר -ۺ -ͷ׷ +delete from Check_CheckSpecial where CheckItemSetId='43594e1e-66e2-4664-bad7-feb12ea4844a' +delete from Technique_CheckItemSet where CheckItemSetId='43594e1e-66e2-4664-bad7-feb12ea4844a' +go +delete from Check_CheckSpecial where CheckItemSetId='4324d0f5-cf7b-4e89-be56-45ba131f5f2f' +delete from Technique_CheckItemSet where CheckItemSetId='4324d0f5-cf7b-4e89-be56-45ba131f5f2f' +go + +--רϸֶ-ݡ +alter table Check_CheckSpecialDetail add CheckItemSetId nvarchar(50) null; +alter table Check_CheckSpecialDetail add CheckItemSetContent nvarchar(3000) null; +alter table Check_CheckSpecialDetail add Rectification_Date datetime null; +go + +--Ϊͼ +/*LEFT JOIN Sys_Const AS const ON const.ConstValue = detail.HandleStep and const.GroupId='HandleStep'*/ +ALTER VIEW [dbo].[View_CheckSpecialDetail] +AS +SELECT detail.CheckSpecialDetailId, detail.CheckSpecialId, detail.CheckItem, checkItemSet.CheckItemName, detail.Unqualified, + detail.SortIndex, detail.UnitId, detail.HandleStep, detail.CompleteStatus, + (CASE WHEN detail.CompleteStatus = 1 THEN '' ELSE '' END) AS CompleteStatusName, detail.LimitedDate, + detail.CompletedDate, detail.CheckContent, detail.CheckArea, + workArea.UnitWorkName + (CASE WHEN workArea.ProjectType = '1' THEN '()' WHEN workArea.ProjectType = '2' THEN '(װ)' + ELSE '' END) AS CheckAreaName, detail.DataId, detail.DataType, unit.UnitName, + dbo.GetConstTextByIds(detail.HandleStep) AS HandleStepStr, + (CASE WHEN detail.DataType LIKE '%1%' THEN '·ĵ:' + + (SELECT RectifyNoticesCode + FROM Check_RectifyNotices + WHERE detail.DataId LIKE '%' + RectifyNoticesId + '%') ELSE '' END) + + (CASE WHEN detail.DataType LIKE '%2%' THEN '·:' + + (SELECT PunishNoticeCode + FROM Check_PunishNotice + WHERE detail.DataId LIKE '%' + PunishNoticeId + '%') ELSE '' END) + + (CASE WHEN detail.DataType = '3' THEN '·ͣ:' + + (SELECT PauseNoticeCode + FROM Check_PauseNotice + WHERE detail.DataId LIKE '%' + PauseNoticeId + '%') ELSE '' END) AS HandleStepLink, detail.HiddenHazardType, + (CASE WHEN detail.HiddenHazardType = '3' THEN 'ش' WHEN detail.HiddenHazardType = '2' THEN 'ϴ' WHEN detail.HiddenHazardType + = '1' THEN 'һ' ELSE '' END) AS HiddenHazardTypeName, detail.CheckItemSetId, detail.CheckItemSetContent, + detail.Rectification_Date +FROM dbo.Check_CheckSpecialDetail AS detail LEFT OUTER JOIN + dbo.Technique_CheckItemSet AS checkItemSet ON checkItemSet.CheckItemSetId = detail.CheckItem LEFT OUTER JOIN + dbo.Base_Unit AS unit ON unit.UnitId = detail.UnitId LEFT OUTER JOIN + dbo.WBS_UnitWork AS workArea ON detail.CheckArea = workArea.UnitWorkId + +GO + diff --git a/SGGL/BLL/API/HSSE/APICheckSpecialService.cs b/SGGL/BLL/API/HSSE/APICheckSpecialService.cs index 8f304a49..76ddef25 100644 --- a/SGGL/BLL/API/HSSE/APICheckSpecialService.cs +++ b/SGGL/BLL/API/HSSE/APICheckSpecialService.cs @@ -282,6 +282,10 @@ namespace BLL CompleteStatus = x.CompleteStatus, CompleteStatusName = x.CompleteStatus == true ? "已整改" : "待整改", AttachUrl1 = APIUpLoadFileService.getFileUrl(x.CheckSpecialDetailId, null), + + CheckItemDetailSetId=x.CheckItemSetId, + CheckItemDetailContent=x.CheckItemSetContent, + Rectification_Date=x.Rectification_Date }; return getInfo.First(); } @@ -316,6 +320,11 @@ namespace BLL WorkArea = newDetail.WorkArea, CheckArea = newDetail.WorkAreaId, CheckContent = newDetail.CheckContent, + + //整改日期、检查内容、检查内容id + CheckItemSetId= newDetail.CheckItemDetailSetId, + CheckItemSetContent= newDetail.CheckItemDetailContent, + Rectification_Date=newDetail.Rectification_Date }; if (newCheckSpecialDetail.CompleteStatus == false && newCheckSpecialDetail.HandleStep.Contains("1") && string.IsNullOrEmpty(newCheckSpecialDetail.HiddenHazardType)) { @@ -357,6 +366,11 @@ namespace BLL updateDetail.WorkArea = newCheckSpecialDetail.WorkArea; updateDetail.CheckArea = newCheckSpecialDetail.CheckArea; updateDetail.CheckContent = newCheckSpecialDetail.CheckContent; + + //整改日期、检查内容、检查内容id + updateDetail.CheckItemSetId = newDetail.CheckItemDetailSetId; + updateDetail.CheckItemSetContent = newDetail.CheckItemDetailContent; + updateDetail.Rectification_Date = newDetail.Rectification_Date; db.SubmitChanges(); } ////保存附件 diff --git a/SGGL/BLL/HSSE/Check/Check_CheckSpecialDetailService.cs b/SGGL/BLL/HSSE/Check/Check_CheckSpecialDetailService.cs index bc2c8d67..3e2bdae8 100644 --- a/SGGL/BLL/HSSE/Check/Check_CheckSpecialDetailService.cs +++ b/SGGL/BLL/HSSE/Check/Check_CheckSpecialDetailService.cs @@ -58,6 +58,9 @@ namespace BLL WorkArea = checkSpecialDetail.WorkArea, CheckContent = checkSpecialDetail.CheckContent, HiddenHazardType=checkSpecialDetail.HiddenHazardType, + CheckItemSetId= checkSpecialDetail.CheckItemSetId, + CheckItemSetContent= checkSpecialDetail.CheckItemSetContent, + Rectification_Date= checkSpecialDetail.Rectification_Date }; db.Check_CheckSpecialDetail.InsertOnSubmit(newCheckSpecialDetail); db.SubmitChanges(); @@ -87,6 +90,10 @@ namespace BLL newCheckSpecialDetail.Suggestions = CheckSpecialDetail.Suggestions; newCheckSpecialDetail.WorkArea = CheckSpecialDetail.WorkArea; newCheckSpecialDetail.CheckContent = CheckSpecialDetail.CheckContent; + + newCheckSpecialDetail.CheckItemSetId = CheckSpecialDetail.CheckItemSetId; + newCheckSpecialDetail.CheckItemSetContent = CheckSpecialDetail.CheckItemSetContent; + newCheckSpecialDetail.Rectification_Date = CheckSpecialDetail.Rectification_Date; db.SubmitChanges(); } } diff --git a/SGGL/BLL/HSSE/Technique/Technique_CheckItemDetailService.cs b/SGGL/BLL/HSSE/Technique/Technique_CheckItemDetailService.cs index 989fb202..3c013ec4 100644 --- a/SGGL/BLL/HSSE/Technique/Technique_CheckItemDetailService.cs +++ b/SGGL/BLL/HSSE/Technique/Technique_CheckItemDetailService.cs @@ -155,5 +155,26 @@ namespace BLL } return name; } + + /// + /// 检查项明细下拉框 + /// + /// 下拉框名字 + /// 是否显示请选择 + public static void InitCheckItemDetailDropDownList(FineUIPro.DropDownList dropName, string checkItemSetId, bool isShowPlease) + { + dropName.DataValueField = "CheckContent"; + dropName.DataTextField = "CheckContent"; + dropName.DataSource = (from x in Funs.DB.Technique_CheckItemDetail + where x.CheckItemSetId == checkItemSetId + orderby x.SortIndex + select x).ToList(); + dropName.DataBind(); + if (isShowPlease) + { + Funs.FineUIPleaseSelect(dropName); + } + } + } } diff --git a/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx b/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx index 6046af6b..c1d7656b 100644 --- a/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx @@ -44,7 +44,7 @@ + > diff --git a/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.cs index f551f717..b648c52b 100644 --- a/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.cs @@ -561,19 +561,22 @@ namespace FineUIPro.Web.CQMS.Solution else { constructSolution.State = Const.CQMSConstructSolution_Compile; - } - if (!string.IsNullOrEmpty(HFConstructSolutionId.Text)) + } + constructSolution.CompileMan = CurrUser.UserId; + constructSolution.Edition = Convert.ToInt32(txtEdition.Text); + if (!string.IsNullOrEmpty(ConstructSolutionId)) { constructSolution.ConstructSolutionId = HFConstructSolutionId.Text; + CQMSConstructSolutionService.UpdateConstructSolution(constructSolution); } else { constructSolution.ConstructSolutionId = SQLHelper.GetNewID(typeof(Model.Solution_CQMSConstructSolution)); + CQMSConstructSolutionService.AddConstructSolution(constructSolution); } - constructSolution.CompileMan = CurrUser.UserId; - constructSolution.Edition = Convert.ToInt32(txtEdition.Text); + - CQMSConstructSolutionService.AddConstructSolution(constructSolution); + if (saveType == "submit") { Model.Solution_CQMSConstructSolutionApprove approve1 = new Model.Solution_CQMSConstructSolutionApprove(); diff --git a/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialEdit.aspx b/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialEdit.aspx index aed47677..e2e69320 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialEdit.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialEdit.aspx @@ -65,7 +65,7 @@ + EnableTextSelection="True" OnSort="Grid1_Sort" AllowColumnLocking="true"> @@ -84,7 +84,7 @@ + FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="问题描述" > @@ -98,6 +98,25 @@ + + + + + + + + + + + + + + + + @@ -125,10 +144,10 @@ + HeaderTextAlign="Center" HeaderText="删除" EnableLock="true" Locked="true"/> - <%-- --%> + @@ -204,6 +223,25 @@ } } + var drpCheckItemDetailId = '<%= drpCheckItemDetail.ClientID %>'; + + function renderCheckItemDetail(value) { + return F(drpCheckItemDetailId).getTextByValue(value); + } + + //点击检查项给检查项赋值 + function onGridBeforeEdit(event, value, params) { + var grid = F(grid1ClientID); + + if (params.columnId === 'CheckItemSetContent') { + var ddlShi = F(drpCheckItemDetailId); + var shitext = grid.getCellValue(params.rowId, 'CheckItemSetContent'); + ddlShi.setEmptyText(shitext); + /* ddlShi.loadData(shitext);*/ + } + } + + diff --git a/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialEdit.aspx.cs index 98fe0a1d..94442632 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialEdit.aspx.cs @@ -119,6 +119,9 @@ namespace FineUIPro.Web.HSSE.Check { "UnitName", "" }, { "Unqualified", "" }, { "CheckItemName", "" }, + //增加检查项内容和日期 + { "CheckItemSetContent", "" }, + { "Rectification_Date", "" }, { "CompleteStatusName", "" }, { "HandleStepStr", "" }, { "HiddenHazardTypeName", "" }, @@ -309,7 +312,9 @@ namespace FineUIPro.Web.HSSE.Check CheckSpecialId = this.CheckSpecialId, CheckContent = values.Value("CheckItemName"), Unqualified = values.Value("Unqualified"), - // WorkArea = values.Value("WorkArea"), + CheckItemSetContent = values.Value("CheckItemSetContent"), + Rectification_Date= values.Value("Rectification_Date"), + // WorkArea = values.Value("WorkArea"), }; var getUnit = Funs.DB.Base_Unit.FirstOrDefault(x => x.UnitName == values.Value("UnitName")); if (getUnit != null) @@ -372,7 +377,14 @@ namespace FineUIPro.Web.HSSE.Check if (getCheckItem != null) { newDetail.CheckItem = getCheckItem.CheckItemSetId; + //插入检查项内容id + var getCheckItemSet = Funs.DB.Technique_CheckItemDetail.FirstOrDefault(x => x.CheckItemSetId == getCheckItem.CheckItemSetId && x.CheckContent == newDetail.CheckItemSetContent); + if (getCheckItemSet != null) + { + newDetail.CheckItemSetId = getCheckItemSet.CheckItemDetailId; + } } + newDetail.SortIndex = rowIndex; Check_CheckSpecialDetailService.AddCheckSpecialDetail(newDetail); detailLists.Add(newDetail); @@ -472,6 +484,9 @@ namespace FineUIPro.Web.HSSE.Check { this.drpSupCheckItemSet.Items.Clear(); this.drpCheckItem.Items.Clear(); + + //检查项内容清空 + this.drpCheckItemDetail.Items.Clear(); if (this.rbType.SelectedValue == "1") { this.drpSupCheckItemSet.SelectedIndex = 0; @@ -484,14 +499,36 @@ namespace FineUIPro.Web.HSSE.Check Technique_CheckItemSetService.InitCheckItemSetDropDownList(this.drpSupCheckItemSet, "2", "0", false); this.drpSupCheckItemSet.SelectedIndex = 0; Technique_CheckItemSetService.InitCheckItemSetNameDropDownList(this.drpCheckItem, "2", this.drpSupCheckItemSet.SelectedValue, false); + //加载检查项内容下拉 + var getCheckItem = Funs.DB.Technique_CheckItemSet.FirstOrDefault(x => x.SupCheckItem == this.drpSupCheckItemSet.SelectedValue && x.CheckItemName == this.drpCheckItem.SelectedValue); + var checkItemSetId = getCheckItem.CheckItemSetId; + Technique_CheckItemDetailService.InitCheckItemDetailDropDownList(this.drpCheckItemDetail, checkItemSetId, false); } this.drpCheckItem.SelectedValue = null; + this.drpCheckItemDetail.SelectedValue = null; } protected void drpCheckItem_SelectedIndexChanged(object sender, EventArgs e) { + this.drpCheckItemDetail.Items.Clear(); this.drpCheckItem.SelectedValueArray = Funs.RemoveDropDownListNull(this.drpCheckItem.SelectedValueArray); + + if (!string.IsNullOrEmpty(this.drpCheckItem.SelectedValue)) + { + //加载检查项内容下拉 + var getCheckItem = Funs.DB.Technique_CheckItemSet. + FirstOrDefault(x => x.SupCheckItem == this.drpSupCheckItemSet.SelectedValue && x.CheckItemName == this.drpCheckItem.SelectedValue); + var checkItemSetId = getCheckItem.CheckItemSetId; + Technique_CheckItemDetailService.InitCheckItemDetailDropDownList(this.drpCheckItemDetail, checkItemSetId, false); + } + + + } + + protected void drpCheckItemDetail_SelectedIndexChanged(object sender, EventArgs e) + { + this.drpCheckItemDetail.SelectedValueArray = Funs.RemoveDropDownListNull(this.drpCheckItemDetail.SelectedValueArray); } protected void Grid1_Sort(object sender, GridSortEventArgs e) diff --git a/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialEdit.aspx.designer.cs index 77212111..f6fbfa18 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialEdit.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.HSSE.Check { - - - public partial class CheckSpecialEdit { - +namespace FineUIPro.Web.HSSE.Check +{ + + + public partial class CheckSpecialEdit + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// SimpleForm1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// txtCheckSpecialCode 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtCheckSpecialCode; - + /// /// rbType 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.RadioButtonList rbType; - + /// /// drpSupCheckItemSet 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpSupCheckItemSet; - + /// /// txtCheckDate 控件。 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtCheckDate; - + /// /// drpPartInPersons 控件。 /// @@ -83,7 +85,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpPartInPersons; - + /// /// txtPartInPersonNames 控件。 /// @@ -92,7 +94,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtPartInPersonNames; - + /// /// btnNew 控件。 /// @@ -101,7 +103,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnNew; - + /// /// Grid1 控件。 /// @@ -110,7 +112,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// drpCheckArea 控件。 /// @@ -119,7 +121,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpCheckArea; - + /// /// drpWorkUnit 控件。 /// @@ -128,7 +130,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpWorkUnit; - + /// /// txtUnqualified 控件。 /// @@ -137,7 +139,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtUnqualified; - + /// /// drpCheckItem 控件。 /// @@ -146,7 +148,25 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpCheckItem; - + + /// + /// drpCheckItemDetail 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpCheckItemDetail; + + /// + /// txtRectification_Date 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtRectification_Date; + /// /// drpCompleteStatus 控件。 /// @@ -155,7 +175,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpCompleteStatus; - + /// /// drpHandleStep 控件。 /// @@ -164,7 +184,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpHandleStep; - + /// /// drpHiddenHazardType 控件。 /// @@ -173,7 +193,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpHiddenHazardType; - + /// /// Toolbar1 控件。 /// @@ -182,7 +202,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// lbTemp 控件。 /// @@ -191,7 +211,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label lbTemp; - + /// /// btnAttachUrl 控件。 /// @@ -200,7 +220,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnAttachUrl; - + /// /// ToolbarFill1 控件。 /// @@ -209,7 +229,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// btnSave 控件。 /// @@ -218,7 +238,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSave; - + /// /// btnSubmit 控件。 /// @@ -227,7 +247,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSubmit; - + /// /// btnClose 控件。 /// @@ -236,7 +256,7 @@ namespace FineUIPro.Web.HSSE.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnClose; - + /// /// WindowAtt 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialView.aspx b/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialView.aspx index 0dd73116..3e87226e 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialView.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialView.aspx @@ -57,11 +57,18 @@ FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="受检单位"> + FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="问题描述" > + + + + + diff --git a/SGGL/Model/APIItem/HSSE/CheckSpecialDetailItem.cs b/SGGL/Model/APIItem/HSSE/CheckSpecialDetailItem.cs index b324df7f..707b91df 100644 --- a/SGGL/Model/APIItem/HSSE/CheckSpecialDetailItem.cs +++ b/SGGL/Model/APIItem/HSSE/CheckSpecialDetailItem.cs @@ -187,5 +187,21 @@ namespace Model get; set; } + + /// + /// 检查要点Id + /// + public string CheckItemDetailSetId { get; set; } + + /// + /// 检查要点内容 + /// + public string CheckItemDetailContent { get; set; } + + /// + /// 整改期限 + /// + public DateTime? Rectification_Date { get; set; } + } } diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 8cc30120..8b23f937 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -59949,6 +59949,12 @@ namespace Model private string _HiddenHazardType; + private string _CheckItemSetId; + + private string _CheckItemSetContent; + + private System.Nullable _Rectification_Date; + private EntityRef _Base_Unit; private EntityRef _WBS_UnitWork; @@ -59995,6 +60001,12 @@ namespace Model partial void OnSortIndexChanged(); partial void OnHiddenHazardTypeChanging(string value); partial void OnHiddenHazardTypeChanged(); + partial void OnCheckItemSetIdChanging(string value); + partial void OnCheckItemSetIdChanged(); + partial void OnCheckItemSetContentChanging(string value); + partial void OnCheckItemSetContentChanged(); + partial void OnRectification_DateChanging(System.Nullable value); + partial void OnRectification_DateChanged(); #endregion public Check_CheckSpecialDetail() @@ -60392,6 +60404,66 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CheckItemSetId", DbType="NVarChar(50)")] + public string CheckItemSetId + { + get + { + return this._CheckItemSetId; + } + set + { + if ((this._CheckItemSetId != value)) + { + this.OnCheckItemSetIdChanging(value); + this.SendPropertyChanging(); + this._CheckItemSetId = value; + this.SendPropertyChanged("CheckItemSetId"); + this.OnCheckItemSetIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CheckItemSetContent", DbType="NVarChar(3000)")] + public string CheckItemSetContent + { + get + { + return this._CheckItemSetContent; + } + set + { + if ((this._CheckItemSetContent != value)) + { + this.OnCheckItemSetContentChanging(value); + this.SendPropertyChanging(); + this._CheckItemSetContent = value; + this.SendPropertyChanged("CheckItemSetContent"); + this.OnCheckItemSetContentChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Rectification_Date", DbType="DateTime")] + public System.Nullable Rectification_Date + { + get + { + return this._Rectification_Date; + } + set + { + if ((this._Rectification_Date != value)) + { + this.OnRectification_DateChanging(value); + this.SendPropertyChanging(); + this._Rectification_Date = value; + this.SendPropertyChanged("Rectification_Date"); + this.OnRectification_DateChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecialDetail_Base_Unit", Storage="_Base_Unit", ThisKey="UnitId", OtherKey="UnitId", IsForeignKey=true)] public Base_Unit Base_Unit { @@ -360876,6 +360948,12 @@ namespace Model private string _HiddenHazardTypeName; + private string _CheckItemSetId; + + private string _CheckItemSetContent; + + private System.Nullable _Rectification_Date; + public View_CheckSpecialDetail() { } @@ -361231,6 +361309,54 @@ namespace Model } } } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CheckItemSetId", DbType="NVarChar(50)")] + public string CheckItemSetId + { + get + { + return this._CheckItemSetId; + } + set + { + if ((this._CheckItemSetId != value)) + { + this._CheckItemSetId = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CheckItemSetContent", DbType="NVarChar(3000)")] + public string CheckItemSetContent + { + get + { + return this._CheckItemSetContent; + } + set + { + if ((this._CheckItemSetContent != value)) + { + this._CheckItemSetContent = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Rectification_Date", DbType="DateTime")] + public System.Nullable Rectification_Date + { + get + { + return this._Rectification_Date; + } + set + { + if ((this._Rectification_Date != value)) + { + this._Rectification_Date = value; + } + } + } } [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_Comprehensive_InspectionEquipment")] diff --git a/SGGL/WebAPI/WebAPI.csproj b/SGGL/WebAPI/WebAPI.csproj index 6f0be619..c8a5f5f8 100644 --- a/SGGL/WebAPI/WebAPI.csproj +++ b/SGGL/WebAPI/WebAPI.csproj @@ -51,7 +51,7 @@ - ..\FineUIPro.Web\bin\Aspose.Words.dll + ..\FineUIPro\Reference BLL\Aspose.Words.dll