From 22809fa59f8cfbcf5289ce23523bc966f4b17752 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Wed, 27 Nov 2024 15:21:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../版本日志/SGGLDB_V2024-11-07-gaofei.sql    |   4 +
 SGGL/BLL/Common/Const.cs                      |   5 +
 .../Hazard/ConstructionRiskListService.cs     |  30 ++
 .../Excel/DataIn/施工作业风险导入模板.xls     | Bin 19968 -> 22016 bytes
 .../DataOut/每周施工作业风险动态管控表.xlsx   | Bin 0 -> 10788 bytes
 .../HSSE/Hazard/ConstructionRisk.aspx         |  24 +-
 .../HSSE/Hazard/ConstructionRisk.aspx.cs      | 272 +++++++++++++++++-
 .../Hazard/ConstructionRisk.aspx.designer.cs  |   9 +
 .../HSSE/Hazard/ConstructionRiskCheckSee.aspx |   9 +-
 .../Hazard/ConstructionRiskCheckSee.aspx.cs   |  22 +-
 .../ConstructionRiskCheckSee.aspx.designer.cs |   9 +
 .../Hazard/ConstructionRiskControlCheck.aspx  |  20 +-
 .../ConstructionRiskControlCheck.aspx.cs      |  56 +++-
 ...structionRiskControlCheck.aspx.designer.cs |  36 +++
 .../HSSE/Hazard/ConstructionRiskDataIn.aspx   |   2 +-
 .../Hazard/ConstructionRiskDataIn.aspx.cs     | 162 ++++++++---
 .../HSSE/Hazard/ConstructionRiskEdit.aspx     |  14 +-
 .../HSSE/Hazard/ConstructionRiskEdit.aspx.cs  |  99 +++++++
 .../ConstructionRiskEdit.aspx.designer.cs     |  18 ++
 .../HSSE/Hazard/ConstructionRiskView.aspx     |  10 +-
 .../HSSE/Hazard/ConstructionRiskView.aspx.cs  |   6 +
 .../ConstructionRiskView.aspx.designer.cs     |  18 ++
 SGGL/Model/Model.cs                           |   2 +-
 23 files changed, 757 insertions(+), 70 deletions(-)
 create mode 100644 SGGL/FineUIPro.Web/File/Excel/DataOut/每周施工作业风险动态管控表.xlsx

diff --git a/DataBase/版本日志/SGGLDB_V2024-11-07-gaofei.sql b/DataBase/版本日志/SGGLDB_V2024-11-07-gaofei.sql
index afdef161..feee6ccc 100644
--- a/DataBase/版本日志/SGGLDB_V2024-11-07-gaofei.sql
+++ b/DataBase/版本日志/SGGLDB_V2024-11-07-gaofei.sql
@@ -1,4 +1,8 @@
 alter table HSSE_ConstructionRisk add SubUnitDutyPerson nvarchar(50) null
 alter table HSSE_ConstructionRisk add MainUnitDutyPerson nvarchar(50) null
 alter table HSSE_ConstructionRisk add MainUnitCheckPerson nvarchar(500) null
+GO
+alter table [dbo].[HSSE_ConstructionRiskCheck] alter column [Rectification] nvarchar(500) null
+GO
+alter table [dbo].[HSSE_ConstructionRiskControl] alter column Measures nvarchar(500) null
 GO
\ No newline at end of file
diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs
index 8913eb77..60b1b75c 100644
--- a/SGGL/BLL/Common/Const.cs
+++ b/SGGL/BLL/Common/Const.cs
@@ -3495,6 +3495,11 @@ namespace BLL
         /// 施工作业风险导入模板
         /// </summary>
         public const string ConstructionRiskTemplateUrl = "File\\Excel\\DataIn\\施工作业风险导入模板.xls";
+
+        /// <summary>
+        /// 施工作业风险导出模板
+        /// </summary>
+        public const string ConstructionRiskOutTemplateUrl = "File\\Excel\\DataOut\\每周施工作业风险动态管控表.xlsx";
         #endregion
 
         #region 初始化上传路径
diff --git a/SGGL/BLL/HSSE/Hazard/ConstructionRiskListService.cs b/SGGL/BLL/HSSE/Hazard/ConstructionRiskListService.cs
index 488c7870..f3e37884 100644
--- a/SGGL/BLL/HSSE/Hazard/ConstructionRiskListService.cs
+++ b/SGGL/BLL/HSSE/Hazard/ConstructionRiskListService.cs
@@ -174,6 +174,36 @@ namespace BLL
             }
         }
 
+        /// <summary>
+        /// 获取作业风险描述下拉项
+        /// </summary>
+        /// <returns></returns>
+        public static ListItem[] LicenseDesList()
+        {
+            ListItem[] lis = new ListItem[20];
+            lis[0] = new ListItem("物体打击", "物体打击");
+            lis[1] = new ListItem("车辆伤害", "车辆伤害");
+            lis[2] = new ListItem("机械伤害", "机械伤害");
+            lis[3] = new ListItem("起重伤害", "起重伤害");
+            lis[4] = new ListItem("触电", "触电");
+            lis[5] = new ListItem("淹溺", "淹溺");
+            lis[6] = new ListItem("灼烫", "灼烫");
+            lis[7] = new ListItem("火灾", "火灾");
+            lis[8] = new ListItem("高处坠落", "高处坠落");
+            lis[9] = new ListItem("坍塌", "坍塌");
+            lis[10] = new ListItem("冒顶片帮", "冒顶片帮");
+            lis[11] = new ListItem("透水", "透水");
+            lis[12] = new ListItem("放炮", "放炮");
+            lis[13] = new ListItem("火药爆炸", "火药爆炸");
+            lis[14] = new ListItem("瓦斯爆炸", "瓦斯爆炸");
+            lis[15] = new ListItem("锅炉爆炸", "锅炉爆炸");
+            lis[16] = new ListItem("容器爆炸", "容器爆炸");
+            lis[17] = new ListItem("其他爆炸", "其他爆炸");
+            lis[18] = new ListItem("中毒和窒息", "中毒和窒息");
+            lis[19] = new ListItem("其他伤害", "其他伤害");
+            return lis;
+        }
+
         /// <summary>
         /// 获取风险等级下拉项
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/施工作业风险导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/施工作业风险导入模板.xls
index ce18a034b2b5a823259a429134682e40027dee85..b1ab96ecb682f40048e6c231383821a6c635b073 100644
GIT binary patch
literal 22016
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
EANEHZng9R*

