修改专项检查

DataBase/版本日志/SGGLDB_WH_2023-09-05.sql

@@ -0,0 +1,108 @@
+--安全的施工方案，url改成质量的施工方案
+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
+

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();
                     }
                     ////保存附件

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();
             }
         }

SGGL/BLL/HSSE/Technique/Technique_CheckItemDetailService.cs

@@ -155,5 +155,26 @@ namespace BLL
             }
             return name;
         }
+
+        /// <summary>
+        ///  检查项明细下拉框
+        /// </summary>
+        /// <param name="dropName">下拉框名字</param>
+        /// <param name="isShowPlease">是否显示请选择</param>
+        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);
+            }
+        }
+
     }
 }

SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx

@@ -44,7 +44,7 @@
                                     <f:FormRow>
                                         <Items>
                                             <f:TextBox ID="txtProjectName" runat="server" Readonly="true" Label="项目名称" LabelAlign="Right" LabelWidth="120px"
-                                                MaxLength="50">
+                                                >
                                             </f:TextBox>
                                         </Items>
                                     </f:FormRow>

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();

SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialEdit.aspx

@@ -65,7 +65,7 @@
                     <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" runat="server"   DataIDField="CheckSpecialDetailId"
                         DataKeyNames="CheckSpecialDetailId" ShowGridHeader="true"  SortField="SortIndex" SortDirection="ASC" 
                         MinHeight="350px" AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true"  EnableColumnLines="true"  OnPreDataBound="Grid1_PreDataBound" 
-                        EnableTextSelection="True"  OnSort="Grid1_Sort">   
+                        EnableTextSelection="True"  OnSort="Grid1_Sort" AllowColumnLocking="true">   
                         <Columns>                       
                             <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
                                 TextAlign="Center" />
@@ -84,7 +84,7 @@
                                     </Editor>
                             </f:RenderField>
                              <f:RenderField Width="150px" ColumnID="Unqualified" DataField="Unqualified" 
-                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="问题描述" ExpandUnusedSpace="true">
+                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="问题描述" >
                                  <Editor>
                                     <f:TextBox ID="txtUnqualified" runat="server" ShowRedStar="true">
                                     </f:TextBox>
@@ -98,6 +98,25 @@
                                     </f:DropDownList>
                                 </Editor>
                             </f:RenderField>
+
+                            <f:RenderField Width="400px" ColumnID="CheckItemSetContent" DataField="CheckItemSetContent" 
+                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="检查内容" RendererFunction="renderCheckItemDetail">
+                                <Editor>
+                                    <f:DropDownList ID="drpCheckItemDetail" runat="server"
+                                        OnSelectedIndexChanged="drpCheckItemDetail_SelectedIndexChanged">
+                                    </f:DropDownList>
+                                </Editor>
+                            </f:RenderField>
+
+                             <f:RenderField Width="150px" ColumnID="Rectification_Date" DataField="Rectification_Date" 
+                                FieldType="Date" RendererArgument="yyyy-MM-dd" HeaderTextAlign="Center" TextAlign="Left" HeaderText="整改期限" >
+                                 <Editor>
+                                         <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" ID="txtRectification_Date" EnableEdit="false">
+                                        </f:DatePicker>
+                                </Editor>
+                            </f:RenderField>       
+                            
+
                             <f:RenderField Width="80px" ColumnID="CompleteStatusName" DataField="CompleteStatusName" SortField="CompleteStatusName"
                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="处理结果">
                                 <Editor>
@@ -125,10 +144,10 @@
                                     </Editor>
                             </f:RenderField>
                              <f:LinkButtonField ColumnID="Delete" Width="50px" EnablePostBack="false" Icon="Delete"
-                                HeaderTextAlign="Center" HeaderText="删除" />
+                                HeaderTextAlign="Center" HeaderText="删除"  EnableLock="true" Locked="true"/>
                         </Columns>
                         <Listeners>
-                             <%-- <f:Listener Event="beforeedit" Handler="onGridBeforeEdit" />--%>
+                             <f:Listener Event="beforeedit" Handler="onGridBeforeEdit" />
                                   <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
                                 <f:Listener Event="afteredit" Handler="onGridAfterEdit" />
                         </Listeners>
@@ -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);*/
+            }
+        }
+
+
     </script>
 </body>
 </html>

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<string>("CheckItemName"),
                     Unqualified = values.Value<string>("Unqualified"),