literal 19968
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
Nz2Prw{uhKS@NYN+qxJv*

diff --git a/SGGL/FineUIPro.Web/File/Excel/DataOut/每周施工作业风险动态管控表.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataOut/每周施工作业风险动态管控表.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..edd061951599aabf5d745eb73106768c04ec7d90
GIT binary patch
literal 10788
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

literal 0
HcmV?d00001

diff --git a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRisk.aspx b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRisk.aspx
index 43910f09..7a409f7c 100644
--- a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRisk.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRisk.aspx
@@ -6,6 +6,23 @@
 <head runat="server">
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>施工作业风险</title>
+    <style type="text/css">
+        .Red {
+            background-color: red;
+        }
+
+        .Yellow {
+            background-color: yellow;
+        }
+
+          .Orange {
+            background-color: orange;
+        }
+
+             .Blue {
+            background-color: deepskyblue;
+        }
+        </style>
 </head>
 <body>
     <form id="form1" runat="server">
@@ -40,6 +57,9 @@
                                             OnClick="btnNew_Click">
                                 </f:Button>
                                 <f:Button ID="btnImport" Text="导入" ToolTip="导入" Icon="ApplicationGet" runat="server" Hidden="true" OnClick="btnImport_Click">
+                                </f:Button>
+                                        <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" Icon="FolderUp"
+                                    EnableAjax="false" DisableControlBeforePostBack="false">
                                 </f:Button>
                                <%-- <f:Button ID="btnQR" Text="生成二维码" ToolTip="生成二维码" Icon="TableRefresh" runat="server" OnClick="btnQR_Click">
                                 </f:Button>--%>
@@ -109,7 +129,7 @@
         </f:Window>
          <f:Window ID="Window2" Title="施工作业风险" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Top" EnableResize="true" runat="server" OnClose="Window2_Close" IsModal="true"
-            Width="600px" Height="350px">
+            Width="600px" Height="370px">
         </f:Window>
         <f:Window ID="Window3" Title="施工作业风险巡检" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Top" EnableResize="true" runat="server" IsModal="true"
@@ -145,7 +165,7 @@
 
 
         function onGridDataLoad(event) {
-            this.mergeColumns(['UnitWorkName', 'ConstructionContent', 'RefLicense', 'LicenseDes','RiskLevel']);
+            this.mergeColumns(['MainItemName', 'ConstructionContent', 'RefLicense', 'LicenseDes','RiskLevel','State','AuditMan','download']);
         }
         
     </script>
diff --git a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRisk.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRisk.aspx.cs
index c8e9c6ca..e0cb47ed 100644
--- a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRisk.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRisk.aspx.cs
@@ -8,6 +8,8 @@ using System.Web.UI;
 using System.Web.UI.WebControls;
 using System.Data;
 using System.Data.SqlClient;
+using System.IO;
+using NPOI.SS.Util;
 
 namespace FineUIPro.Web.HSSE.Hazard
 {
@@ -207,6 +209,30 @@ namespace FineUIPro.Web.HSSE.Hazard
 
                 Grid1.DataSource = tb;
                 Grid1.DataBind();
+                for (int i = 0; i < Grid1.Rows.Count; i++)
+                {
+                    string rowID = Grid1.Rows[i].DataKeys[0].ToString().Split('|')[0];
+                    var risk = BLL.ConstructionRiskListService.GetConstructionRisk(rowID);
+                    if (risk != null)
+                    {
+                        if (risk.RiskLevel == "低风险")
+                        {
+                            Grid1.Rows[i].RowCssClass = "Blue";
+                        }
+                        else if (risk.RiskLevel == "一般风险")
+                        { //闭环
+                            Grid1.Rows[i].RowCssClass = "Yellow";
+                        }
+                        else if (risk.RiskLevel == "较大风险")
+                        {
+                            Grid1.Rows[i].RowCssClass = "Orange";
+                        }
+                        else if (risk.RiskLevel == "重大风险")
+                        {
+                            Grid1.Rows[i].RowCssClass = " Red ";
+                        }
+                    }
+                }
             }
             else
             {
@@ -254,7 +280,7 @@ namespace FineUIPro.Web.HSSE.Hazard
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
                 {
-                    //this.btnImport.Hidden = false;
+                    this.btnImport.Hidden = false;
                     this.btnNew.Hidden = false;
                 }
                 if (buttonList.Contains(BLL.Const.BtnDelete))
@@ -347,7 +373,7 @@ namespace FineUIPro.Web.HSSE.Hazard
                 var ins = BLL.ConstructionRiskListService.GetConstructionRisk(id);
                 if (ins != null)
                 {
-                    if (ins.States.Equals(Const.ConstructionRisk_Complete))
+                    if (ins.States == Const.ConstructionRisk_Complete)
                     {
                         Alert.ShowInTop("施工已完成，无需巡检！", MessageBoxIcon.Warning);
                         return;
@@ -357,6 +383,11 @@ namespace FineUIPro.Web.HSSE.Hazard
                         Alert.ShowInTop("尚未实施，无法巡检！", MessageBoxIcon.Warning);
                         return;
                     }
+                    else if (this.CurrUser.PersonId != ins.SubUnitDutyPerson && this.CurrUser.PersonId != ins.MainUnitDutyPerson && !ins.MainUnitCheckPerson.Contains(this.CurrUser.PersonId))
+                    {
+                        Alert.ShowInTop("只有分包责任人、总包责任人和总包核查人可以进行巡检！", MessageBoxIcon.Warning);
+                        return;
+                    }
                 }
                 PageContext.RegisterStartupScript(Window2.GetSaveStateReference(hdState.ClientID)
                                     + Window2.GetShowReference(String.Format("ConstructionRiskControlCheck.aspx?ConstructionRiskId={0}", id, "编辑 - ")));
@@ -448,11 +479,19 @@ namespace FineUIPro.Web.HSSE.Hazard
             {
                 if (ins.States == Const.ConstructionRisk_Audit3)
                 {
-                    ins.States = Const.ConstructionRisk_Complete;
-                    BLL.ConstructionRiskListService.UpdateConstructionRisk(ins);
-                    BindGrid();
-                    Alert.ShowInTop("操作成功！", MessageBoxIcon.Success);
-                    return;
+                    if (this.CurrUser.PersonId == ins.MainUnitDutyPerson)
+                    {
+                        ins.States = Const.ConstructionRisk_Complete;
+                        BLL.ConstructionRiskListService.UpdateConstructionRisk(ins);
+                        BindGrid();
+                        Alert.ShowInTop("操作成功！", MessageBoxIcon.Success);
+                        return;
+                    }
+                    else
+                    {
+                        Alert.ShowInTop("只有总包责任人可以操作完成！", MessageBoxIcon.Warning);
+                        return;
+                    }
                 }
                 else if (ins.States == Const.ConstructionRisk_Complete)
                 {
@@ -524,5 +563,224 @@ namespace FineUIPro.Web.HSSE.Hazard
                 PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("ConstructionRiskCheckSee.aspx?ConstructionRiskId={0}", ids[0])));
             }
         }
+
+        #region 导出按钮
+        /// 导出按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnOut_Click(object sender, EventArgs e)
+        {
+            string rootPath = Server.MapPath("~/");
+            string initTemplatePath = string.Empty;
+            string uploadfilepath = string.Empty;
+            string newUrl = string.Empty;
+            string filePath = string.Empty;
+            initTemplatePath = Const.ConstructionRiskOutTemplateUrl;
+            uploadfilepath = rootPath + initTemplatePath;
+            Model.SGGLDB db = Funs.DB;
+            if (this.tvControlItem.SelectedNode != null && this.tvControlItem.SelectedNode.ToolTip == "标签")
+            {
+                string unitId = this.tvControlItem.SelectedNode.ParentNode.NodeID;
+                var risks = from x in db.HSSE_ConstructionRisk
+                            join y in db.HSSE_ConstructionRiskControl on x.ConstructionRiskId equals y.ConstructionRiskId
+                            where x.ProjectId == this.CurrUser.LoginProjectId && x.DateWeek == this.tvControlItem.SelectedNode.Text
+                            orderby x.ConstructionContent, y.ShowIndex
+                            select new
+                            {
+                                ControlId = y.ControlId,
+                                ConstructionRiskId = x.ConstructionRiskId,
+                                DateA = x.DateA,
+                                DateZ = x.DateZ,
+                                MainItemName = db.ProjectData_MainItem.First(a => a.MainItemId == x.WorkAreaId).MainItemName,
+                                UnitName = db.Base_Unit.First(a => a.UnitId == x.UnitId).UnitName,
+                                ConstructionContent = x.ConstructionContent,
+                                RefLicense = x.RefLicense,
+                                LicenseDes = x.LicenseDes,
+                                RiskLevel = x.RiskLevel,
+                                Measures = y.Measures,
+                                SubUnitDutyPerson = db.Person_Persons.First(a => a.PersonId == x.SubUnitDutyPerson).PersonName,
+                                MainUnitDutyPerson = db.Person_Persons.First(a => a.PersonId == x.MainUnitDutyPerson).PersonName,
+                                MainUnitCheckPerson = Person_PersonsService.getPersonsNamesPersonIds(x.MainUnitCheckPerson),
+                            };
+                var checkLists = from x in db.HSSE_ConstructionRiskCheck
+                                 join y in db.HSSE_ConstructionRisk on x.ConstructionRiskId equals y.ConstructionRiskId
+                                 where y.ProjectId == this.CurrUser.LoginProjectId
+                                 select x;
+                if (risks.Count() > 0)
+                {
+                    string projectName = BLL.ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId);
+                    string date = string.Empty;
+                    var r = risks.First();
+                    if (r.DateA != null)
+                    {
+                        date = string.Format("{0:yyyy-MM-dd}", r.DateA);
+                    }
+                    newUrl = uploadfilepath.Replace(".xlsx", "(" + date + ")" + ".xlsx");
+                    File.Copy(uploadfilepath, newUrl);
+                    // 第一步：读取文件流
+                    NPOI.SS.UserModel.IWorkbook workbook;
+                    using (FileStream stream = new FileStream(newUrl, FileMode.Open, FileAccess.Read))
+                    {
+                        workbook = new NPOI.XSSF.UserModel.XSSFWorkbook(stream);
+                    }
+                    // 创建单元格样式
+                    NPOI.SS.UserModel.ICellStyle cellStyle = workbook.CreateCellStyle();
+                    cellStyle.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin;
+                    cellStyle.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin;
+                    cellStyle.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin;
+                    cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin;
+                    cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center;
+                    cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center;
+                    cellStyle.WrapText = true;
+                    var font = workbook.CreateFont();
+                    font.FontHeightInPoints = 14;
+                    //font.FontHeightInPoints = (short)8.5;字号为小数时要转为short
+                    cellStyle.SetFont(font);
+                    // 创建单元格样式
+                    NPOI.SS.UserModel.ICellStyle cellStyle2 = workbook.CreateCellStyle();
+                    cellStyle2.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin;
+                    cellStyle2.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin;
+                    cellStyle2.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin;
+                    cellStyle2.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin;
+                    cellStyle2.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Left;
+                    cellStyle2.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center;
+                    cellStyle2.WrapText = true;
+                    cellStyle2.SetFont(font);
+                    // 第二步：创建新数据行
+                    NPOI.SS.UserModel.ISheet sheet = workbook.GetSheetAt(0);
+                    int i = 0;
+                    NPOI.SS.UserModel.IRow row;
+                    NPOI.SS.UserModel.ICell cell;
+                    row = sheet.GetRow(i);
+                    cell = row.GetCell(0);
+                    DateTime dateA = r.DateA.Value;
+                    DateTime dateZ = r.DateZ.Value;
+                    cell.SetCellValue(projectName + " 每周施工作业风险动态管控表（" + dateA.Month + "月" + dateA.Day + "日-" + dateZ.Month + "月" + dateZ.Day + "日" + "）");
+                    i = 3;
+                    int a = 0;
+                    int b = 0;
+                    string oldId = string.Empty;
+                    foreach (var item in risks)
+                    {
+                        i++;
+                        b++;
+                        if (oldId != item.ConstructionRiskId)
+                        {
+                            if (!string.IsNullOrEmpty(oldId))   //非第一行记录
+                            {
+                                sheet.AddMergedRegion(new CellRangeAddress(i - b + 1, i - 1, 0, 0));
+                                sheet.AddMergedRegion(new CellRangeAddress(i - b + 1, i - 1, 1, 1));
+                                sheet.AddMergedRegion(new CellRangeAddress(i - b + 1, i - 1, 2, 2));
+                                sheet.AddMergedRegion(new CellRangeAddress(i - b + 1, i - 1, 3, 3));
+                                sheet.AddMergedRegion(new CellRangeAddress(i - b + 1, i - 1, 4, 4));
+                                sheet.AddMergedRegion(new CellRangeAddress(i - b + 1, i - 1, 5, 5));
+                                sheet.AddMergedRegion(new CellRangeAddress(i - b + 1, i - 1, 6, 6));
+                                sheet.AddMergedRegion(new CellRangeAddress(i - b + 1, i - 1, 8, 8));
+                                sheet.AddMergedRegion(new CellRangeAddress(i - b + 1, i - 1, 9, 9));
+                                sheet.AddMergedRegion(new CellRangeAddress(i - b + 1, i - 1, 10, 10));
+                                sheet.AddMergedRegion(new CellRangeAddress(i - b + 1, i - 1, 11, 11));
+                                sheet.AddMergedRegion(new CellRangeAddress(i - b + 1, i - 1, 12, 12));
+                            }
+                            oldId = item.ConstructionRiskId;
+                            a++;
+                            b = 1;
+                        }
+                        // 第二步：创建新数据行
+                        row = sheet.CreateRow(i);
+                        // 添加数据
+                        cell = row.CreateCell(0);
+                        cell.CellStyle = cellStyle;
+                        cell.SetCellValue(a.ToString());
+                        cell = row.CreateCell(1);
+                        cell.CellStyle = cellStyle;
+                        cell.SetCellValue(item.MainItemName);
+                        cell = row.CreateCell(2);
+                        cell.CellStyle = cellStyle;
+                        cell.SetCellValue(item.UnitName);
+                        cell = row.CreateCell(3);
+                        cell.CellStyle = cellStyle;
+                        cell.SetCellValue(item.ConstructionContent);
+                        cell = row.CreateCell(4);
+                        cell.CellStyle = cellStyle;
+                        cell.SetCellValue(item.RefLicense);
+                        cell = row.CreateCell(5);
+                        cell.CellStyle = cellStyle;
+                        cell.SetCellValue(item.LicenseDes);
+                        cell = row.CreateCell(6);
+                        cell.CellStyle = cellStyle;
+                        cell.SetCellValue(item.RiskLevel);
+                        cell = row.CreateCell(7);
+                        cell.CellStyle = cellStyle2;
+                        cell.SetCellValue(b.ToString() + "、" + item.Measures);
+                        cell = row.CreateCell(8);
+                        cell.CellStyle = cellStyle;
+                        cell.SetCellValue(item.SubUnitDutyPerson);
+                        cell = row.CreateCell(9);
+                        cell.CellStyle = cellStyle;
+                        cell.SetCellValue(item.MainUnitDutyPerson);
+                        cell = row.CreateCell(10);
+                        cell.CellStyle = cellStyle;
+                        cell.SetCellValue(item.MainUnitCheckPerson);
+                        cell = row.CreateCell(11);
+                        cell.CellStyle = cellStyle2;
+                        var checks = checkLists.Where(x => x.ConstructionRiskId == item.ConstructionRiskId).OrderByDescending(x => x.CheckDate);
+                        string checkResults = string.Empty;
+                        string rectification = string.Empty;
+                        foreach (var check in checks)
+                        {
+                            checkResults += string.Format("{0:yyyy-MM-dd}", check.CheckDate) + "：" + check.CheckResult;
+                            if (check.CheckResult == "不符合")
+                            {
+                                rectification += string.Format("{0:yyyy-MM-dd}", check.CheckDate) + "：" + check.Rectification;
+                            }
+                        }
+                        //row.Height = (short)(140 * checks.Count());
+                        cell.SetCellValue(checkResults);
+                        cell = row.CreateCell(12);
+                        cell.CellStyle = cellStyle2;
+                        cell.SetCellValue(rectification);
+                    }
+                    sheet.AddMergedRegion(new CellRangeAddress(i - b + 1, i, 0, 0));
+                    sheet.AddMergedRegion(new CellRangeAddress(i - b + 1, i, 1, 1));
+                    sheet.AddMergedRegion(new CellRangeAddress(i - b + 1, i, 2, 2));
+                    sheet.AddMergedRegion(new CellRangeAddress(i - b + 1, i, 3, 3));
+                    sheet.AddMergedRegion(new CellRangeAddress(i - b + 1, i, 4, 4));
+                    sheet.AddMergedRegion(new CellRangeAddress(i - b + 1, i, 5, 5));
+                    sheet.AddMergedRegion(new CellRangeAddress(i - b + 1, i, 6, 6));
+                    sheet.AddMergedRegion(new CellRangeAddress(i - b + 1, i, 8, 8));
+                    sheet.AddMergedRegion(new CellRangeAddress(i - b + 1, i, 9, 9));
+                    sheet.AddMergedRegion(new CellRangeAddress(i - b + 1, i, 10, 10));
+                    sheet.AddMergedRegion(new CellRangeAddress(i - b + 1, i, 11, 11));
+                    sheet.AddMergedRegion(new CellRangeAddress(i - b + 1, i, 12, 12));
+                    // 第三步：写入文件流
+                    using (FileStream stream = new FileStream(newUrl, FileMode.Create, FileAccess.Write))
+                    {
+                        workbook.Write(stream);
+                        workbook.Close();
+                    }
+                    string fileName = Path.GetFileName(newUrl);
+                    FileInfo info = new FileInfo(newUrl);
+                    long fileSize = info.Length;
+                    Response.Clear();
+                    Response.ContentType = "application/x-zip-compressed";
+                    Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
+                    Response.AddHeader("Content-Length", fileSize.ToString());
+                    Response.TransmitFile(newUrl, 0, fileSize);
+                    Response.Flush();
+                    Response.Close();
+                    File.Delete(newUrl);
+                }
+                else
+                {
+                    Alert.ShowInTop("该周无记录，无法导出！", MessageBoxIcon.Warning);
+                }
+            }
+            else
+            {
+                Alert.ShowInTop("请选择一周的记录，再点击导出！", MessageBoxIcon.Warning);
+            }
+        }
+        #endregion
     }
 }