-                   // WorkArea = values.Value<string>("WorkArea"),
+                    CheckItemSetContent = values.Value<string>("CheckItemSetContent"),
+                    Rectification_Date= values.Value<DateTime>("Rectification_Date"),
+                    // WorkArea = values.Value<string>("WorkArea"),
                 };
                 var getUnit = Funs.DB.Base_Unit.FirstOrDefault(x => x.UnitName == values.Value<string>("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)

SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialEdit.aspx.designer.cs

@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.Check {
+namespace FineUIPro.Web.HSSE.Check
-    
+{
-    
+
-    public partial class CheckSpecialEdit {
+
-        
+    public partial class CheckSpecialEdit
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// SimpleForm1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
-        
+
         /// <summary>
         /// txtCheckSpecialCode 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCheckSpecialCode;
-        
+
         /// <summary>
         /// rbType 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.RadioButtonList rbType;
-        
+
         /// <summary>
         /// drpSupCheckItemSet 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpSupCheckItemSet;
-        
+
         /// <summary>
         /// txtCheckDate 控件。
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtCheckDate;
-        
+
         /// <summary>
         /// drpPartInPersons 控件。
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpPartInPersons;
-        
+
         /// <summary>
         /// txtPartInPersonNames 控件。
         /// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtPartInPersonNames;
-        
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -110,7 +112,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// drpCheckArea 控件。
         /// </summary>
@@ -119,7 +121,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpCheckArea;
-        
+
         /// <summary>
         /// drpWorkUnit 控件。
         /// </summary>
@@ -128,7 +130,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpWorkUnit;
-        
+
         /// <summary>
         /// txtUnqualified 控件。
         /// </summary>
@@ -137,7 +139,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtUnqualified;
-        
+
         /// <summary>
         /// drpCheckItem 控件。
         /// </summary>
@@ -146,7 +148,25 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpCheckItem;
-        
+
+        /// <summary>
+        /// drpCheckItemDetail 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpCheckItemDetail;
+
+        /// <summary>
+        /// txtRectification_Date 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtRectification_Date;
+
         /// <summary>
         /// drpCompleteStatus 控件。
         /// </summary>
@@ -155,7 +175,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpCompleteStatus;
-        
+
         /// <summary>
         /// drpHandleStep 控件。
         /// </summary>
@@ -164,7 +184,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpHandleStep;
-        
+
         /// <summary>
         /// drpHiddenHazardType 控件。
         /// </summary>
@@ -173,7 +193,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpHiddenHazardType;
-        
+
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -182,7 +202,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-        
+
         /// <summary>
         /// lbTemp 控件。
         /// </summary>
@@ -191,7 +211,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label lbTemp;
-        
+
         /// <summary>
         /// btnAttachUrl 控件。
         /// </summary>
@@ -200,7 +220,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnAttachUrl;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -209,7 +229,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnSave 控件。
         /// </summary>
@@ -218,7 +238,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSave;
-        
+
         /// <summary>
         /// btnSubmit 控件。
         /// </summary>
@@ -227,7 +247,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSubmit;
-        
+
         /// <summary>
         /// btnClose 控件。
         /// </summary>
@@ -236,7 +256,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnClose;
-        
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>

SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialView.aspx

@@ -57,11 +57,18 @@
                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="受检单位">
                             </f:RenderField>
                                   <f:RenderField Width="200px" ColumnID="Unqualified" DataField="Unqualified" SortField="Unqualified"
-                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="问题描述" ExpandUnusedSpace="true">                              
+                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="问题描述" >                              
                             </f:RenderField>
                             <f:RenderField Width="160px" ColumnID="CheckItemName" DataField="CheckItemName" SortField="CheckItemName"
                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="问题类型">                                
                             </f:RenderField>
+                            <f:RenderField Width="250px" ColumnID="CheckItemSetContent" DataField="CheckItemSetContent" SortField="CheckItemSetContent"
+                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="检查内容">                                
+                            </f:RenderField>
+                            <f:RenderField Width="160px" ColumnID="Rectification_Date" DataField="Rectification_Date" SortField="Rectification_Date"
+                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="整改期限">                                
+                            </f:RenderField>
+
                             <f:RenderField Width="80px" ColumnID="CompleteStatusName" DataField="CompleteStatusName" SortField="CompleteStatusName"
                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="处理结果">
                             </f:RenderField>   

SGGL/Model/APIItem/HSSE/CheckSpecialDetailItem.cs

@@ -187,5 +187,21 @@ namespace Model
             get;
             set;
         }
+
+        /// <summary>
+        /// 检查要点Id
+        /// </summary>
+        public string CheckItemDetailSetId { get; set; }
+
+        /// <summary>
+        /// 检查要点内容
+        /// </summary>
+        public string CheckItemDetailContent { get; set; }
+
+        /// <summary>
+        /// 整改期限
+        /// </summary>
+        public DateTime? Rectification_Date { get; set; }
+
     }
 }

SGGL/Model/Model.cs

@@ -59949,6 +59949,12 @@ namespace Model
 		
 		private string _HiddenHazardType;
 		
+		private string _CheckItemSetId;
+		
+		private string _CheckItemSetContent;
+		
+		private System.Nullable<System.DateTime> _Rectification_Date;
+		
 		private EntityRef<Base_Unit> _Base_Unit;
 		
 		private EntityRef<WBS_UnitWork> _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<System.DateTime> 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<System.DateTime> 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<System.DateTime> _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<System.DateTime> 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")]

SGGL/WebAPI/WebAPI.csproj

@@ -51,7 +51,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Aspose.Words">
-      <HintPath>..\FineUIPro.Web\bin\Aspose.Words.dll</HintPath>
+      <HintPath>..\FineUIPro\Reference BLL\Aspose.Words.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">