diff --git a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRisk.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRisk.aspx.designer.cs
index 1996b4e2..c2ad4749 100644
--- a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRisk.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRisk.aspx.designer.cs
@@ -120,6 +120,15 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// </remarks>
         protected global::FineUIPro.Button btnImport;
         
+        /// <summary>
+        /// btnOut 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+        
         /// <summary>
         /// Label1 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskCheckSee.aspx b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskCheckSee.aspx
index de7d3f7f..4430d0d1 100644
--- a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskCheckSee.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskCheckSee.aspx
@@ -18,11 +18,11 @@
                     runat="server" BoxFlex="1" DataKeyNames="ConstructionRiskCheckId" AllowCellEditing="true"
                     ClicksToEdit="2" DataIDField="ConstructionRiskCheckId" AllowSorting="true" SortField="CheckDate"
                     SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" ForceFit="true"
-                    AllowPaging="false" PageSize="1000" 
+                    AllowPaging="false" PageSize="1000" OnRowCommand="Grid1_RowCommand"
                     EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" AllowFilters="true"
                     OnFilterChange="Grid1_FilterChange" OnRowDataBound="Grid1_RowDataBound" EnableTextSelection="True">
                     <Columns>
-                        <f:TemplateField ColumnID="tfPageIndex" Width="45px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
+                        <f:TemplateField ColumnID="tfPageIndex" Width="50px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
                             EnableLock="true" Locked="False">
                             <ItemTemplate>
                                 <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
@@ -45,6 +45,7 @@
                                 <asp:Label ID="Label2" runat="server" Text='<%# ConvertRectification(Eval("Rectification")) %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
+                        <f:LinkButtonField HeaderText="附件" ColumnID="download" Width="60px" Icon="ArrowDown" CommandName="download" TextAlign="Center" HeaderTextAlign="Center" />
                     </Columns>
                     <Listeners>
                         <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
@@ -56,6 +57,10 @@
             Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
             Width="800px" Height="550">
         </f:Window>
+        <f:Window ID="Window2" Title="文件查看" Hidden="true" EnableIFrame="true"
+        EnableMaximize="true" Target="Parent" EnableResize="false" runat="server" IsModal="true"
+        Width="680px" Height="480px">
+    </f:Window>
         <f:Menu ID="Menu1" runat="server">
             <Items>
                 <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Hidden="true" Text="修改" Icon="Pencil"
diff --git a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskCheckSee.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskCheckSee.aspx.cs
index 886bb5b2..4698bb12 100644
--- a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskCheckSee.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskCheckSee.aspx.cs
@@ -237,7 +237,7 @@ namespace FineUIPro.Web.HSSE.Hazard
                 }
                 else
                 {
-                    return "";
+                    return Rectification.ToString();
                 }
             }
             return "";
@@ -247,5 +247,25 @@ namespace FineUIPro.Web.HSSE.Hazard
         {
 
         }
+
+        protected void Grid1_RowCommand(object sender, GridCommandEventArgs e)
+        {
+            object[] keys = Grid1.DataKeys[e.RowIndex];
+            string fileId = string.Empty;
+            if (keys == null)
+            {
+                return;
+            }
+            else
+            {
+                fileId = keys[0].ToString();
+            }
+            if (e.CommandName.Equals("download"))
+            {
+                string menuId = Const.ConstructionRiskMenuId;
+                PageContext.RegisterStartupScript(Window2.GetShowReference(
+                 String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/ConstructionRiskControlCheck&menuId={1}", fileId, menuId)));
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskCheckSee.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskCheckSee.aspx.designer.cs
index 36973a9d..0a323c5e 100644
--- a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskCheckSee.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskCheckSee.aspx.designer.cs
@@ -75,6 +75,15 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// </remarks>
         protected global::FineUIPro.Window Window1;
         
+        /// <summary>
+        /// Window2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window2;
+        
         /// <summary>
         /// Menu1 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskControlCheck.aspx b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskControlCheck.aspx
index 4130f182..a76d8bb5 100644
--- a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskControlCheck.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskControlCheck.aspx
@@ -49,14 +49,25 @@
                   </f:RadioButtonList>
                  </Items>
             </f:FormRow>
-               
+            <f:FormRow>
+                <Items>  
+                   <f:TextArea runat="server" ID="txtRectification" Label="整改情况" Hidden="true"></f:TextArea>
+                 </Items>
+            </f:FormRow>
+               <f:FormRow>
+                <Items>  
+                   <f:LinkButton ID="UploadAttach" runat="server" Label="附件"
+                                        Text="上传和查看" OnClick="btnAttachUrl_Click" >
+                                    </f:LinkButton>
+                 </Items>
+            </f:FormRow>
         </Rows>
         <Toolbars>
             <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
                 <Items>
                     <f:Label runat="server" ID="lbTemp">
                     </f:Label>
-                   
+                   <f:HiddenField runat="server" ID="hdId"></f:HiddenField>
                     <f:ToolbarFill ID="ToolbarFill1" runat="server">
                     </f:ToolbarFill>
                     <f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" ValidateForms="SimpleForm1"
@@ -69,7 +80,10 @@
     </f:Form>
      
     
-    
+    <f:Window ID="Window1" Title="文件上传" Hidden="true" EnableIFrame="true"
+        EnableMaximize="true" Target="Parent" EnableResize="false" runat="server" IsModal="true"
+        Width="680px" Height="480px">
+    </f:Window>
     </form>
     <script type="text/javascript">
         
diff --git a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskControlCheck.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskControlCheck.aspx.cs
index b8ee8dbc..9cc7b61e 100644
--- a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskControlCheck.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskControlCheck.aspx.cs
@@ -98,6 +98,21 @@ namespace FineUIPro.Web.HSSE.Hazard
         /// <param name="e"></param>
         protected void btnSave_Click(object sender, EventArgs e)
         {
+            if (string.IsNullOrEmpty(this.hdId.Text))
+            {
+                Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
+                return;
+            }
+            if (this.rbRectification.Hidden == false && string.IsNullOrEmpty(this.rbRectification.SelectedValue))
+            {
+                Alert.ShowInTop("请选择整改情况！", MessageBoxIcon.Warning);
+                return;
+            }
+            if (this.txtRectification.Hidden == false && string.IsNullOrEmpty(this.txtRectification.Text.Trim()))
+            {
+                Alert.ShowInTop("请输入整改情况！", MessageBoxIcon.Warning);
+                return;
+            }
             this.SaveData(BLL.Const.BtnSave);
         }
         #endregion
@@ -116,8 +131,15 @@ namespace FineUIPro.Web.HSSE.Hazard
             string str = string.Empty;
             if (this.rbCheckResult.SelectedValue == "不符合")
             {
-                check.Rectification = rbRectification.SelectedValue;
-                str = rbRectification.SelectedValue;
+                if (this.rbRectification.Hidden == false)
+                {
+                    check.Rectification = rbRectification.SelectedValue;
+                    str = rbRectification.SelectedValue;
+                }
+                else
+                {
+                    check.Rectification = txtRectification.Text.Trim();
+                }
             }
             if (!string.IsNullOrEmpty(this.ConstructionRiskCheckId))
             {
@@ -127,7 +149,7 @@ namespace FineUIPro.Web.HSSE.Hazard
             }
             else
             {
-                check.ConstructionRiskCheckId = SQLHelper.GetNewID();
+                check.ConstructionRiskCheckId = this.hdId.Text;
                 BLL.ConstructionRiskCheckService.AddConstructionRiskCheck(check);
                 str += "|" + check.ConstructionRiskCheckId;
                 PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(str) + ActiveWindow.GetHidePostBackReference());
@@ -144,11 +166,37 @@ namespace FineUIPro.Web.HSSE.Hazard
             if (this.rbCheckResult.SelectedValue == "符合")
             {
                 this.rbRectification.Hidden = true;
+                this.txtRectification.Hidden = true;
             }
             else
             {
-                this.rbRectification.Hidden = false;
+                var projectUnit = BLL.ProjectUnitService.GetProjectUnitByUnitIdProjectId(this.CurrUser.LoginProjectId,this.CurrUser.UnitId);
+                if (projectUnit != null && projectUnit.UnitType == BLL.Const.ProjectUnitType_2)
+                {
+                    this.txtRectification.Hidden = false;
+                }
+                else
+                {
+                    this.rbRectification.Hidden = false;
+                }
             }
         }
+
+        #region 附件上传
+        /// <summary>
+        /// 上传附件资源
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnAttachUrl_Click(object sender, EventArgs e)
+        {
+            string edit = "0";
+            if (string.IsNullOrEmpty(this.hdId.Text))
+            {
+                this.hdId.Text = SQLHelper.GetNewID();
+            }
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/ConstructionRiskControlCheck&menuId={1}&edit={2}", this.hdId.Text, BLL.Const.ConstructionRiskMenuId, edit)));
+        }
+        #endregion
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskControlCheck.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskControlCheck.aspx.designer.cs
index 03fbcdc7..e3cdc95a 100644
--- a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskControlCheck.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskControlCheck.aspx.designer.cs
@@ -66,6 +66,24 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// </remarks>
         protected global::FineUIPro.RadioButtonList rbRectification;
         
+        /// <summary>
+        /// txtRectification 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtRectification;
+        
+        /// <summary>
+        /// UploadAttach 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.LinkButton UploadAttach;
+        
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -84,6 +102,15 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// </remarks>
         protected global::FineUIPro.Label lbTemp;
         
+        /// <summary>
+        /// hdId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdId;
+        
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -101,5 +128,14 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSave;
+        
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
     }
 }
diff --git a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskDataIn.aspx b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskDataIn.aspx
index 4cf9a3a4..1d41bfe6 100644
--- a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskDataIn.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskDataIn.aspx
@@ -19,7 +19,7 @@
                         <f:HiddenField ID="hdfileName" runat="server"></f:HiddenField>
                          <f:FileUpload ID="FileExcel" runat="server" Label="数据文件" EmptyText="请上传EXCEl格式文件" Width="350px" LabelWidth="90px" LabelAlign="Right"></f:FileUpload>
                         <f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
-                        <f:Button ID="btnAudit" runat="server" Text="审核" ToolTip="审核" Icon="PageEdit" OnClick="btnAudit_Click"></f:Button>
+                        <f:Button ID="btnAudit" runat="server" Text="审核" ToolTip="审核" Icon="PageEdit" OnClick="btnAudit_Click" Hidden="true"></f:Button>
                         <f:Button ID="btnSave" runat="server" Text="导入" ToolTip="导入" Icon="SystemSave" OnClick="btnSave_Click"></f:Button>
                         <f:Button ID="imgbtnUpload" runat="server" Icon="DiskDownload" Text="模板下载" EnableAjaxLoading="false" OnClick="imgbtnUpload_Click"></f:Button>
                     </Items>
diff --git a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskDataIn.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskDataIn.aspx.cs
index 50f2dc95..edbef445 100644
--- a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskDataIn.aspx.cs
@@ -180,13 +180,13 @@ namespace FineUIPro.Web.HSSE.Hazard
             string result = string.Empty;
             int ic, ir;
             ic = pds.Columns.Count;
-           
+
 
             ir = pds.Rows.Count;
             if (pds != null && ir > 0)
             {
                 var units = from x in Funs.DB.Base_Unit select x;
-                var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == CurrUser.LoginProjectId select x;
+                var unitWorks = from x in Funs.DB.ProjectData_MainItem where x.ProjectId == CurrUser.LoginProjectId select x;
                 for (int i = 0; i < ir; i++)
                 {
                     string row0 = pds.Rows[i][0].ToString().Trim();
@@ -208,11 +208,11 @@ namespace FineUIPro.Web.HSSE.Hazard
                     }
                     if (string.IsNullOrEmpty(row2))
                     {
-                        result += (i + 2).ToString() + "," + "单位工程" + "," + "此项为必填项！" + "|";                        
+                        result += (i + 2).ToString() + "," + "单位工程" + "," + "此项为必填项！" + "|";
                     }
                     else
                     {
-                        var unitWork = unitWorks.Where(x => x.UnitWorkName == row2.Trim()).FirstOrDefault();
+                        var unitWork = unitWorks.Where(x => x.MainItemName == row2.Trim()).FirstOrDefault();
                         if (unitWork == null)
                         {
                             result += (i + 2).ToString() + "," + "单位工程" + "," + "此项目不存在！" + "|";
@@ -225,7 +225,7 @@ namespace FineUIPro.Web.HSSE.Hazard
                     }
                     else
                     {
-                        var unit  = units.Where(x => x.UnitName == row3.Trim()).FirstOrDefault();
+                        var unit = units.Where(x => x.UnitName == row3.Trim()).FirstOrDefault();
                         if (unit == null)
                         {
                             result += (i + 2).ToString() + "," + "单位" + "," + "此项目不存在！" + "|";
@@ -288,6 +288,30 @@ namespace FineUIPro.Web.HSSE.Hazard
         {
             if (errorInfos.Count <= 0)
             {
+                //string rootPath = Server.MapPath("~/");
+                //string initFullPath = rootPath + initPath;
+                //if (!Directory.Exists(initFullPath))
+                //{
+                //    Directory.CreateDirectory(initFullPath);
+                //}
+
+                //string filePath = initFullPath + this.hdfileName.Text;
+                //ImportXlsToData2(filePath);
+                if (this.FileExcel.HasFile == false)
+                {
+                    Alert.ShowInTop("请您选择Excel文件!", MessageBoxIcon.Warning);
+                    return;
+                }
+                string IsXls = Path.GetExtension(FileExcel.FileName).ToString().Trim().ToLower();
+                if (IsXls != ".xls")
+                {
+                    Alert.ShowInTop("只可以选择Excel文件!", MessageBoxIcon.Warning);
+                    return;
+                }
+                if (errorInfos != null)
+                {
+                    errorInfos.Clear();
+                }
                 string rootPath = Server.MapPath("~/");
                 string initFullPath = rootPath + initPath;
                 if (!Directory.Exists(initFullPath))
@@ -295,7 +319,9 @@ namespace FineUIPro.Web.HSSE.Hazard
                     Directory.CreateDirectory(initFullPath);
                 }
 
+                this.hdfileName.Text = BLL.Funs.GetNewFileName() + IsXls;
                 string filePath = initFullPath + this.hdfileName.Text;
+                FileExcel.PostedFile.SaveAs(filePath);
                 ImportXlsToData2(filePath);
             }
             else
@@ -362,16 +388,19 @@ namespace FineUIPro.Web.HSSE.Hazard
             string result = string.Empty;
             string dReportID = string.Empty;
             string dateStr = string.Empty;
-            int  ir;
-
-            string des = "";
+            int ir;
             ir = pds.Rows.Count;
             if (pds != null && ir > 0)
             {
                 Model.HSSE_ConstructionRisk newConstructionRisk = null;
                 var units = from x in Funs.DB.Base_Unit select x;
-                var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == CurrUser.LoginProjectId select x;
-                int index = 1;
+                var mainItems = from x in Funs.DB.ProjectData_MainItem where x.ProjectId == CurrUser.LoginProjectId select x;
+                var persons = from x in Funs.DB.Person_Persons
+                              join y in Funs.DB.SitePerson_Person on x.PersonId equals y.PersonId
+                              where y.ProjectId == this.CurrUser.LoginProjectId
+                              select x;
+                var licenseTypes = from x in Funs.DB.Base_LicenseType orderby x.LicenseTypeCode select x;
+                var licenseDesList = BLL.ConstructionRiskListService.LicenseDesList();
                 for (int i = 0; i < ir; i++)
                 {
                     string row0 = pds.Rows[i][0].ToString().Trim();
@@ -383,46 +412,91 @@ namespace FineUIPro.Web.HSSE.Hazard
                     string row6 = pds.Rows[i][6].ToString().Trim();
                     string row7 = pds.Rows[i][7].ToString().Trim();
                     string row8 = pds.Rows[i][8].ToString().Trim();
+                    string row9 = pds.Rows[i][9].ToString().Trim();
                     var unit = units.Where(x => x.UnitName == row3).FirstOrDefault();
-                    var unitWork = unitWorks.Where(x => x.UnitWorkName == row2).FirstOrDefault();
+                    var mainItem = mainItems.Where(x => x.MainItemName == row2).FirstOrDefault();
+                    var subDutyPerson = persons.FirstOrDefault(x => x.PersonName == row5);
+                    newConstructionRisk = new Model.HSSE_ConstructionRisk();
+                    newConstructionRisk.ConstructionRiskId = SQLHelper.GetNewID(typeof(Model.HSSE_ConstructionRisk));
 
-                    if (des != row4)
+                    newConstructionRisk.ProjectId = this.CurrUser.LoginProjectId;
+                    if (unit != null)
                     {
-                        index = 1;
-                        newConstructionRisk = new Model.HSSE_ConstructionRisk();
-                        newConstructionRisk.ConstructionRiskId = SQLHelper.GetNewID(typeof(Model.HSSE_ConstructionRisk));
-
-                        newConstructionRisk.ProjectId = this.CurrUser.LoginProjectId;
                         newConstructionRisk.UnitId = unit.UnitId;
-                        newConstructionRisk.WorkAreaId = unitWork.UnitWorkId;
-                        try
-                        {
-                            newConstructionRisk.DateA = Funs.GetNewDateTime(row0);
-
-                            newConstructionRisk.DateWeek = newConstructionRisk.DateA.Value.ToString("yyyy年") + Funs.GetWeekOfYear(newConstructionRisk.DateA.Value)+"周";
-                        }
-                        catch (Exception e) { }
-                        try
-                        {
-                            newConstructionRisk.DateZ = Funs.GetNewDateTime(row1);
-                        }
-                        catch (Exception e) { }
-                        newConstructionRisk.ConstructionContent = row4;
-                        newConstructionRisk.RefLicense = row5;
-                        newConstructionRisk.LicenseDes = row6;
-                        newConstructionRisk.RiskLevel = row7;
-                        Funs.DB.HSSE_ConstructionRisk.InsertOnSubmit(newConstructionRisk);
-                        des = row4;
                     }
+                    if (mainItem != null)
+                    {
+                        newConstructionRisk.WorkAreaId = mainItem.MainItemId;
+                    }
+                    try
+                    {
+                        newConstructionRisk.DateA = Funs.GetNewDateTime(row0);
 
-                    Model.HSSE_ConstructionRiskControl constructionRiskControl = new Model.HSSE_ConstructionRiskControl();
-                    constructionRiskControl.ControlId = SQLHelper.GetNewID(typeof(Model.HSSE_ConstructionRiskControl));
-                    constructionRiskControl.ConstructionRiskId = newConstructionRisk.ConstructionRiskId;
-                    constructionRiskControl.Measures = row8;
-                    constructionRiskControl.ShowIndex = index;
-                    Funs.DB.HSSE_ConstructionRiskControl.InsertOnSubmit(constructionRiskControl);
-
-
+                        newConstructionRisk.DateWeek = newConstructionRisk.DateA.Value.ToString("yyyy年") + Funs.GetWeekOfYear(newConstructionRisk.DateA.Value) + "周";
+                    }
+                    catch (Exception e) { }
+                    try
+                    {
+                        newConstructionRisk.DateZ = Funs.GetNewDateTime(row1);
+                    }
+                    catch (Exception e) { }
+                    newConstructionRisk.ConstructionContent = row4;
+                    if (subDutyPerson != null)
+                    {
+                        newConstructionRisk.SubUnitDutyPerson = subDutyPerson.PersonId;
+                    }
+                    string refLicense = string.Empty;
+                    string[] refLicenses = row6.Split('|');
+                    foreach (var item in refLicenses)
+                    {
+                        var licenseType = licenseTypes.FirstOrDefault(x => x.LicenseTypeName == item);
+                        if (licenseType != null)
+                        {
+                            refLicense += item + ",";
+                        }
+                    }
+                    if (!string.IsNullOrEmpty(refLicense))
+                    {
+                        newConstructionRisk.RefLicense = refLicense.Substring(0, refLicense.Length - 1);
+                    }
+                    string licenseDes = string.Empty;
+                    string[] licenseDess = row7.Split('|');
+                    foreach (var item in licenseDess)
+                    {
+                        var des = licenseDesList.FirstOrDefault(x => x.Text == item);
+                        if (des != null)
+                        {
+                            licenseDes += item + ",";
+                        }
+                    }
+                    if (!string.IsNullOrEmpty(licenseDes))
+                    {
+                        newConstructionRisk.LicenseDes = licenseDes.Substring(0, licenseDes.Length - 1);
+                    }
+                    newConstructionRisk.RiskLevel = row8;
+                    newConstructionRisk.States= BLL.Const.ConstructionRisk_Compile;
+                    Funs.DB.HSSE_ConstructionRisk.InsertOnSubmit(newConstructionRisk);
+                    string[] riskControls = row9.Split('|');
+                    int a = 0;
+                    foreach (var item in riskControls)
+                    {
+                        if (!string.IsNullOrEmpty(item))
+                        {
+                            Model.HSSE_ConstructionRiskControl constructionRiskControl = new Model.HSSE_ConstructionRiskControl();
+                            constructionRiskControl.ControlId = SQLHelper.GetNewID(typeof(Model.HSSE_ConstructionRiskControl));
+                            constructionRiskControl.ConstructionRiskId = newConstructionRisk.ConstructionRiskId;
+                            constructionRiskControl.Measures = item;
+                            constructionRiskControl.ShowIndex = a;
+                            Funs.DB.HSSE_ConstructionRiskControl.InsertOnSubmit(constructionRiskControl);
+                        }
+                        a++;
+                    }
+                    Model.HSSE_ConstructionRiskApprove approve1 = new Model.HSSE_ConstructionRiskApprove();
+                    approve1.ConstructionRiskApproveId = SQLHelper.GetNewID();
+                    approve1.ConstructionRiskId = newConstructionRisk.ConstructionRiskId;
+                    approve1.ApproveMan = this.CurrUser.PersonId;
+                    approve1.ApproveType = BLL.Const.ConstructionRisk_Compile;
+                    Funs.DB.HSSE_ConstructionRiskApprove.InsertOnSubmit(approve1);
                 }
                 Funs.DB.SubmitChanges();
                 ShowNotify("导入成功！", MessageBoxIcon.Success);
diff --git a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx
index c0408504..c59a2456 100644
--- a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx
@@ -38,7 +38,7 @@
                 <f:FormRow ColumnWidths="66% 34%">
                     <Items>
                         <f:TextBox runat="server" ID="txtConstructionContent" LabelWidth="140px" Label="施工内容" ShowRedStar="true" Required="true"></f:TextBox>
-                        <f:DropDownList ID="drpSubUnitDutyPerson" runat="server" EnableEdit="true" Label="施工单位责任人" LabelWidth="140px"
+                        <f:DropDownList ID="drpSubUnitDutyPerson" runat="server" EnableEdit="true" Label="施工单位责任人" LabelWidth="140px" ShowRedStar="true"
                             >
                         </f:DropDownList>
                     </Items>
@@ -62,7 +62,7 @@
                 <f:FormRow>
                     <Items>
                         <f:DropDownList ID="drpLicenseDes" runat="server" EnableEdit="true" Label="作业风险描述" EnableMultiSelect="true" LabelWidth="140px" ShowRedStar="true">
-                             <f:ListItem Value="物体打击" Text="物体打击" />
+                             <%--<f:ListItem Value="物体打击" Text="物体打击" />
                             <f:ListItem Value="车辆伤害" Text="车辆伤害" />
                             <f:ListItem Value="机械伤害" Text="机械伤害" />
                             <f:ListItem Value="起重伤害" Text="起重伤害" />
@@ -81,7 +81,7 @@
                             <f:ListItem Value="容器爆炸" Text="容器爆炸" />
                             <f:ListItem Value="其他爆炸" Text="其他爆炸" />
                             <f:ListItem Value="中毒和窒息" Text="中毒和窒息" />
-                            <f:ListItem Value="其他伤害" Text="其他伤害" />
+                            <f:ListItem Value="其他伤害" Text="其他伤害" />--%>
                         </f:DropDownList>
                     </Items>
                 </f:FormRow>
@@ -138,6 +138,14 @@
                                             <f:Label runat="server" CssStyle="display:none"></f:Label>
                                         </Items>
                                     </f:FormRow>
+                                    <f:FormRow>
+                                        <Items>
+                                            <f:DropDownList ID="drpMainUnitDutyPerson" runat="server" Label="总包责任人" Required="true" LabelAlign="Right" EnableEdit="true" Hidden="true">
+                                            </f:DropDownList>
+                                            <f:DropDownList ID="drpMainUnitCheckPerson" runat="server" Label="总包核查人" Required="true" LabelAlign="Right" EnableEdit="true" EnableMultiSelect="true" EnableCheckBoxSelect="true" Hidden="true" AutoPostBack="true" OnSelectedIndexChanged="drpMainUnitCheckPerson_SelectedIndexChanged">
+                                            </f:DropDownList>
+                                        </Items>
+                                    </f:FormRow>
                                     <f:FormRow>
                                         <Items>
                                             <f:DropDownList ID="drpHandleType" OnSelectedIndexChanged="drpHandleType_SelectedIndexChanged" Readonly="true"
diff --git a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx.cs
index 5fb42661..eedc33ce 100644
--- a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx.cs
@@ -76,6 +76,8 @@ namespace FineUIPro.Web.HSSE.Hazard
                 this.drpHandleMan.DataTextField = "PersonName";
                 this.drpHandleMan.DataValueField = "PersonId";
                 this.InitDropDownList();
+                Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpMainUnitDutyPerson, this.CurrUser.LoginProjectId, BLL.Const.UnitId_SEDIN, BLL.Const.ZBCNEngineer, true);
+                Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpMainUnitCheckPerson, this.CurrUser.LoginProjectId, BLL.Const.UnitId_SEDIN, null, true);
                 this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
                 constructionRiskControls.Clear();
                 this.ConstructionRiskId = Request.Params["ConstructionRiskId"];
@@ -162,6 +164,17 @@ namespace FineUIPro.Web.HSSE.Hazard
                         this.btnSubmit.Visible = false;
                         this.next.Hidden = true;
                     }
+                    if (State == BLL.Const.ConstructionRisk_Audit1)
+                    {
+                        this.drpMainUnitDutyPerson.Hidden = false;
+                    }
+                    if (State == BLL.Const.ConstructionRisk_Audit2)
+                    {
+                        this.drpMainUnitDutyPerson.SelectedValue = constructionRisk.MainUnitDutyPerson;
+                        this.drpMainUnitDutyPerson.Hidden = false;
+                        this.drpMainUnitDutyPerson.Readonly = true;
+                        this.drpMainUnitCheckPerson.Hidden = false;
+                    }
                 }
                 else
                 {
@@ -196,6 +209,10 @@ namespace FineUIPro.Web.HSSE.Hazard
             this.drpRiskLevel.DataSource = BLL.ConstructionRiskListService.RiskLevelList();
             this.drpRiskLevel.DataBind();
             Funs.FineUIPleaseSelect(this.drpRiskLevel);
+            this.drpLicenseDes.DataTextField = "Text";
+            this.drpLicenseDes.DataValueField = "Value";
+            this.drpLicenseDes.DataSource = BLL.ConstructionRiskListService.LicenseDesList();
+            this.drpLicenseDes.DataBind();
             Funs.FineUIPleaseSelect(this.drpLicenseDes);
             UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.drpUnit, this.ProjectId, Const.ProjectUnitType_2, false);
         }
@@ -235,6 +252,48 @@ namespace FineUIPro.Web.HSSE.Hazard
                 ShowNotify("请选择作业风险描述！", MessageBoxIcon.Warning);
                 return;
             }
+            var risk = BLL.ConstructionRiskListService.GetConstructionRisk(this.ConstructionRiskId);
+            if (risk != null)
+            {
+                if (risk.States == BLL.Const.ConstructionRisk_Audit1)
+                {
+                    if (this.drpMainUnitDutyPerson.SelectedValue == BLL.Const._Null)
+                    {
+                        ShowNotify("请选择总包责任人！", MessageBoxIcon.Warning);
+                        return;
+                    }
+                }
+                else if (risk.States == BLL.Const.ConstructionRisk_Audit2)
+                {
+                    if (this.drpMainUnitCheckPerson.SelectedValueArray.Length == 1 && this.drpMainUnitCheckPerson.SelectedValue == BLL.Const._Null)
+                    {
+                        ShowNotify("请选择总包核查人！", MessageBoxIcon.Warning);
+                        return;
+                    }
+                    else
+                    {
+                        if (this.drpRiskLevel.SelectedValue == "较大风险" || this.drpRiskLevel.SelectedValue == "重大风险")
+                        {
+                            var sitePersons = from x in Funs.DB.SitePerson_Person where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitId == BLL.Const.UnitId_SEDIN && x.RoleIds != "" select x;
+                            bool b = false;   //是否勾选总包施工经理
+                            foreach (var item in this.drpMainUnitCheckPerson.SelectedValueArray)
+                            {
+                                var projectUser = sitePersons.FirstOrDefault(x => x.PersonId == item);
+                                if (projectUser != null && projectUser.RoleIds.Contains(BLL.Const.ConstructionManager))
+                                {
+                                    b = true;
+                                    break;
+                                }
+                            }
+                            if (!b)
+                            {
+                                ShowNotify("风险等级为较大风险及以上时，核查人必须有施工经理！", MessageBoxIcon.Warning);
+                                return;
+                            }
+                        }
+                    }
+                }
+            }
             this.SaveData(BLL.Const.BtnSubmit);
             PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
         }
@@ -354,6 +413,26 @@ namespace FineUIPro.Web.HSSE.Hazard
             newConstructionRisk.ConstructionContent = HttpUtility.HtmlEncode(this.txtConstructionContent.Text);
             newConstructionRisk.ConstructionContentId = this.hdConstructionContentId.Text;
             newConstructionRisk.Coordinate = this.hdCoordinate.Text;
+            if (this.drpMainUnitDutyPerson.Hidden == false)
+            {
+                newConstructionRisk.MainUnitDutyPerson = this.drpMainUnitDutyPerson.SelectedValue;
+            }
+            if (this.drpMainUnitCheckPerson.Hidden == false)
+            {
+                string mainUnitCheckPerson = string.Empty;
+                foreach (var item in this.drpMainUnitCheckPerson.SelectedItemArray)
+                {
+                    if (item.Value != BLL.Const._Null)
+                    {
+                        mainUnitCheckPerson += item.Value + ",";
+                    }
+                }
+                if (!string.IsNullOrEmpty(mainUnitCheckPerson))
+                {
+                    mainUnitCheckPerson = mainUnitCheckPerson.Substring(0, mainUnitCheckPerson.Length - 1);
+                }
+                newConstructionRisk.MainUnitCheckPerson = mainUnitCheckPerson;
+            }
             ////单据状态
             newConstructionRisk.States = BLL.Const.State_0;
             //if (type == BLL.Const.BtnSubmit)
@@ -672,5 +751,25 @@ namespace FineUIPro.Web.HSSE.Hazard
             Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(drpSubUnitDutyPerson, CurrUser.LoginProjectId, drpUnit.SelectedValue, null, true);
             this.drpSubUnitDutyPerson.SelectedValue = BLL.Const._Null;
         }
+
+        protected void drpMainUnitCheckPerson_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (this.drpMainUnitCheckPerson.SelectedValueArray.Length == 1 && this.drpMainUnitCheckPerson.SelectedValue == BLL.Const._Null)
+            {
+
+            }
+            else
+            {
+                List<string> strs = new List<string>();
+                foreach (var item in this.drpMainUnitCheckPerson.SelectedValueArray)
+                {
+                    if (item != BLL.Const._Null)
+                    {
+                        strs.Add(item);
+                    }
+                }
+                this.drpMainUnitCheckPerson.SelectedValueArray = strs.ToArray();
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx.designer.cs
index 069e873f..37610d24 100644
--- a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskEdit.aspx.designer.cs
@@ -183,6 +183,24 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// </remarks>
         protected global::FineUIPro.RadioButtonList rblIsAgree;
         
+        /// <summary>
+        /// drpMainUnitDutyPerson 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpMainUnitDutyPerson;
+        
+        /// <summary>
+        /// drpMainUnitCheckPerson 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpMainUnitCheckPerson;
+        
         /// <summary>
         /// drpHandleType 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskView.aspx b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskView.aspx
index 3660a309..e16cca46 100644
--- a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskView.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskView.aspx
@@ -62,7 +62,7 @@
                 <f:FormRow>
                     <Items>
                         <f:DropDownList ID="drpLicenseDes" runat="server" EnableEdit="true" Readonly="true" Label="作业风险描述" EnableMultiSelect="true" LabelWidth="140px" ShowRedStar="true">
-                             <f:ListItem Value="物体打击" Text="物体打击" />
+                             <%--<f:ListItem Value="物体打击" Text="物体打击" />
                             <f:ListItem Value="车辆伤害" Text="车辆伤害" />
                             <f:ListItem Value="机械伤害" Text="机械伤害" />
                             <f:ListItem Value="起重伤害" Text="起重伤害" />
@@ -81,7 +81,7 @@
                             <f:ListItem Value="容器爆炸" Text="容器爆炸" />
                             <f:ListItem Value="其他爆炸" Text="其他爆炸" />
                             <f:ListItem Value="中毒和窒息" Text="中毒和窒息" />
-                            <f:ListItem Value="其他伤害" Text="其他伤害" />
+                            <f:ListItem Value="其他伤害" Text="其他伤害" />--%>
                         </f:DropDownList>
                     </Items>
                 </f:FormRow>
@@ -117,6 +117,12 @@
                         </f:Grid>
                     </Items>
                 </f:FormRow>
+                <f:FormRow >
+                    <Items>
+                        <f:TextBox runat="server" ID="txtMainUnitDutyPerson" LabelWidth="140px" Label="总包责任人" Readonly="true"></f:TextBox>
+                       <f:TextBox runat="server" ID="txtMainUnitCheckPerson" LabelWidth="140px" Label="总包核查人" Readonly="true"></f:TextBox>
+                    </Items>
+                </f:FormRow>
                 <f:FormRow ID="plApprove2">
                     <Items>
 
diff --git a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskView.aspx.cs
index 21cbda57..8f3fdb97 100644
--- a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskView.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskView.aspx.cs
@@ -115,6 +115,8 @@ namespace FineUIPro.Web.HSSE.Hazard
                     {
                         this.drpLicenseDes.SelectedValueArray = constructionRisk.LicenseDes.Split(',');
                     }
+                    this.txtMainUnitDutyPerson.Text = BLL.Person_PersonsService.GetPersonsNameById(constructionRisk.MainUnitDutyPerson);
+                    this.txtMainUnitCheckPerson.Text = BLL.Person_PersonsService.getPersonsNamesPersonIds(constructionRisk.MainUnitCheckPerson);
                     this.hdCoordinate.Text = constructionRisk.Coordinate;
                     constructionRiskControls = (from x in Funs.DB.HSSE_ConstructionRiskControl where x.ConstructionRiskId == this.ConstructionRiskId orderby x.ShowIndex select x).ToList();
                     gvApprove.DataSource = BLL.ConstructionRiskApproveService.getListData(this.ConstructionRiskId);
@@ -157,6 +159,10 @@ namespace FineUIPro.Web.HSSE.Hazard
             this.drpRiskLevel.DataSource = BLL.ConstructionRiskListService.RiskLevelList();
             this.drpRiskLevel.DataBind();
             Funs.FineUIPleaseSelect(this.drpRiskLevel);
+            this.drpLicenseDes.DataTextField = "Text";
+            this.drpLicenseDes.DataValueField = "Value";
+            this.drpLicenseDes.DataSource = BLL.ConstructionRiskListService.LicenseDesList();
+            this.drpLicenseDes.DataBind();
             Funs.FineUIPleaseSelect(this.drpLicenseDes);
             UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.drpUnit, this.ProjectId, Const.ProjectUnitType_2, false);
         }
diff --git a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskView.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskView.aspx.designer.cs
index 0cd6f2f2..67698d98 100644
--- a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskView.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRiskView.aspx.designer.cs
@@ -129,6 +129,24 @@ namespace FineUIPro.Web.HSSE.Hazard {
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
         
+        /// <summary>
+        /// txtMainUnitDutyPerson 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtMainUnitDutyPerson;
+        
+        /// <summary>
+        /// txtMainUnitCheckPerson 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtMainUnitCheckPerson;
+        
         /// <summary>
         /// plApprove2 控件。
         /// </summary>
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index 67fa6611..fd566263 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -102357,7 +102357,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Rectification", DbType="NVarChar(50)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Rectification", DbType="NVarChar(500)")]
 		public string Rectification
 		{
 			get