冗余代码清理

SGGL/BLL/API/HSSE/APIServerTestRecordService.cs

@@ -142,11 +142,7 @@ namespace BLL
 
                     if (string.IsNullOrEmpty(newTestRecord.ManType))
                     {
-                        if (testRecord.TestManId == Const.sedinId)
-                        {
-                            newTestRecord.ManType = "2";
-                        }
-                        else if (UserService.GetUserByUserId(testRecord.TestManId) != null)
+                        if (UserService.GetUserByUserId(testRecord.TestManId) != null)
                         {
                             newTestRecord.ManType = "1";
                         }
@@ -157,7 +153,7 @@ namespace BLL
                     }
 
                     Model.Test_TestRecord getUpdateTestRecord = new Model.Test_TestRecord();
-;                   getUpdateTestRecord = db.Test_TestRecord.FirstOrDefault(x => x.TestRecordId == testRecord.TestRecordId);
+                    ; getUpdateTestRecord = db.Test_TestRecord.FirstOrDefault(x => x.TestRecordId == testRecord.TestRecordId);
                     if (getUpdateTestRecord == null)
                     {
                         getUpdateTestRecord = db.Test_TestRecord.FirstOrDefault(x => x.TestPlanId == testRecord.TestPlanId && x.IdentityCard == testRecord.IdentityCard);
@@ -186,7 +182,7 @@ namespace BLL
                     {
                         if (getTestPlan.TestEndTime > DateTime.Now)
                         {
-                            var getTestPlanTraining = db.Test_TestPlanTraining.Where(x => x.TestPlanId == getTestPlan.TestPlanId  && x.UserType == testRecord.UserType );
+                            var getTestPlanTraining = db.Test_TestPlanTraining.Where(x => x.TestPlanId == getTestPlan.TestPlanId && x.UserType == testRecord.UserType);
                             if (getTestPlanTraining.Count() > 0)
                             {
                                 int cout1 = getTestPlanTraining.Sum(x => x.TestType1Count ?? 0);
@@ -311,7 +307,7 @@ namespace BLL
             {
                 var getTestPlan = db.Test_TestPlan.FirstOrDefault(x => x.TestPlanId == testPlanId);
                 var getTestRecord = db.Test_TestRecord.FirstOrDefault(x => x.TestRecordId == testRecordId);
-                if(getTestPlan != null && getTestRecord != null)
+                if (getTestPlan != null && getTestRecord != null)
                 {
                     ////是否已经存在试卷 
                     var item = db.Test_TestRecordItem.FirstOrDefault(x => x.TestRecordId == testRecordId);

SGGL/BLL/BLL.csproj

@@ -241,7 +241,6 @@
     <Compile Include="API\HSSE\APIReceiveFileManagerService.cs" />
     <Compile Include="API\HSSE\APIRectifyNoticesService.cs" />
     <Compile Include="API\HSSE\APIResourcesService.cs" />
-    <Compile Include="API\HSSE\APISeDinMonthReportService.cs" />
     <Compile Include="API\HSSE\APIServerTestPlanService.cs" />
     <Compile Include="API\HSSE\APIServerTestRecordService.cs" />
     <Compile Include="API\HSSE\APITestPlanService.cs" />
@@ -713,7 +712,6 @@
     <Compile Include="HSSE\Manager\ManagerMonthC\TrainActivitySortCService.cs" />
     <Compile Include="HSSE\Manager\ManagerMonthC\TrainCService.cs" />
     <Compile Include="HSSE\Manager\ManagerMonthC\TrainSortCService.cs" />
-    <Compile Include="HSSE\Manager\ManagerMonth_SeDinService.cs" />
     <Compile Include="HSSE\Manager\ManagerWeekService.cs" />
     <Compile Include="HSSE\Manager\MonthReportBService.cs" />
     <Compile Include="HSSE\Manager\MonthReportDService.cs" />

SGGL/BLL/Common/CommonService.cs

@@ -26,10 +26,6 @@ namespace BLL
                     {
                         return new List<string>() { Const.Menu_Server, Const.Menu_HSSE, Const.Menu_CQMS, Const.Menu_HJGL };
                     }
-                    else if (userId == Const.sedinId)
-                    {
-                        return new List<string>() { Const.Menu_CQMS };
-                    }
                     else
                     {
                         List<string> returnList = new List<string>();
@@ -110,7 +106,7 @@ namespace BLL
                                || x.MenuType == Const.Menu_PZHGL)
                                select x;
                 List<Model.Sys_Menu> menus = new List<Model.Sys_Menu>();
-                if (userId == Const.sysglyId || userId == Const.hfnbdId || userId == Const.sedinId)
+                if (userId == Const.sysglyId || userId == Const.hfnbdId)
                 {
                     menus = getMenus.ToList();
                 }
@@ -173,15 +169,7 @@ namespace BLL
             {
                 ///1、当前用户是管理员 
                 ///2、当前菜单是个人设置 
-                if (userId == Const.sysglyId || userId == Const.hfnbdId || userId == Const.sedinId)
-                {
-                    returnValue = true;
-                }
-                else if (userId == Const.sedinId)
-                {
-                    returnValue = true;
-                }
-                else if (menu.MenuType == Const.Menu_Personal)
+                if (userId == Const.sysglyId || userId == Const.hfnbdId)
                 {
                     returnValue = true;
                 }
@@ -225,10 +213,6 @@ namespace BLL
             try
             {
                 List<Model.Sys_ButtonToMenu> buttons = new List<Model.Sys_ButtonToMenu>();
-                if (userId == Const.sedinId)
-                {
-                    return buttonList;
-                }
 
                 var getMenu = Funs.DB.Sys_Menu.FirstOrDefault(x => x.MenuId == menuId);
                 var user = BLL.UserService.GetUserByUserId(userId); ////用户            
@@ -290,10 +274,6 @@ namespace BLL
         {
             Model.CNPCDB db = Funs.DB;
             bool isPower = false;    ////定义是否具备按钮权限 
-            if (userId == Const.sedinId)
-            {
-                return isPower;
-            }
             if (!isPower && (userId == Const.sysglyId || userId == Const.hfnbdId))
             {
                 isPower = true;
@@ -382,7 +362,7 @@ namespace BLL
         public static bool IsThisUnitLeaderOfficeOrManage(string userId)
         {
             bool result = false;
-            if (userId == Const.sysglyId || userId == Const.hfnbdId || userId == Const.sedinId)
+            if (userId == Const.sysglyId || userId == Const.hfnbdId  )
             {
                 result = true;
             }
@@ -414,7 +394,7 @@ namespace BLL
                 var getUser = db.Sys_User.FirstOrDefault(x => x.UserId == userId);
                 if (getUser != null)
                 {
-                    if (userId == Const.sysglyId || userId == Const.hfnbdId || userId == Const.sedinId)
+                    if (userId == Const.sysglyId || userId == Const.hfnbdId )
                     {
                         isHave = true;
                     }

SGGL/BLL/Common/Const.cs

@@ -3243,10 +3243,6 @@ namespace BLL
         /// </summary>
         public const string ProjectManagerWeekMenuId = "AE118E9C-C309-43B7-A198-8CA90A8D98EB";
 
-        /// <summary>
-        /// 月报(赛鼎)
-        /// </summary>
-        public const string ProjectManagerMonth_SeDinMenuId = "D0EC3002-E1FA-457D-AC3B-4C7B2D71DD82";
         /// <summary>
         /// HSSE管理月报
         /// </summary>

SGGL/BLL/HSSE/Check/RectifyNoticesService.cs

@@ -64,8 +64,8 @@ namespace BLL
             };
             db.Check_RectifyNotices.InsertOnSubmit(newRectifyNotices);
             db.SubmitChanges();
-            ////增加一条编码记录
-            CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitId(Const.ProjectRectifyNoticesMenuId, rectifyNotice.ProjectId, rectifyNotice.UnitId, rectifyNotice.RectifyNoticesId, rectifyNotice.CheckedDate);
+            //////增加一条编码记录
+            //CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitId(Const.ProjectRectifyNoticesMenuId, rectifyNotice.ProjectId, rectifyNotice.UnitId, rectifyNotice.RectifyNoticesId, rectifyNotice.CheckedDate);
         }
 
         /// <summary>

SGGL/BLL/ProjectData/ProjectService.cs

@@ -275,7 +275,7 @@
         /// <returns></returns>
         public static List<Model.Base_Project> GetProjectByUserIdDropDownList(string userId)
         {
-            if (userId == Const.sysglyId || userId == Const.hfnbdId || userId == Const.sedinId)
+            if (userId == Const.sysglyId || userId == Const.hfnbdId )
             {
                 return (from x in Funs.DB.Base_Project
                         orderby x.ProjectCode descending
@@ -308,7 +308,7 @@
         }
         public static List<Model.Base_Project> GetUnEndProjectByUserIdDropDownList(string userId, string needProjectId)
         {
-            if (userId == Const.sysglyId || userId == Const.hfnbdId || userId == Const.sedinId)
+            if (userId == Const.sysglyId || userId == Const.hfnbdId )
             {
                 return (from x in Funs.DB.Base_Project
                         orderby x.ProjectCode descending
@@ -349,7 +349,7 @@
         }
         public static List<Model.Base_Project> GetShiYeProjectByUserIdDropDownList(string userId, string needProjectId)
         {
-            if (userId == Const.sysglyId || userId == Const.hfnbdId || userId == Const.sedinId)
+            if (userId == Const.sysglyId || userId == Const.hfnbdId )
             {
                 return (from x in Funs.DB.Base_Project
                         where x.ProjectAttribute == "SHIYE"
@@ -385,7 +385,7 @@
         public static List<Model.Base_Project> GetUnEndProjectByUserIdDropDownList(string userId, string needProjectId, string ProjectAttribute, string projectState, string projectName = null)
         {
             IQueryable<Model.Base_Project> projects = null;
-            if (userId == Const.sysglyId || userId == Const.hfnbdId || userId == Const.sedinId)
+            if (userId == Const.sysglyId || userId == Const.hfnbdId )
             {
                 projects = from x in Funs.DB.Base_Project
                            where x.ProjectAttribute.Contains(ProjectAttribute) && (x.IsDelete == null || x.IsDelete == false)

SGGL/BLL/SysManage/UserService.cs

@@ -505,7 +505,7 @@ namespace BLL
             using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
             {
                 var users = (from x in db.Sys_User
-                             where x.IsPost == true && x.UserId != Const.hfnbdId && x.UserId != Const.sedinId
+                             where x.IsPost == true && x.UserId != Const.hfnbdId  
                              orderby x.UserName
                              select x).ToList();
                 if (!string.IsNullOrEmpty(projectId))
@@ -530,7 +530,7 @@ namespace BLL
             using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
             {
                 var users = (from x in db.Sys_User
-                             where x.IsPost == true && x.UserId != Const.hfnbdId && x.UserId != Const.sedinId
+                             where x.IsPost == true && x.UserId != Const.hfnbdId  
                              orderby x.UserName
                              select x).ToList();
                 if (!string.IsNullOrEmpty(projectId))
@@ -584,7 +584,7 @@ namespace BLL
                 else
                 {
                     list = (from x in db.Sys_User
-                            where x.UserId != BLL.Const.hfnbdId && x.UserId != Const.sedinId
+                            where x.UserId != BLL.Const.hfnbdId 
                             orderby x.UserName
                             select x).ToList();
 
@@ -632,7 +632,7 @@ namespace BLL
                 else
                 {
                     list = (from x in db.Sys_User
-                            where   x.UnitId == unitId && x.UserId != BLL.Const.hfnbdId && x.UserId != Const.sedinId
+                            where   x.UnitId == unitId && x.UserId != BLL.Const.hfnbdId  
                             orderby x.UserName
                             select x).ToList();
 

SGGL/FineUIPro.Web/DigData/HSEDataCollect.aspx.cs

@@ -122,16 +122,6 @@ namespace FineUIPro.Web.DigData
         protected void btnRefresh_Click(object sender, EventArgs e)
         {
             int year = Funs.GetNewInt(this.drpYear.SelectedValue) ?? DateTime.Now.Year;
-            var getSeDin_MonthReports = from x in Funs.DB.SeDin_MonthReport
-                                        where x.States == Const.State_3 && x.ReporMonth.Value.Year == year
-                                        select x;
-            if (getSeDin_MonthReports.Count() > 0)
-            {
-                foreach (var item in getSeDin_MonthReports)
-                {
-                    BLL.HSEDataCollectService.SaveHSEDataCollectItem(item);
-                }
-            }
             this.BindGrid();
             this.BindGrid2();
             ShowNotify("刷新完成！", MessageBoxIcon.Success);
@@ -146,12 +136,12 @@ namespace FineUIPro.Web.DigData
                 var getSubmission = Funs.DB.DigData_HSEDataCollectSubmission.FirstOrDefault(x => x.HSEDataCollectSubmissionId == e.RowID);
                 if (getSubmission != null)
                 {
-                    var getMont = Funs.DB.SeDin_MonthReport.FirstOrDefault(x => x.ReporMonth.Value.Year == year.Value && x.ReporMonth.Value.Month == month.Value && x.ProjectId == getSubmission.ProjectId);
-                    if (getMont != null)
-                    {
-                        PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../HSSE/Manager/ManagerMonth_SeDinEdit.aspx?MonthReportId={0}&projectId={1}", getMont.MonthReportId, getMont.ProjectId, "查看 - ")));
-                        //PrinterDocService.PrinterDocMethod(Const.ProjectManagerMonth_SeDinMenuId, getMont.MonthReportId, "安全月报");
-                    }
+                    //var getMont = Funs.DB.SeDin_MonthReport.FirstOrDefault(x => x.ReporMonth.Value.Year == year.Value && x.ReporMonth.Value.Month == month.Value && x.ProjectId == getSubmission.ProjectId);
+                    //if (getMont != null)
+                    //{
+                    //    PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../HSSE/Manager/ManagerMonth_SeDinEdit.aspx?MonthReportId={0}&projectId={1}", getMont.MonthReportId, getMont.ProjectId, "查看 - ")));
+                    //    //PrinterDocService.PrinterDocMethod(Const.ProjectManagerMonth_SeDinMenuId, getMont.MonthReportId, "安全月报");
+                    //}
                 }
             }
             else

SGGL/FineUIPro.Web/FineUIPro.Web.csproj

@@ -2150,8 +2150,6 @@
     <Content Include="HSSE\Manager\HSSELogView.aspx" />
     <Content Include="HSSE\Manager\ManagerMonthB.aspx" />
     <Content Include="HSSE\Manager\ManagerMonthC.aspx" />
-    <Content Include="HSSE\Manager\ManagerMonth_SeDin.aspx" />
-    <Content Include="HSSE\Manager\ManagerMonth_SeDinEdit.aspx" />
     <Content Include="HSSE\Manager\ManagerWeek.aspx" />
     <Content Include="HSSE\Manager\ManagerWeekEdit.aspx" />
     <Content Include="HSSE\Manager\ManagerWeekView.aspx" />
@@ -14792,20 +14790,6 @@
     <Compile Include="HSSE\Manager\ManagerMonthC.aspx.designer.cs">
       <DependentUpon>ManagerMonthC.aspx</DependentUpon>
     </Compile>
-    <Compile Include="HSSE\Manager\ManagerMonth_SeDin.aspx.cs">
-      <DependentUpon>ManagerMonth_SeDin.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="HSSE\Manager\ManagerMonth_SeDin.aspx.designer.cs">
-      <DependentUpon>ManagerMonth_SeDin.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="HSSE\Manager\ManagerMonth_SeDinEdit.aspx.cs">
-      <DependentUpon>ManagerMonth_SeDinEdit.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="HSSE\Manager\ManagerMonth_SeDinEdit.aspx.designer.cs">
-      <DependentUpon>ManagerMonth_SeDinEdit.aspx</DependentUpon>
-    </Compile>
     <Compile Include="HSSE\Manager\ManagerWeek.aspx.cs">
       <DependentUpon>ManagerWeek.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>

SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDin.aspx

@@ -1,139 +0,0 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ManagerMonth_SeDin.aspx.cs" Inherits="FineUIPro.Web.HSSE.Manager.ManagerMonth_SeDin" %>
-
-<!DOCTYPE html>   
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head runat="server">
-    <title>月报</title>
-     <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <style type="text/css">       
-        .LabelColor
-        {
-            color: Red;
-            font-size:small;
-        } 
-        .f-grid-row.Green
-        {
-            background-color: LightGreen;
-        }
-    </style>
-</head>
-<body>
-    <form id="form1" runat="server">
-    <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
-    <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
-        ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
-        <Items>
-            <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="月报" EnableCollapse="true"
-                runat="server" BoxFlex="1" DataKeyNames="MonthReportId" DataIDField="MonthReportId" 
-                AllowSorting="true" SortField="ReporMonth" SortDirection="DESC" OnSort="Grid1_Sort"  ForceFit="true"
-                EnableColumnLines="true" AllowPaging="true" IsDatabasePaging="true" PageSize="10"  OnPageIndexChange="Grid1_PageIndexChange"                 
-                EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True" >
-                <Toolbars>
-                    <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                        <Items>
-                            <f:TextBox runat="server" Label="月份" ID="txtReporMonth" EmptyText="输入查询条件"
-                                AutoPostBack="true" OnTextChanged="TextBox_TextChanged" LabelWidth="50px"
-                                LabelAlign="right">
-                            </f:TextBox>
-                            <f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill> 
-                              <f:DatePicker runat="server"  DateFormatString="yyyy-MM" Label="月报月份" EmptyText="请选择年月" 
-                                ID="txtMonth" LabelAlign="right" DisplayType="Month" ShowTodayButton="false">
-                            </f:DatePicker>
-                            <f:Button ID="btnNew" ToolTip="新增" Icon="Add" runat="server"
-                                OnClick="btnNew_Click" Hidden="true">
-                            </f:Button>                
-                            <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
-                                EnableAjax="false" DisableControlBeforePostBack="false">
-                            </f:Button>
-                        </Items>
-                    </f:Toolbar>
-                </Toolbars>
-                <Columns>
-                    <f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center"
-                        TextAlign="Center">
-                        <ItemTemplate>
-                            <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
-                        </ItemTemplate>
-                    </f:TemplateField>
-                    <f:RenderField Width="85px" ColumnID="ReporMonth" DataField="ReporMonth" SortField="ReporMonth"
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM" HeaderText="月份"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>      
-                     <f:RenderField Width="100px" ColumnID="StartDate" DataField="StartDate" SortField="StartDate"
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="开始日期"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="100px" ColumnID="EndDate" DataField="EndDate" SortField="EndDate"
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="结束日期"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                      <f:RenderField Width="100px" ColumnID="DueDate" DataField="DueDate" SortField="DueDate"
-                        FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="截止日期"
-                        HeaderTextAlign="Center" TextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="90px" ColumnID="CompileManName" DataField="CompileManName" 
-                        SortField="ReportManName" FieldType="String" HeaderText="编制人" TextAlign="Left" HeaderTextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="90px" ColumnID="AuditManName" DataField="AuditManName" 
-                        SortField="ReportManName" FieldType="String" HeaderText="审核人" TextAlign="Left" HeaderTextAlign="Center">
-                    </f:RenderField>
-                    <f:RenderField Width="90px" ColumnID="ApprovalManName" DataField="ApprovalManName" 
-                        SortField="ReportManName" FieldType="String" HeaderText="批准人" TextAlign="Left" HeaderTextAlign="Center">
-                    </f:RenderField>
-                      <f:RenderField Width="90px" ColumnID="StateName" DataField="StateName" 
-                        SortField="StateName" FieldType="String" HeaderText="状态" TextAlign="Left" HeaderTextAlign="Center">
-                    </f:RenderField>
-                 <%--    <f:RenderField Width="250px" ColumnID="ThisSummary" DataField="ThisSummary" 
-                         FieldType="String" HeaderText="本月HSE活动综述" TextAlign="Left" HeaderTextAlign="Center">
-                    </f:RenderField>--%>
-             <%--         <f:RenderField Width="250px" ColumnID="NextPlan" DataField="NextPlan" ExpandUnusedSpace="true"
-                         FieldType="String" HeaderText="下月HSE工作计划" TextAlign="Left" HeaderTextAlign="Center">
-                    </f:RenderField>--%>
-                </Columns>
-                <Listeners>
-                    <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                </Listeners>
-                <PageItems>
-                    <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
-                    </f:ToolbarSeparator>
-                    <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
-                    </f:ToolbarText>
-                    <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
-                        OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
-                    </f:DropDownList>
-                    <f:ToolbarFill ID="ToolbarFill2" runat="server">
-                    </f:ToolbarFill>
-                    <%-- <f:Label ID="Label2" runat="server" Text="说明：绿色-未冻结；白色-已冻结。"  CssClass="LabelColor"></f:Label>--%>
-                </PageItems>
-            </f:Grid>
-        </Items>
-    </f:Panel>
-    <f:Window ID="Window1" Title="编辑月报" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-        Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
-        Width="1300px" Height="600px">
-    </f:Window>
-    <f:Menu ID="Menu1" runat="server">
-        <Items>
-            <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Hidden="true"
-                Text="编辑" Icon="Pencil" OnClick="btnMenuModify_Click">
-            </f:MenuButton>
-               <f:MenuButton ID="btnPrinter" EnablePostBack="true" runat="server" 
-                    Text="导出" Icon="Printer" OnClick="btnPrinter_Click" EnableAjax="false" DisableControlBeforePostBack="false">
-                </f:MenuButton>
-            <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Hidden="true"
-                Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？" OnClick="btnMenuDel_Click">
-            </f:MenuButton>
-        </Items>
-    </f:Menu>
-    </form>
-    <script type="text/javascript">
-        var menuID = '<%= Menu1.ClientID %>';
-        // 返回false，来阻止浏览器右键菜单
-        function onRowContextMenu(event, rowId) {
-            F(menuID).show();  //showAt(event.pageX, event.pageY);
-            return false;
-        }
-    </script>
-</body>
-</html>

SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDin.aspx.cs

@@ -1,281 +0,0 @@
-using BLL;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Data.SqlClient;
-using System.Linq;
-
-namespace FineUIPro.Web.HSSE.Manager
-{
-    public partial class ManagerMonth_SeDin : PageBase
-    {
-        #region 项目主键
-        /// <summary>
-        /// 项目主键
-        /// </summary>
-        public string ProjectId
-        {
-            get
-            {
-                return (string)ViewState["ProjectId"];
-            }
-            set
-            {
-                ViewState["ProjectId"] = value;
-            }
-        }
-        #endregion
-
-        #region 加载页面
-        /// <summary>
-        /// 加载页面
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void Page_Load(object sender, EventArgs e)
-        {
-            if (!IsPostBack)
-            {
-                Funs.DropDownPageSize(this.ddlPageSize);
-                this.ProjectId = this.CurrUser.LoginProjectId;
-                if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
-                {
-                    this.ProjectId = Request.Params["projectId"];
-                }
-                ////权限按钮方法
-                this.GetButtonPower();
-                this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
-                // 绑定表格
-                this.BindGrid();
-            }
-        }
-
-        /// <summary>
-        /// 绑定数据
-        /// </summary>
-        private void BindGrid()
-        {
-            string strSql = @"SELECT mr.MonthReportId,mr.ProjectId,mr.DueDate,mr.StartDate,mr.EndDate,mr.ReporMonth,mr.CompileManId,CompileMan.UserName AS CompileManName,mr.AuditManId
-                                        ,AuditMan.UserName AS AuditManName,mr.ApprovalManId,mr.AuditManId,ApprovalMan.UserName AS ApprovalManName,mr.ThisSummary,mr.NextPlan,mr.States
-                                        ,(CASE WHEN mr.States='0' THEN '待['+ (CASE WHEN nextMan.UserName IS NULL THEN CompileMan.UserName ELSE nextMan.UserName END) +']提交'
-	                                        WHEN mr.States='1' OR mr.States='2' THEN '待['+nextMan.UserName+']审核'
-	                                        WHEN mr.States='3' THEN '已完成'
-	                                        ELSE '待['+(CASE WHEN nextMan.UserName IS NULL THEN CompileMan.UserName ELSE nextMan.UserName END)+']提交' END) AS StateName
-                                        FROM dbo.SeDin_MonthReport AS mr 
-                                        LEFT JOIN Sys_User AS CompileMan on mr.CompileManId = CompileMan.UserId
-                                        LEFT JOIN Sys_User AS AuditMan on mr.AuditManId = AuditMan.UserId
-                                        LEFT JOIN Sys_User AS ApprovalMan on mr.ApprovalManId = ApprovalMan.UserId
-                                        LEFT JOIN Sys_User AS nextMan on mr.NextManId = nextMan.UserId
-                                        WHERE 1=1  ";
-            List<SqlParameter> listStr = new List<SqlParameter>();
-            strSql += " AND mr.ProjectId = @ProjectId";
-            listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
-
-            if (!string.IsNullOrEmpty(this.txtReporMonth.Text.Trim()))
-            {
-                strSql += " AND mr.ReporMonth LIKE @ReporMonth";
-                listStr.Add(new SqlParameter("@ReporMonth", "%" + this.txtReporMonth.Text.Trim() + "%"));
-            }
-            SqlParameter[] parameter = listStr.ToArray();
-            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
-            Grid1.RecordCount = tb.Rows.Count;
-            var table = this.GetPagedDataTable(Grid1, tb);
-            Grid1.DataSource = table;
-            Grid1.DataBind();
-        }
-        #endregion
-
-        #region 查询
-        /// <summary>
-        /// 查询
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void TextBox_TextChanged(object sender, EventArgs e)
-        {
-            this.BindGrid();
-        }
-        #endregion
-
-        #region 表排序、分页、关闭窗口
-        /// <summary>
-        /// 分页
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
-        {
-            BindGrid();
-        }
-
-        /// <summary>
-        /// 排序
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void Grid1_Sort(object sender, GridSortEventArgs e)
-        {
-            BindGrid();
-        }
-
-        /// <summary>
-        /// 分页显示条数下拉框
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            BindGrid();
-        }
-
-        /// <summary>
-        /// 关闭弹出窗
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void Window1_Close(object sender, WindowCloseEventArgs e)
-        {
-            BindGrid();
-        }
-        #endregion
-
-        #region Grid双击事件
-        /// <summary>
-        /// Grid行双击事件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
-        {
-            btnMenuModify_Click(null, null);
-        }
-        #endregion
-
-        #region 编辑
-        /// <summary>
-        /// 编辑按钮
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void btnMenuModify_Click(object sender, EventArgs e)
-        {
-            if (Grid1.SelectedRowIndexArray.Length == 0)
-            {
-                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
-                return;
-            }
-            string MonthReportId = Grid1.SelectedRowID;
-            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ManagerMonth_SeDinEdit.aspx?MonthReportId={0}", MonthReportId, "编辑 - ")));           
-        }
-        #endregion
-
-        #region 删除
-        /// <summary>
-        /// 批量删除
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void btnMenuDel_Click(object sender, EventArgs e)
-        {
-            if (Grid1.SelectedRowIndexArray.Length > 0)
-            {
-                foreach (int rowIndex in Grid1.SelectedRowIndexArray)
-                {
-                    string rowID = Grid1.DataKeys[rowIndex][0].ToString();
-                    var mont = ManagerMonth_SeDinService.GetMonthReportByMonthReportId(rowID);
-                    if (mont != null)
-                    {
-                        BLL.HSEDataCollectService.DeleteHSEDataCollectItem(mont);
-                        LogService.AddSys_Log(this.CurrUser, mont.ReporMonth.ToString(), mont.MonthReportId, BLL.Const.ProjectManagerMonth_SeDinMenuId, BLL.Const.BtnDelete);                  
-                        ManagerMonth_SeDinService.DeleteMonthReportByMonthReportId(rowID);
-                    }
-                }
-                BindGrid();
-                ShowNotify("删除数据成功!（表格数据已重新绑定）");
-            }
-        }
-        #endregion
-
-        #region 新增
-        /// <summary>
-        /// 新增
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void btnNew_Click(object sender, EventArgs e)
-        {
-            if (string.IsNullOrWhiteSpace(txtMonth.Text.Trim())) {
-                Alert.ShowInTop("请输入您要添加的月份！", MessageBoxIcon.Warning);
-                return;
-            }
-            if (ManagerMonth_SeDinService.GetMonthReportByDate(Convert.ToDateTime(txtMonth.Text.Trim()), this.ProjectId))
-            {
-                Alert.ShowInTop("当前月份的月报已存在！", MessageBoxIcon.Warning);
-                return;
-            }
-            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ManagerMonth_SeDinEdit.aspx?Month={0}", txtMonth.Text.Trim()), "添加月报表"));
-        }
-        #endregion
-
-        #region 获取按钮权限
-        /// <summary>
-        /// 获取按钮权限
-        /// </summary>
-        /// <param name="button"></param>
-        /// <returns></returns>
-        private void GetButtonPower()
-        {
-            if (Request.Params["value"] == "0")
-            {
-                return;
-            }
-            var buttonList = CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, BLL.Const.ProjectManagerMonth_SeDinMenuId);
-            if (buttonList.Count() > 0)
-            {
-                if (buttonList.Contains(Const.BtnAdd))
-                {
-                    this.btnNew.Hidden = false;
-                }
-                if (buttonList.Contains(Const.BtnModify))
-                {
-                    this.btnMenuModify.Hidden = false;
-                }
-                if (buttonList.Contains(Const.BtnDelete))
-                {
-                    this.btnMenuDel.Hidden = false;
-                }
-            }
-        }
-        #endregion
-
-        #region 导出按钮
-        /// 导出按钮
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void btnOut_Click(object sender, EventArgs e)
-        {
-            Response.ClearContent();
-            string filename = Funs.GetNewFileName();
-            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("管理月报" + filename, System.Text.Encoding.UTF8) + ".xls");
-            Response.ContentType = "application/excel";
-            Response.ContentEncoding = System.Text.Encoding.UTF8;
-            this.Grid1.PageSize = this.Grid1.RecordCount;
-            this.BindGrid();
-            Response.Write(GetGridTableHtml(Grid1));
-            Response.End();
-        }
-        #endregion
-
-        protected void btnPrinter_Click(object sender, EventArgs e)
-        {
-            if (Grid1.SelectedRowIndexArray.Length == 0)
-            {
-                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
-                return;
-            }
-
-            PrinterDocService.PrinterDocMethod(Const.ProjectManagerMonth_SeDinMenuId, Grid1.SelectedRowID, "安全月报");
-        }
-    }
-}

SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDin.aspx.designer.cs

@@ -1,195 +0,0 @@
-//------------------------------------------------------------------------------
-// <自动生成>
-//     此代码由工具生成。
-//
-//     对此文件的更改可能导致不正确的行为，如果
-//     重新生成代码，则所做更改将丢失。
-// </自动生成>
-//------------------------------------------------------------------------------
-
-namespace FineUIPro.Web.HSSE.Manager {
-    
-    
-    public partial class ManagerMonth_SeDin {
-        
-        /// <summary>
-        /// form1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
-        /// <summary>
-        /// PageManager1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.PageManager PageManager1;
-        
-        /// <summary>
-        /// Panel1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Panel Panel1;
-        
-        /// <summary>
-        /// Grid1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Grid Grid1;
-        
-        /// <summary>
-        /// Toolbar2 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Toolbar Toolbar2;
-        
-        /// <summary>
-        /// txtReporMonth 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtReporMonth;
-        
-        /// <summary>
-        /// ToolbarFill1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
-        /// <summary>
-        /// txtMonth 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DatePicker txtMonth;
-        
-        /// <summary>
-        /// btnNew 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Button btnNew;
-        
-        /// <summary>
-        /// btnOut 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Button btnOut;
-        
-        /// <summary>
-        /// lblNumber 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Label lblNumber;
-        
-        /// <summary>
-        /// ToolbarSeparator1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
-        /// <summary>
-        /// ToolbarText1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.ToolbarText ToolbarText1;
-        
-        /// <summary>
-        /// ddlPageSize 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DropDownList ddlPageSize;
-        
-        /// <summary>
-        /// ToolbarFill2 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.ToolbarFill ToolbarFill2;
-        
-        /// <summary>
-        /// Window1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Window Window1;
-        
-        /// <summary>
-        /// Menu1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Menu Menu1;
-        
-        /// <summary>
-        /// btnMenuModify 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.MenuButton btnMenuModify;
-        
-        /// <summary>
-        /// btnPrinter 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.MenuButton btnPrinter;
-        
-        /// <summary>
-        /// btnMenuDel 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.MenuButton btnMenuDel;
-    }
-}

SGGL/FineUIPro.Web/Person/PersonDutyAdd.aspx

@@ -16,7 +16,7 @@
             <Rows>
                 <f:FormRow>
                     <Items>
-                        <f:DropDownList ID="drpSEDINUser" runat="server" Label="员工" EnableEdit="true" ForceSelection="false"
+                        <f:DropDownList ID="drpUser" runat="server" Label="员工" EnableEdit="true" ForceSelection="false"
                             Required="true" ShowRedStar="true" LabelWidth="110px" >
                         </f:DropDownList>
                         <f:DropDownList ID="drpWorkPost" runat="server" Label="岗位" AutoPostBack="true" OnSelectedIndexChanged="drpWorkPost_SelectedIndexChanged">

SGGL/FineUIPro.Web/Person/PersonDutyAdd.aspx.cs

@@ -30,14 +30,14 @@ namespace FineUIPro.Web.Person
             if (!IsPostBack)
             {
                 this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
-                BLL.UserService.InitUserUnitIdDropDownList(drpSEDINUser, Const.UnitId_XJYJ, true);
+                BLL.UserService.InitUserUnitIdDropDownList(drpUser, Const.UnitId_XJYJ, true);
                 WorkPostService.InitMainWorkPostDropDownList(drpWorkPost, true);
                 this.DutyId = Request.Params["DutyId"];
                 if (!string.IsNullOrEmpty(this.DutyId)) {
                     var PersonDuty = BLL.Person_DutyService.GetPersonDutyById(this.DutyId);
                     if (PersonDuty != null) {
                         if (!string.IsNullOrEmpty(PersonDuty.DutyPersonId)) {
-                            this.drpSEDINUser.SelectedValue=PersonDuty.DutyPersonId;
+                            this.drpUser.SelectedValue=PersonDuty.DutyPersonId;
                         }
                         if (!string.IsNullOrEmpty(PersonDuty.WorkPostId)) {
                             this.drpWorkPost.SelectedValue = PersonDuty.WorkPostId;
@@ -69,7 +69,7 @@ namespace FineUIPro.Web.Person
         private void SaveData(string type)
         {
 
-            if (this.drpSEDINUser.SelectedValue == BLL.Const._Null)
+            if (this.drpUser.SelectedValue == BLL.Const._Null)
             {
                 Alert.ShowInTop("请选择员工", MessageBoxIcon.Warning);
                 return;
@@ -85,7 +85,7 @@ namespace FineUIPro.Web.Person
             }
             Model.Person_Duty PersonDuty = new Model.Person_Duty
             {
-                DutyPersonId = this.drpSEDINUser.SelectedValue,
+                DutyPersonId = this.drpUser.SelectedValue,
                 CompilePersonId = CurrUser.UserId,
                 CompileTime = DateTime.Now,
                 WorkPostId=this.drpWorkPost.SelectedValue,
@@ -124,10 +124,10 @@ namespace FineUIPro.Web.Person
             PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
         }
 
-        protected void drpSEDINUser_SelectedIndexChanged(object sender, EventArgs e)
+        protected void drpUser_SelectedIndexChanged(object sender, EventArgs e)
         {
-            if (drpSEDINUser.SelectedValue != BLL.Const._Null) {
-                var getUser = BLL.UserService.GetUserByUserId(drpSEDINUser.SelectedValue);
+            if (drpUser.SelectedValue != BLL.Const._Null) {
+                var getUser = BLL.UserService.GetUserByUserId(drpUser.SelectedValue);
                 if (getUser != null) {
                     this.drpWorkPost.SelectedValue = getUser.WorkPostId;
                     if (this.drpWorkPost.SelectedValue != null) {

SGGL/FineUIPro.Web/Person/PersonDutyAdd.aspx.designer.cs

@@ -7,10 +7,12 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.Person {
+namespace FineUIPro.Web.Person
+{
 
 
-    public partial class PersonDutyAdd {
+    public partial class PersonDutyAdd
+    {
 
         /// <summary>
         /// form1 控件。
@@ -40,13 +42,13 @@ namespace FineUIPro.Web.Person {
         protected global::FineUIPro.Form SimpleForm1;
 
         /// <summary>
-        /// drpSEDINUser 控件。
+        /// drpUser 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.DropDownList drpSEDINUser;
+        protected global::FineUIPro.DropDownList drpUser;
 
         /// <summary>
         /// drpWorkPost 控件。

SGGL/FineUIPro.Web/Person/PersonDutyEdit.aspx

@@ -16,7 +16,7 @@
             <Rows>
                 <f:FormRow>
                     <Items>
-                        <f:DropDownList ID="drpSEDINUser" runat="server" Label="员工" EnableEdit="true" ForceSelection="false"
+                        <f:DropDownList ID="drpUser" runat="server" Label="员工" EnableEdit="true" ForceSelection="false"
                             Required="true" ShowRedStar="true" LabelWidth="110px" AutoPostBack="true"  Readonly="true">
                         </f:DropDownList>
                         <f:DropDownList ID="drpWorkPost" runat="server" Label="岗位"  Readonly="true">

SGGL/FineUIPro.Web/Person/PersonDutyEdit.aspx.cs

@@ -30,7 +30,7 @@ namespace FineUIPro.Web.Person
             if (!IsPostBack)
             {
                 this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
-                BLL.UserService.InitUserUnitIdDropDownList(drpSEDINUser, Const.UnitId_XJYJ, true);
+                BLL.UserService.InitUserUnitIdDropDownList(drpUser, Const.UnitId_XJYJ, true);
                 WorkPostService.InitMainWorkPostDropDownList(drpWorkPost, true);
                 BLL.UserService.InitUserUnitIdDepartIdDropDownList(drpHandleMan, Const.UnitId_XJYJ, Const.Depart_constructionId,true);
                 this.DutyId = Request.Params["DutyId"];
@@ -38,7 +38,7 @@ namespace FineUIPro.Web.Person
                     var PersonDuty = BLL.Person_DutyService.GetPersonDutyById(this.DutyId);
                     if (PersonDuty != null) {
                         if (!string.IsNullOrEmpty(PersonDuty.DutyPersonId)) {
-                            this.drpSEDINUser.SelectedValue=PersonDuty.DutyPersonId;
+                            this.drpUser.SelectedValue=PersonDuty.DutyPersonId;
                         }
                         if (!string.IsNullOrEmpty(PersonDuty.WorkPostId)) {
                             this.drpWorkPost.SelectedValue = PersonDuty.WorkPostId;

SGGL/FineUIPro.Web/Person/PersonDutyEdit.aspx.designer.cs

@@ -7,10 +7,12 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.Person {
+namespace FineUIPro.Web.Person
+{
 
 
-    public partial class PersonDutyEdit {
+    public partial class PersonDutyEdit
+    {
 
         /// <summary>
         /// form1 控件。
@@ -40,13 +42,13 @@ namespace FineUIPro.Web.Person {
         protected global::FineUIPro.Form SimpleForm1;
 
         /// <summary>
-        /// drpSEDINUser 控件。
+        /// drpUser 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.DropDownList drpSEDINUser;
+        protected global::FineUIPro.DropDownList drpUser;
 
         /// <summary>
         /// drpWorkPost 控件。

SGGL/FineUIPro.Web/Person/PersonDutyView.aspx

@@ -15,7 +15,7 @@
             <Rows>
                 <f:FormRow>
                     <Items>
-                        <f:DropDownList ID="drpSEDINUser" runat="server" Label="员工" EnableEdit="true" ForceSelection="false"
+                        <f:DropDownList ID="drpUser" runat="server" Label="员工" EnableEdit="true" ForceSelection="false"
                             Required="true" ShowRedStar="true" LabelWidth="110px" AutoPostBack="true"  Readonly="true">
                         </f:DropDownList>
                         <f:DropDownList ID="drpWorkPost" runat="server" Label="岗位"  Readonly="true">

SGGL/FineUIPro.Web/Person/PersonDutyView.aspx.cs

@@ -14,7 +14,7 @@ namespace FineUIPro.Web.Person
             if (!IsPostBack)
             {
                 this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
-                BLL.UserService.InitUserUnitIdDropDownList(drpSEDINUser, Const.UnitId_XJYJ, true);
+                BLL.UserService.InitUserUnitIdDropDownList(drpUser, Const.UnitId_XJYJ, true);
                 WorkPostService.InitMainWorkPostDropDownList(drpWorkPost, true);
                 string DutyId = Request.Params["DutyId"];
                 if (!string.IsNullOrEmpty(DutyId))
@@ -24,7 +24,7 @@ namespace FineUIPro.Web.Person
                     {
                         if (!string.IsNullOrEmpty(PersonDuty.DutyPersonId))
                         {
-                            this.drpSEDINUser.SelectedValue = PersonDuty.DutyPersonId;
+                            this.drpUser.SelectedValue = PersonDuty.DutyPersonId;
                         }
                         if (!string.IsNullOrEmpty(PersonDuty.WorkPostId))
                         {

SGGL/FineUIPro.Web/Person/PersonDutyView.aspx.designer.cs

@@ -7,10 +7,12 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.Person {
+namespace FineUIPro.Web.Person
+{
 
 
-    public partial class PersonDutyView {
+    public partial class PersonDutyView
+    {
 
         /// <summary>
         /// form1 控件。
@@ -40,13 +42,13 @@ namespace FineUIPro.Web.Person {
         protected global::FineUIPro.Form SimpleForm1;
 
         /// <summary>
-        /// drpSEDINUser 控件。
+        /// drpUser 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.DropDownList drpSEDINUser;
+        protected global::FineUIPro.DropDownList drpUser;
 
         /// <summary>
         /// drpWorkPost 控件。

SGGL/FineUIPro.Web/Person/PersonSet.aspx.cs

@@ -51,7 +51,7 @@ namespace FineUIPro.Web.Person
                                     + @" LEFT JOIN Base_PostTitle AS PostTitle ON PostTitle.PostTitleId=Users.PostTitleId"
                                     + @" LEFT JOIN Base_PracticeCertificate AS pc ON pc.PracticeCertificateId=Users.CertificateId"
                                     + @" LEFT JOIN Base_Project AS project ON project.projectId=Users.ProjectId"
-                                    + @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.UserId !='" + Const.hfnbdId + "' AND  Users.UserId !='" + Const.sedinId + "' AND Unit.UnitId='" + Const.UnitId_XJYJ + "' AND Users.DepartId='" + Const.Depart_constructionId + "' ";
+                                    + @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.UserId !='" + Const.hfnbdId + "' AND Unit.UnitId='" + Const.UnitId_XJYJ + "' AND Users.DepartId='" + Const.Depart_constructionId + "' ";
 
             List<SqlParameter> listStr = new List<SqlParameter>();
             if (!string.IsNullOrEmpty(this.txtUserName.Text.Trim()))

SGGL/FineUIPro.Web/Person/PersonTrainingAdd.aspx.cs

@@ -90,7 +90,7 @@ namespace FineUIPro.Web.Person
                                       + @" LEFT JOIN Base_PostTitle AS PostTitle ON PostTitle.PostTitleId=Users.PostTitleId"
                                       + @" LEFT JOIN Base_PracticeCertificate AS pc ON pc.PracticeCertificateId=Users.CertificateId"
                                       + @" LEFT JOIN Base_Project AS project ON project.projectId=Users.ProjectId"
-                                      + @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.UserId !='" + Const.hfnbdId + "' AND  Users.UserId !='" + Const.sedinId + "' AND Unit.UnitId='" + Const.UnitId_XJYJ + "' AND Users.DepartId='" + Const.Depart_constructionId + "' AND Users.IsPost =1 ";
+                                      + @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.UserId !='" + Const.hfnbdId + "' AND Unit.UnitId='" + Const.UnitId_XJYJ + "' AND Users.DepartId='" + Const.Depart_constructionId + "' AND Users.IsPost =1 ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             if (this.drpWorkPost.SelectedValue != BLL.Const._Null)
             {

SGGL/FineUIPro.Web/Person/PersonTrainingEdit.aspx.cs

@@ -82,7 +82,7 @@ namespace FineUIPro.Web.Person
                                        + @" LEFT JOIN Base_PostTitle AS PostTitle ON PostTitle.PostTitleId=Users.PostTitleId"
                                        + @" LEFT JOIN Base_PracticeCertificate AS pc ON pc.PracticeCertificateId=Users.CertificateId"
                                        + @" LEFT JOIN Base_Project AS project ON project.projectId=Users.ProjectId"
-                                       + @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.UserId !='" + Const.hfnbdId + "' AND  Users.UserId !='" + Const.sedinId + "' AND Unit.UnitId='" + Const.UnitId_XJYJ + "' AND Users.DepartId='" + Const.Depart_constructionId + "' AND Users.IsPost =1 ";
+                                       + @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.UserId !='" + Const.hfnbdId + "' AND Unit.UnitId='" + Const.UnitId_XJYJ + "' AND Users.DepartId='" + Const.Depart_constructionId + "' AND Users.IsPost =1 ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             var personIds = from x in Funs.DB.View_Person_TrainingPerson where x.TrainingPlanId == this.TrainingPlanId select x.TrainingUserId;
             if (personIds.Count() > 0)

SGGL/FineUIPro.Web/Person/PersonTrainingView.aspx.cs

@@ -83,7 +83,7 @@ namespace FineUIPro.Web.Person
                                         + @" LEFT JOIN Base_PostTitle AS PostTitle ON PostTitle.PostTitleId=Users.PostTitleId"
                                         + @" LEFT JOIN Base_PracticeCertificate AS pc ON pc.PracticeCertificateId=Users.CertificateId"
                                         + @" LEFT JOIN Base_Project AS project ON project.projectId=Users.ProjectId"
-                                        + @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.UserId !='" + Const.hfnbdId + "' AND  Users.UserId !='" + Const.sedinId + "' AND Unit.UnitId='" + Const.UnitId_XJYJ + "' AND Users.DepartId='" + Const.Depart_constructionId + "' AND Users.IsPost =1 ";
+                                        + @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.UserId !='" + Const.hfnbdId + "' AND Unit.UnitId='" + Const.UnitId_XJYJ + "' AND Users.DepartId='" + Const.Depart_constructionId + "' AND Users.IsPost =1 ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             var personIds = from x in Funs.DB.View_Person_TrainingPerson where x.TrainingPlanId == this.TrainingPlanId select x.TrainingUserId;
             if (personIds.Count() > 0)

SGGL/FineUIPro.Web/Person/Shunt.aspx.cs

@@ -57,7 +57,7 @@ namespace FineUIPro.Web.Person
                                      + @" LEFT JOIN Base_PostTitle AS PostTitle ON PostTitle.PostTitleId=Users.PostTitleId"
                                      + @" LEFT JOIN Base_PracticeCertificate AS pc ON pc.PracticeCertificateId=Users.CertificateId"
                                      + @" LEFT JOIN Base_Project AS project ON project.projectId=Users.ProjectId"
-                                     + @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.UserId !='" + Const.hfnbdId + "' AND  Users.UserId !='" + Const.sedinId + "' AND Unit.UnitId='" + Const.UnitId_XJYJ + "' AND Users.DepartId='" + Const.Depart_constructionId + "' AND Users.IsPost =1 ";
+                                     + @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.UserId !='" + Const.hfnbdId + "' AND Unit.UnitId='" + Const.UnitId_XJYJ + "' AND Users.DepartId='" + Const.Depart_constructionId + "' AND Users.IsPost =1 ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             if (this.drpWorkPost.SelectedValue != BLL.Const._Null)
             {

SGGL/FineUIPro.Web/Person/ShuntDetailEdit.aspx.cs

@@ -56,7 +56,7 @@ namespace FineUIPro.Web.Person
                                 + @" From dbo.Sys_User AS Users"
                                 + @" LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=Users.UnitId"
                                 + @" LEFT JOIN Base_PostTitle AS PostTitle ON PostTitle.PostTitleId=Users.PostTitleId"
-                                + @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.IsPost =1 AND Users.UserId !='" + Const.hfnbdId + "' AND  Users.UserId !='" + Const.sedinId + "' AND Unit.UnitId='" + Const.UnitId_XJYJ + "' AND Users.DepartId='" + Const.Depart_constructionId + "' ";
+                                + @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.IsPost =1 AND Users.UserId !='" + Const.hfnbdId + "' AND Unit.UnitId='" + Const.UnitId_XJYJ + "' AND Users.DepartId='" + Const.Depart_constructionId + "' ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             if (this.drpWorkPost.SelectedValue != BLL.Const._Null)
             {

SGGL/FineUIPro.Web/Personal/RunLog.aspx.cs

@@ -53,7 +53,7 @@ namespace FineUIPro.Web.Personal
                          + @" LEFT JOIN Base_Unit as units on users.UnitId=units.UnitId"
                          + @" LEFT JOIN Project_ProjectUser as ProjectUser on ProjectUser.UserId=sysLog.UserId and ProjectUser.ProjectId=sysLog.ProjectId"
                          + @" LEFT JOIN Base_Project as Project on sysLog.ProjectId=Project.ProjectId"
-                         + @" WHERE sysLog.UserId != '" + Const.hfnbdId + "' AND  sysLog.UserId !='" + Const.sedinId + "'";
+                         + @" WHERE sysLog.UserId != '" + Const.hfnbdId + "'";
             List<SqlParameter> listStr = new List<SqlParameter>();
             //if (this.CurrUser.UserId != BLL.Const.sysglyId)
             //{

SGGL/Model/APIItem/HSSE/SeDinMonthReport10Item.cs

@@ -1,222 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Model
-{
-    /// <summary>
-    /// 赛鼎月报信息项 --10、项目奖惩情况统计
-    /// </summary>
-    public class SeDinMonthReport10Item
-    { 
-        /// <summary>
-        /// ID
-        /// </summary>
-        public string MonthReport10Id
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        ///  月报ID
-        /// </summary>
-        public string MonthReportId
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 安全工时奖次数（本月）
-        /// </summary>
-        public int? SafeMonthNum
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 安全工时奖次数（累计）
-        /// </summary>
-        public int? SafeTotalNum
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 安全工时奖金额（本月）
-        /// </summary>
-        public decimal? SafeMonthMoney
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 安全工时奖金额（累计）
-        /// </summary>
-        public decimal? SafeTotalMoney
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// HSE绩效考核奖励次数（本月）
-        /// </summary>
-        public int? HseMonthNum
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// HSE绩效考核奖励次数（累计）
-        /// </summary>
-        public int? HseTotalNum
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// HSE绩效考核奖励金额（本月）
-        /// </summary>
-        public decimal? HseMonthMoney
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// HSE绩效考核奖励金额（累计）
-        /// </summary>
-        public decimal? HseTotalMoney
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 安全生产先进个人奖次数（本月）
-        /// </summary>
-        public int? ProduceMonthNum
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 安全生产先进个人奖次数（累计）
-        /// </summary>
-        public int? ProduceTotalNum
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 安全生产先进个人奖金额（本月）
-        /// </summary>
-        public decimal? ProduceMonthMoney
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 安全生产先进个人奖金额（累计）
-        /// </summary>
-        public decimal? ProduceTotalMoney
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 事故责任处罚次数（本月）
-        /// </summary>
-        public int? AccidentMonthNum
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 事故责任处罚次数（累计）
-        /// </summary>
-        public int? AccidentTotalNum
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 事故责任处罚金额（本月）
-        /// </summary>
-        public decimal? AccidentMonthMoney
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 事故责任处罚金额（累计）
-        /// </summary>
-        public decimal? AccidentTotalMoney
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 违章处罚次数（本月）
-        /// </summary>
-        public int? ViolationMonthNum
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 违章处罚次数（累计）
-        /// </summary>
-        public int? ViolationTotalNum
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 违章处罚金额（本月）
-        /// </summary>
-        public decimal? ViolationMonthMoney
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 违章处罚金额（累计）
-        /// </summary>
-        public decimal? ViolationTotalMoney
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 安全管理处罚次数（本月）
-        /// </summary>
-        public int? ManageMonthNum
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 安全管理处罚次数（累计）
-        /// </summary>
-        public int? ManageTotalNum
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 安全管理处罚金额（本月）
-        /// </summary>
-        public decimal? ManageMonthMoney
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 安全管理处罚金额（累计）
-        /// </summary>
-        public decimal? ManageTotalMoney
-        {
-            get;
-            set;
-        }
-    }
-}

SGGL/Model/APIItem/HSSE/SeDinMonthReport11Item.cs

@@ -1,78 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Model
-{
-    /// <summary>
-    /// 赛鼎月报信息项 --11、项目危大工程施工情况
-    /// </summary>
-    public class SeDinMonthReport11Item
-    { 
-        /// <summary>
-        /// ID
-        /// </summary>
-        public string MonthReport11Id
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 月报ID
-        /// </summary>
-        public string MonthReportId
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 危险性较大分部分项工程本月正在施工
-        /// </summary>
-        public int? RiskWorkNum
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 危险性较大分部分项工程已完工
-        /// </summary>
-        public int? RiskFinishedNum
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 危险性较大分部分项工程下月施工计划
-        /// </summary>
-        public string RiskWorkNext
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 超过一定规模危大工程本月正在施工
-        /// </summary>
-        public int? LargeWorkNum
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 超过一定规模危大工程已完工
-        /// </summary>
-        public int? LargeFinishedNum
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 超过一定规模危大工程下月施工计划
-        /// </summary>
-        public string LargeWorkNext
-        {
-            get;
-            set;
-        }
-    }
-}

SGGL/Model/APIItem/HSSE/SeDinMonthReport12Item.cs

@@ -1,190 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Model
-{
-    /// <summary>
-    /// 赛鼎月报信息项 --12、项目应急演练情况
-    /// </summary>
-    public class SeDinMonthReport12Item
-    { 
-        /// <summary>
-        /// ID
-        /// </summary>
-        public string MonthReport12Id
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 月报ID
-        /// </summary>
-        public string MonthReportId
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 综合演练现场直接投入
-        /// </summary>
-        public decimal? MultipleSiteInput
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 综合演练现场参演人数
-        /// </summary>
-        public int? MultipleSitePerson
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 综合演练现场本月次数
-        /// </summary>
-        public int? MultipleSiteNum
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 综合演练现场项目累计次数
-        /// </summary>
-        public int? MultipleSiteTotalNum
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 综合演练现场下月计划
-        /// </summary>
-        public string MultipleSiteNext
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 综合演练桌面直接投入
-        /// </summary>
-        public decimal? MultipleDesktopInput
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 综合演练桌面参演人数
-        /// </summary>
-        public int? MultipleDesktopPerson
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 综合演练桌面本月次数
-        /// </summary>
-        public int? MultipleDesktopNum
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 综合演练桌面项目累计次数
-        /// </summary>
-        public int? MultipleDesktopTotalNum
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 综合演练桌面下月计划
-        /// </summary>
-        public string MultipleDesktopNext
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 单项演练现场直接投入
-        /// </summary>
-        public decimal? SingleSiteInput
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 单项演练现场参演人数
-        /// </summary>
-        public int? SingleSitePerson
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 单项演练现场本月次数
-        /// </summary>
-        public int? SingleSiteNum
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 单项演练现场项目累计次数
-        /// </summary>
-        public int? SingleSiteTotalNum
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 单项演练现场下月计划
-        /// </summary>
-        public string SingleSiteNext
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 单项演练桌面直接投入
-        /// </summary>
-        public decimal? SingleDesktopInput
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 单项演练桌面参演人数
-        /// </summary>
-        public int? SingleDesktopPerson
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 单项演练桌面本月次数
-        /// </summary>
-        public int? SingleDesktopNum
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 单项演练桌面项目累计次数
-        /// </summary>
-        public int? SingleDesktopTotalNum
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 单项演练桌面下月计划
-        /// </summary>
-        public string SingleDesktopNext
-        {
-            get;
-            set;
-        }
-    }
-}

SGGL/Model/APIItem/HSSE/SeDinMonthReport1Item.cs

@@ -1,118 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Model
-{
-    /// <summary>
-    /// 赛鼎月报信息项 --1、项目信息
-    /// </summary>
-    public class SeDinMonthReport1Item
-    { 
-        /// <summary>
-        /// ID
-        /// </summary>
-        public string MonthReport1Id
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 月报ID
-        /// </summary>
-        public string MonthReportId
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 项目编号
-        /// </summary>
-        public string ProjectCode
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 项目名称
-        /// </summary>
-        public string ProjectName
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 项目类型
-        /// </summary>
-        public string ProjectType
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        ///  合同开始日期
-        /// </summary>
-        public string StartDate
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 合同结束日期
-        /// </summary>
-        public string EndDate
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        ///  项目经理及联系方式
-        /// </summary>
-        public string ProjectManager
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 安全经理及联系方式
-        /// </summary>
-        public string HsseManager
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 合同号
-        /// </summary>
-        public string ContractNo
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 合同额
-        /// </summary>
-        public string ContractAmount
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 所处的施工阶段
-        /// </summary>
-        public string ConstructionStage
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 项目所在地
-        /// </summary>
-        public string ProjectAddress
-        {
-            get;
-            set;
-        }
-    }
-}

SGGL/Model/APIItem/HSSE/SeDinMonthReport2Item.cs

@@ -1,102 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Model
-{
-    /// <summary>
-    /// 赛鼎月报信息项 --2、项目安全工时统计
-    /// </summary>
-    public class SeDinMonthReport2Item
-    { 
-        /// <summary>
-        /// ID
-        /// </summary>
-        public string MonthReport2Id
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 月报ID
-        /// </summary>
-        public string MonthReportId
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 当月安全人工时
-        /// </summary>
-        public decimal?  MonthWorkTime
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 年度累计安全人工时
-        /// </summary>
-        public decimal? YearWorkTime
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 项目累计安全人工时
-        /// </summary>
-        public decimal? ProjectWorkTime
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 总损失工时
-        /// </summary>
-        public decimal? TotalLostTime
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 百万工时损失率
-        /// </summary>
-        public string MillionLossRate
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        ///  工时统计准确率
-        /// </summary>
-        public string TimeAccuracyRate
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 开始日期
-        /// </summary>
-        public string StartDate
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 结束日期
-        /// </summary>
-        public string EndDate
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 安全生产 人工时
-        /// </summary>
-        public decimal? SafeWorkTime
-        {
-            get;
-            set;
-        }
-    }
-}

SGGL/Model/APIItem/HSSE/SeDinMonthReport3Item.cs

@@ -1,118 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Model
-{
-    /// <summary>
-    /// 赛鼎月报信息项 --3、项目HSE事故、事件统计
-    /// </summary>
-    public class SeDinMonthReport3Item
-    { 
-        /// <summary>
-        /// ID
-        /// </summary>
-        public string MonthReport3Id
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 月报ID
-        /// </summary>
-        public string MonthReportId
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 排序
-        /// </summary>
-        public int? SortIndex
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 类型
-        /// </summary>
-        public string BigType
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 事故类型
-        /// </summary>
-        public string AccidentType
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 本月次数
-        /// </summary>
-        public int? MonthTimes
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 累计次数
-        /// </summary>
-        public int? TotalTimes
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 本月损失工时
-        /// </summary>
-        public decimal? MonthLossTime
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 累计损失工时
-        /// </summary>
-        public decimal? TotalLossTime
-        {
-            get;
-            set;
-        }        
-        /// <summary>
-        /// 本月经济损失
-        /// </summary>
-        public decimal? MonthMoney
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 累计经济损失
-        /// </summary>
-        public decimal? TotalMoney
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 本月人数
-        /// </summary>
-        public int? MonthPersons
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 累计人数
-        /// </summary>
-        public int? TotalPersons
-        {
-            get;
-            set;
-        }
-    }
-}

SGGL/Model/APIItem/HSSE/SeDinMonthReport4Item.cs

@@ -1,78 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Model
-{
-    /// <summary>
-    /// 赛鼎月报信息项 --4、本月人员投入情况
-    /// </summary>
-    public class SeDinMonthReport4Item
-    { 
-        /// <summary>
-        /// ID
-        /// </summary>
-        public string MonthReport4Id
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 月报ID
-        /// </summary>
-        public string MonthReportId
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 单位名称
-        /// </summary>
-        public string UnitName
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 安全管理人员
-        /// </summary>
-        public int? SafeManangerNum
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 其他管理人员
-        /// </summary>
-        public int? OtherManangerNum
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 特种作业人员
-        /// </summary>
-        public int? SpecialWorkerNum
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 一般作业人员
-        /// </summary>
-        public int? GeneralWorkerNum
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 合计人数
-        /// </summary>
-        public int? TotalNum
-        {
-            get;
-            set;
-        }
-    }
-}

SGGL/Model/APIItem/HSSE/SeDinMonthReport4OtherItem.cs

@@ -1,70 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Model
-{
-    /// <summary>
-    /// 赛鼎月报信息项 --4、赛鼎公司人员信息统计表
-    /// </summary>
-    public class SeDinMonthReport4OtherItem
-    { 
-        /// <summary>
-        /// ID
-        /// </summary>
-        public string MonthReport4OtherId
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 月报ID
-        /// </summary>
-        public string MonthReportId
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 项目现场正式员工总数
-        /// </summary>
-        public int? FormalNum
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 项目现场外籍人员总数
-        /// </summary>
-        public int? ForeignNum
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 项目现场外聘人员总数
-        /// </summary>
-        public int? OutsideNum
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 项目现场HSE管理人员总数
-        /// </summary>
-        public int? ManagerNum
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 项目现场员工总数（含外聘）
-        /// </summary>
-        public int? TotalNum
-        {
-            get;
-            set;
-        }
-    }
-}

SGGL/Model/APIItem/HSSE/SeDinMonthReport5Item.cs

@@ -1,135 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Model
-{
-    /// <summary>
-    /// 赛鼎月报信息项 --5、本月大型、特种设备投入情况
-    /// </summary>
-    public class SeDinMonthReport5Item
-    {
-        /// <summary>
-        /// ID
-        /// </summary>
-        public string MonthReport5Id
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 月报ID
-        /// </summary>
-        public string MonthReportId
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 单位名称
-        /// </summary>
-        public string UnitName
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 特种设备-汽车吊
-        /// </summary>
-        public int? T01
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 特种设备-履带吊
-        /// </summary>
-        public int? T02
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 特种设备-塔吊
-        /// </summary>
-        public int? T03
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 特种设备-门式起重机
-        /// </summary>
-        public int? T04
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 特种设备-升降机
-        /// </summary>
-        public int? T05
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 特种设备-叉车
-        /// </summary>
-        public int? T06
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 大型机具设备-挖掘机
-        /// </summary>
-        public int? D01
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 大型机具设备-装载机
-        /// </summary>
-        public int? D02
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 大型机具设备-拖板车
-        /// </summary>
-        public int? D03
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 大型机具设备-桩机
-        /// </summary>
-        public int? D04
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 特殊机具设备-吊篮
-        /// </summary>
-        public int? S01
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        ///  合计
-        /// </summary>
-        public int? TotalNum
-        {
-            get;
-            set;
-        }
-    }
-}

SGGL/Model/APIItem/HSSE/SeDinMonthReport6Item.cs

@@ -1,182 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Model
-{
-    /// <summary>
-    /// 赛鼎月报信息项 --6、安全生产费用投入情况
-    /// </summary>
-    public class SeDinMonthReport6Item
-    { 
-        /// <summary>
-        /// ID
-        /// </summary>
-        public string MonthReport6Id
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 月报ID
-        /// </summary>
-        public string MonthReportId
-        {
-            get;
-            set;
-        }    
-        /// <summary>
-        /// 安全防护投入-月
-        /// </summary>
-        public decimal? SafetyMonth
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 安全防护投入-年
-        /// </summary>
-        public decimal? SafetyYear
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 安全防护投入-总
-        /// </summary>
-        public decimal? SafetyTotal
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 劳动保护及职业健康投入-月
-        /// </summary>
-        public decimal? LaborMonth
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 劳动保护及职业健康投入-年
-        /// </summary>
-        public decimal? LaborYear
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 劳动保护及职业健康投入-总
-        /// </summary>
-        public decimal? LaborTotal
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 安全技术进步投入-月
-        /// </summary>
-        public decimal? ProgressMonth
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 安全技术进步投入-年
-        /// </summary>
-        public decimal? ProgressYear
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 安全技术进步投入-总
-        /// </summary>
-        public decimal? ProgressTotal
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 安全教育培训投入-月
-        /// </summary>
-        public decimal? EducationMonth
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 安全教育培训投入-年
-        /// </summary>
-        public decimal? EducationYear
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 安全教育培训投入-总
-        /// </summary>
-        public decimal? EducationTotal
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 合计-月
-        /// </summary>
-        public decimal? SumMonth
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 合计-年
-        /// </summary>
-        public decimal? SumYear
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 合计-总
-        /// </summary>
-        public decimal? SumTotal
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 完成合同额-月
-        /// </summary>
-        public decimal? ContractMonth
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 完成合同额-年度
-        /// </summary>
-        public decimal? ContractYear
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 完成合同额-累计
-        /// </summary>
-        public decimal? ContractTotal
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 工程造价占比
-        /// </summary>
-        public decimal? ConstructionCost
-        {
-            get;
-            set;
-        }
-    }
-}

SGGL/Model/APIItem/HSSE/SeDinMonthReport7Item.cs

@@ -1,126 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Model
-{
-    /// <summary>
-    /// 赛鼎月报信息项 --7、项目HSE培训统计
-    /// </summary>
-    public class SeDinMonthReport7Item
-    { 
-        /// <summary>
-        /// ID
-        /// </summary>
-        public string MonthReport7Id
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 月报ID
-        /// </summary>
-        public string MonthReportId
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 专项安全培训-月次
-        /// </summary>
-        public int? SpecialMontNum
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 专项安全培训-年次
-        /// </summary>
-        public int? SpecialYearNum
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 专项安全培训-项目累计次
-        /// </summary>
-        public int? SpecialTotalNum
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 专项安全培训-月人
-        /// </summary>
-        public int? SpecialMontPerson
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 专项安全培训-年人
-        /// </summary>
-        public int? SpecialYearPerson
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 专项安全培训-项目累计人
-        /// </summary>
-        public int? SpecialTotalPerson
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 员工入场安全培训-月次
-        /// </summary>
-        public int? EmployeeMontNum
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 员工入场安全培训-年次
-        /// </summary>
-        public int? EmployeeYearNum
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 员工入场安全培训-项目累计次
-        /// </summary>
-        public int? EmployeeTotalNum
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 员工入场安全培训-月人
-        /// </summary>
-        public int? EmployeeMontPerson
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 员工入场安全培训-年人
-        /// </summary>
-        public int? EmployeeYearPerson
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 员工入场安全培训-项目累计人
-        /// </summary>
-        public int? EmployeeTotalPerson
-        {
-            get;
-            set;
-        }
-    }
-}

SGGL/Model/APIItem/HSSE/SeDinMonthReport8Item.cs

@@ -1,110 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Model
-{
-    /// <summary>
-    /// 赛鼎月报信息项 --8、项目HSE会议统计
-    /// </summary>
-    public class SeDinMonthReport8Item
-    { 
-        /// <summary>
-        /// ID
-        /// </summary>
-        public string MonthReport8Id
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 月报ID
-        /// </summary>
-        public string MonthReportId
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 周例会-月次
-        /// </summary>
-        public int? WeekMontNum
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 周例会-项目累计次
-        /// </summary>
-        public int? WeekTotalNum
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 周例会-月人
-        /// </summary>
-        public int? WeekMontPerson
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 月例会-月次
-        /// </summary>
-        public int? MonthMontNum
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 月例会-项目累计次
-        /// </summary>
-        public int? MonthTotalNum
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 月例会-月人
-        /// </summary>
-        public int? MonthMontPerson
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 专题例会-月次
-        /// </summary>
-        public int? SpecialMontNum
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 专题例会-项目累计次
-        /// </summary>
-        public int? SpecialTotalNum
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 专题例会-月人
-        /// </summary>
-        public int? SpecialMontPerson
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 班组会议-明细表
-        /// </summary>
-        public List<Model.SeDinMonthReport8ItemItem> SeDinMonthReport8ItemItem
-        {
-            get;
-            set;
-        }
-    }
-}

SGGL/Model/APIItem/HSSE/SeDinMonthReport8ItemItem.cs

@@ -1,62 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Model
-{
-    /// <summary>
-    /// 赛鼎月报信息项 --8、项目HSE会议统计(班前会)
-    /// </summary>
-    public class SeDinMonthReport8ItemItem
-    { 
-        /// <summary>
-        /// ID
-        /// </summary>
-        public string MonthReport8ItemId
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 月报ID
-        /// </summary>
-        public string MonthReportId
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 单位名称
-        /// </summary>
-        public string UnitName
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 班组名称
-        /// </summary>
-        public string TeamName
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 班前会-月次
-        /// </summary>
-        public int? ClassNum
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 班前会-人次
-        /// </summary>
-        public int? ClassPersonNum
-        {
-            get;
-            set;
-        }
-    }
-}

SGGL/Model/APIItem/HSSE/SeDinMonthReport9Item.cs

@@ -1,150 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Model
-{
-    /// <summary>
-    /// 赛鼎月报信息项 --9、项目HSE检查统计
-    /// </summary>
-    public class SeDinMonthReport9Item
-    { 
-        /// <summary>
-        /// ID
-        /// </summary>
-        public string MonthReport9Id
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 月报ID
-        /// </summary>
-        public string MonthReportId
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 日常巡检-月次
-        /// </summary>
-        public int? DailyMonth
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 日常巡检-年次
-        /// </summary>
-        public int? DailyYear
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 日常巡检-总累计
-        /// </summary>
-        public int? DailyTotal
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 周联合检查-月次
-        /// </summary>
-        public int? WeekMonth
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 周联合检查-年次
-        /// </summary>
-        public int? WeekYear
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 周联合检查-总累计
-        /// </summary>
-        public int? WeekTotal
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 专项检查-月次
-        /// </summary>
-        public int? SpecialMonth
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 专项检查-年次
-        /// </summary>
-        public int? SpecialYear
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 专项检查-总累计
-        /// </summary>
-        public int? SpecialTotal
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 月综合HSE检查-月次
-        /// </summary>
-        public int? MonthlyMonth
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 月综合HSE检查-年次
-        /// </summary>
-        public int? MonthlyYear
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 月综合HSE检查-总累计
-        /// </summary>
-        public int? MonthlyTotal
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 隐患整改单
-        /// </summary>
-        public List<Model.SeDinMonthReport9ItemRectification> SeDinMonthReport9ItemRectification
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 专项检查
-        /// </summary>
-        public List<Model.SeDinMonthReport9ItemSpecial> SeDinMonthReport9ItemSpecial
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 停工令
-        /// </summary>
-        public List<Model.SeDinMonthReport9ItemStoppage> SeDinMonthReport9ItemStoppage
-        {
-            get;
-            set;
-        }
-    }
-}

SGGL/Model/APIItem/HSSE/SeDinMonthReport9ItemRectification.cs

@@ -1,134 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Model
-{
-    /// <summary>
-    /// 赛鼎月报信息项 --9、项目HSE检查统计-隐患整改单
-    /// </summary>
-    public class SeDinMonthReport9ItemRectification
-    { 
-        /// <summary>
-        /// ID
-        /// </summary>
-        public string MonthReport9ItemId
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 月报ID
-        /// </summary>
-        public string MonthReportId
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        ///  单位名称
-        /// </summary>
-        public string UnitName
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 下发数量（本月）
-        /// </summary>
-        public int? IssuedMonth
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 下发数量（本月）较大
-        /// </summary>
-        public int? IssuedMonthLarge
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 下发数量（本月）重大
-        /// </summary>
-        public int? IssuedMonthSerious
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 整改完成数量（本月）
-        /// </summary>
-        public int? RectificationMoth
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 整改完成数量（本月）较大
-        /// </summary>
-        public int? RectificationMothLarge
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 整改完成数量（本月）重大
-        /// </summary>
-        public int? RectificationMothSerious
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 下发数量（累计）
-        /// </summary>
-        public int? IssuedTotal
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 下发数量（累计）较大
-        /// </summary>
-        public int? IssuedTotalLarge
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 下发数量（累计）重大
-        /// </summary>
-        public int? IssuedTotalSerious
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 整改完成数量（累计）
-        /// </summary>
-        public int? RectificationTotal
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 整改完成数量（累计）较大
-        /// </summary>
-        public int? RectificationTotalLarge
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 整改完成数量（累计）重大
-        /// </summary>
-        public int? RectificationTotalSerious
-        {
-            get;
-            set;
-        }
-    }
-}

SGGL/Model/APIItem/HSSE/SeDinMonthReport9ItemSpecial.cs

@@ -1,62 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Model
-{
-    /// <summary>
-    /// 赛鼎月报信息项 --9、项目HSE检查统计-专项检查
-    /// </summary>
-    public class SeDinMonthReport9ItemSpecial
-    { 
-        /// <summary>
-        /// ID
-        /// </summary>
-        public string MonthReport9ItemId
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 月报ID
-        /// </summary>
-        public string MonthReportId
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 类型
-        /// </summary>
-        public string TypeName
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 检查次数（本月）
-        /// </summary>
-        public int? CheckMonth
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 次数（本年度累计）
-        /// </summary>
-        public int? CheckYear
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 次数（项目总累计）
-        /// </summary>
-        public int? CheckTotal
-        {
-            get;
-            set;
-        }
-    }
-}

SGGL/Model/APIItem/HSSE/SeDinMonthReport9ItemStoppage.cs

@@ -1,70 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Model
-{
-    /// <summary>
-    /// 赛鼎月报信息项 --9、项目HSE检查统计-停工令
-    /// </summary>
-    public class SeDinMonthReport9ItemStoppage
-    { 
-        /// <summary>
-        /// ID
-        /// </summary>
-        public string MonthReport9ItemId
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 月报ID
-        /// </summary>
-        public string MonthReportId
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        ///  单位名称
-        /// </summary>
-        public string UnitName
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 下发数量（本月）
-        /// </summary>
-        public int? IssuedMonth
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 停工天数（本月）
-        /// </summary>
-        public int? StoppageMonth
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 下发数量（累计）
-        /// </summary>
-        public int? IssuedTotal
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 停工天数（累计）
-        /// </summary>
-        public int? StoppageTotal
-        {
-            get;
-            set;
-        }
-    }
-}

SGGL/Model/APIItem/HSSE/SeDinMonthReportItem.cs

@@ -1,224 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Model
-{
-    /// <summary>
-    /// 赛鼎月报信息项
-    /// </summary>
-    public class SeDinMonthReportItem
-    {
-        /// <summary>
-        /// ID
-        /// </summary>
-        public string MonthReportId
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 项目ID
-        /// </summary>
-        public string ProjectId
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 月份
-        /// </summary>
-        public string ReporMonth
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 截止日期
-        /// </summary>
-        public string DueDate
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 开始日期
-        /// </summary>
-        public string StartDate
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 结束日期
-        /// </summary>
-        public string EndDate
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 编制人ID
-        /// </summary>
-        public string CompileManId
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 编制人姓名
-        /// </summary>
-        public string CompileManName
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 审核人ID
-        /// </summary>
-        public string AuditManId
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 审核人姓名
-        /// </summary>
-        public string AuditManName
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 批准人ID
-        /// </summary>
-        public string ApprovalManId
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 批准人姓名
-        /// </summary>
-        public string ApprovalManName
-        {
-            get;
-            set;
-        }
-        
-        /// <summary>
-        /// 本月HSE活动综述
-        /// </summary>
-        public string ThisSummary
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        /// 下月HSE工作计划
-        /// </summary>
-        public string NextPlan
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        ///  状态（0-待提交；1-已提交）
-        /// </summary>
-        public string States
-        {
-            get;
-            set;
-        }
-    
-        /// <summary>
-        ///  办理人
-        /// </summary>
-        public string OperaterId
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        ///  下一步办理人
-        /// </summary>
-        public string NextManId
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        ///  下一步办理人
-        /// </summary>
-        public string NextManName
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        ///  提交时间
-        /// </summary>
-        public DateTime? CommitTime
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        ///  办理步骤
-        /// </summary>
-        public string StepName
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        ///  是否同意
-        /// </summary>
-        public bool isAgree
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        ///  意见
-        /// </summary>
-        public string Opinion
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        ///  事故综述
-        /// </summary>
-        public string AccidentsSummary
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        ///  3、项目HSE事故、事件统计
-        /// </summary>
-        public List<Model.SeDinMonthReport3Item> SeDinMonthReport3Item
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        ///  4、本月人员投入情况
-        /// </summary>
-        public List<Model.SeDinMonthReport4Item> SeDinMonthReport4Item
-        {
-            get;
-            set;
-        }
-        /// <summary>
-        ///  5、本月大型、特种设备投入情况
-        /// </summary>
-        public List<Model.SeDinMonthReport5Item> SeDinMonthReport5Item
-        {
-            get;
-            set;
-        }
-    }
-}

SGGL/Model/Model.csproj

@@ -131,7 +131,6 @@
     <Compile Include="APIItem\HSSE\PictureItem.cs" />
     <Compile Include="APIItem\HSSE\ReEvaluator.cs" />
     <Compile Include="APIItem\HSSE\RoutingInspectionItem.cs" />
-    <Compile Include="APIItem\HSSE\SeDinMonthReport4OtherItem.cs" />
     <Compile Include="APIItem\HSSE\BonusScoreSelfManagementItem.cs" />
     <Compile Include="APIItem\HSSE\TrainingRecordItemItem.cs" />
     <Compile Include="APIItem\OperationReportDto.cs" />
@@ -144,23 +143,6 @@
     <Compile Include="APIItem\HSSE\RectifyNoticesItem.cs" />
     <Compile Include="APIItem\HSSE\RectifyNoticesItemItem.cs" />
     <Compile Include="APIItem\HSSE\ResourcesItem.cs" />
-    <Compile Include="APIItem\HSSE\SeDinMonthReport10Item.cs" />
-    <Compile Include="APIItem\HSSE\SeDinMonthReport11Item.cs" />
-    <Compile Include="APIItem\HSSE\SeDinMonthReport12Item.cs" />
-    <Compile Include="APIItem\HSSE\SeDinMonthReport1Item.cs" />
-    <Compile Include="APIItem\HSSE\SeDinMonthReport2Item.cs" />
-    <Compile Include="APIItem\HSSE\SeDinMonthReport3Item.cs" />
-    <Compile Include="APIItem\HSSE\SeDinMonthReport4Item.cs" />
-    <Compile Include="APIItem\HSSE\SeDinMonthReport5Item.cs" />
-    <Compile Include="APIItem\HSSE\SeDinMonthReport6Item.cs" />
-    <Compile Include="APIItem\HSSE\SeDinMonthReport7Item.cs" />
-    <Compile Include="APIItem\HSSE\SeDinMonthReport8Item.cs" />
-    <Compile Include="APIItem\HSSE\SeDinMonthReport8ItemItem.cs" />
-    <Compile Include="APIItem\HSSE\SeDinMonthReport9Item.cs" />
-    <Compile Include="APIItem\HSSE\SeDinMonthReport9ItemRectification.cs" />
-    <Compile Include="APIItem\HSSE\SeDinMonthReport9ItemSpecial.cs" />
-    <Compile Include="APIItem\HSSE\SeDinMonthReport9ItemStoppage.cs" />
-    <Compile Include="APIItem\HSSE\SeDinMonthReportItem.cs" />
     <Compile Include="APIItem\HSSE\SubscribeMessageItem.cs" />
     <Compile Include="APIItem\HSSE\SubUnitQualityItem.cs" />
     <Compile Include="APIItem\HSSE\SysTestRuleItem.cs" />

SGGL/WebAPI/Controllers/HSSE/SeDinMonthReportController.cs

@@ -1,651 +0,0 @@
-using BLL;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web.Http;
-
-namespace WebAPI.Controllers
-{
-    /// <summary>
-    /// 赛鼎月报
-    /// </summary>
-    public class SeDinMonthReportController : ApiController
-    {
-        #region 获取赛鼎月报列表信息
-        /// <summary>
-        /// 获取赛鼎月报列表信息
-        /// </summary>
-        /// <param name="projectId">项目ID</param>
-        /// <param name="month">月份</param>
-        ///  <param name="states">状态0-待提交；1-已提交</param>
-        /// <param name="pageIndex">页码</param>
-        /// <returns></returns>
-        public Model.ResponeData getSeDinMonthReportList(string projectId,string month, string states, int pageIndex)
-        {
-            var responeData = new Model.ResponeData();
-            try
-            {
-                var getDataList = APISeDinMonthReportService.getSeDinMonthReportList(projectId, month, states);
-                int pageCount = getDataList.Count();
-                if (pageCount > 0 && pageIndex > 0)
-                {
-                    getDataList = getDataList.Skip(Funs.PageSize * (pageIndex - 1)).Take(Funs.PageSize).ToList();
-                }
-                responeData.data = new { pageCount, getDataList };
-            }
-            catch (Exception ex)
-            {
-                responeData.code = 0;
-                responeData.message = ex.Message;
-            }
-            return responeData;
-        }
-        #endregion
-        
-        #region 获取赛鼎月报详细信息
-        /// <summary>
-        /// 根据主键ID获取赛鼎月报
-        /// </summary>
-        /// <param name="projectId">项目ID</param>
-        /// <param name="month">月份</param>
-        /// <param name="startDate">开始时间</param>
-        /// <param name="endDate">结束时间</param>
-        /// <param name="pageNum">页数</param>
-        /// <returns></returns>
-        public Model.ResponeData getSeDinMonthReportInfo(string projectId, string month, string startDate, string endDate, string pageNum)
-        {
-            var responeData = new Model.ResponeData();
-            try
-            {
-                if (pageNum == "0") ////封面
-                {
-                    var getInfo = APISeDinMonthReportService.getSeDinMonthReport0ById(projectId, month);
-                    if (getInfo == null || string.IsNullOrEmpty(getInfo.MonthReportId))
-                    {
-                        getInfo = APISeDinMonthReportService.getSeDinMonthReportNullPage0(projectId);
-                    }
-                    responeData.data = getInfo;
-                }
-                else if (pageNum == "1") ////1、项目信息
-                {
-                    var getInfo = APISeDinMonthReportService.getSeDinMonthReport1ById(projectId, month);
-                    if (getInfo == null || string.IsNullOrEmpty(getInfo.MonthReportId))
-                    {
-                        getInfo = APISeDinMonthReportService.getSeDinMonthReportNullPage1(projectId);
-                    }
-                    responeData.data = getInfo;
-                }
-                else if (pageNum == "2") ////2、项目安全工时统计
-                {
-                    var getInfo = APISeDinMonthReportService.getSeDinMonthReport2ById(projectId, month);
-                    if (getInfo == null || string.IsNullOrEmpty(getInfo.MonthReportId))
-                    {
-                        getInfo = APISeDinMonthReportService.getSeDinMonthReportNullPage2(projectId, month, startDate, endDate);
-                    }
-                    responeData.data = getInfo;
-                }
-                else if (pageNum == "3") ////3、项目HSE事故、事件统计
-                {
-                    var getInfo = APISeDinMonthReportService.getSeDinMonthReport3ById(projectId, month);
-                    if (getInfo == null || getInfo.SeDinMonthReport3Item == null || getInfo.SeDinMonthReport3Item.Count() == 0)
-                    {
-                        getInfo = APISeDinMonthReportService.getSeDinMonthReportNullPage3(projectId, month, startDate, endDate);
-                    }
-
-                    responeData.data = getInfo;
-                }
-                else if (pageNum == "4") ////4、人员
-                {
-                    var getLists = APISeDinMonthReportService.getSeDinMonthReport4ById(projectId, month);
-                    if (getLists.Count() == 0)
-                    {
-                        getLists = APISeDinMonthReportService.getSeDinMonthReportNullPage4(projectId, month, startDate, endDate);
-                    }
-                    responeData.data = getLists;
-                }
-                else if (pageNum == "5") ////5、本月大型、特种设备投入情况
-                {
-                    var getLists = APISeDinMonthReportService.getSeDinMonthReport5ById(projectId, month);
-                    if (getLists.Count == 0)
-                    {
-                        getLists = APISeDinMonthReportService.getSeDinMonthReportNullPage5(projectId, month, startDate, endDate);
-                    }
-                    responeData.data = getLists;
-                }
-                else if (pageNum == "6") ////6、安全生产费用投入情况
-                {
-                    var getInfo = APISeDinMonthReportService.getSeDinMonthReport6ById(projectId, month);
-                    if (getInfo == null || string.IsNullOrEmpty(getInfo.MonthReportId))
-                    {
-                        getInfo = APISeDinMonthReportService.getSeDinMonthReportNullPage6(projectId, month, startDate, endDate);
-                    }
-
-                    responeData.data = getInfo;
-                }
-                else if (pageNum == "7") ////7、项目HSE培训统计
-                {
-                    var getInfo = APISeDinMonthReportService.getSeDinMonthReport7ById(projectId, month);
-                    if (getInfo == null || string.IsNullOrEmpty(getInfo.MonthReportId))
-                    {
-                        getInfo = APISeDinMonthReportService.getSeDinMonthReportNullPage7(projectId, month, startDate, endDate);
-                    }
-
-                    responeData.data = getInfo;
-                }
-                else if (pageNum == "8") ////8、项目HSE会议统计
-                {
-                    var getInfo = APISeDinMonthReportService.getSeDinMonthReport8ById(projectId, month);
-                    if (getInfo == null || string.IsNullOrEmpty(getInfo.MonthReportId))
-                    {
-                        getInfo = APISeDinMonthReportService.getSeDinMonthReportNullPage8(projectId, month, startDate, endDate);
-                    }
-
-                    responeData.data = getInfo;
-                }
-                else if (pageNum == "9") ////9、项目HSE检查统计
-                {
-                    var getInfo = APISeDinMonthReportService.getSeDinMonthReport9ById(projectId, month);
-                    if (getInfo == null || string.IsNullOrEmpty(getInfo.MonthReportId))
-                    {
-                        getInfo = APISeDinMonthReportService.getSeDinMonthReportNullPage9(projectId, month, startDate, endDate);
-                    }
-
-                    responeData.data = getInfo;
-                }
-                else if (pageNum == "10") ////10、项目奖惩情况统计
-                {
-                    var getInfo = APISeDinMonthReportService.getSeDinMonthReport10ById(projectId, month);
-                    if (getInfo == null || string.IsNullOrEmpty(getInfo.MonthReportId))
-                    {
-                        getInfo = APISeDinMonthReportService.getSeDinMonthReportNullPage10(projectId, month, startDate, endDate);
-                    }
-
-                    responeData.data = getInfo;
-                }
-                else if (pageNum == "11") ////11、项目危大工程施工情况
-                {
-                    var getInfo = APISeDinMonthReportService.getSeDinMonthReport11ById(projectId, month);
-                    if (getInfo == null || string.IsNullOrEmpty(getInfo.MonthReportId))
-                    {
-                        getInfo = APISeDinMonthReportService.getSeDinMonthReportNullPage11(projectId, month, startDate, endDate);
-                    }
-
-                    responeData.data = getInfo;
-                }
-                else if (pageNum == "12") ////12、项目应急演练情况
-                {
-                    var getInfo = APISeDinMonthReportService.getSeDinMonthReport12ById(projectId, month);
-                    if (getInfo == null || string.IsNullOrEmpty(getInfo.MonthReportId))
-                    {
-                        getInfo = APISeDinMonthReportService.getSeDinMonthReportNullPage12(projectId, month, startDate, endDate);
-                    }
-
-                    responeData.data = getInfo;
-                }
-                else ////13、14、本月HSE活动综述、下月HSE工作计划
-                {
-                    responeData.data = APISeDinMonthReportService.getSeDinMonthReport13ById(projectId, month); ;
-                }
-            }
-            catch (Exception ex)
-            {
-                responeData.code = 0;
-                responeData.message = ex.Message;
-            }
-
-            return responeData;
-        }
-        #endregion
-
-        #region 保存赛鼎月报信息
-        #region 保存 MonthReport0 封面
-        /// <summary>
-        /// 保存赛鼎月报
-        /// </summary>
-        /// <param name="newItem">赛鼎月报</param>
-        /// <returns></returns>
-        [HttpPost]
-        public Model.ResponeData SaveSeDinMonthReport0([FromBody] Model.SeDinMonthReportItem newItem)
-        {
-            var responeData = new Model.ResponeData();
-            try
-            {
-                responeData.data = APISeDinMonthReportService.SaveSeDinMonthReport0(newItem);
-            }
-            catch (Exception ex)
-            {
-                responeData.code = 0;
-                responeData.message = ex.Message;
-            }
-
-            return responeData;
-        }
-        #endregion
-        #region 保存 MonthReport1、项目信息
-        /// <summary>
-        /// 保存赛鼎月报
-        /// </summary>
-        /// <param name="newItem">赛鼎月报</param>
-        /// <returns></returns>
-        [HttpPost]
-        public Model.ResponeData SaveSeDinMonthReport1([FromBody] Model.SeDinMonthReport1Item newItem)
-        {
-            var responeData = new Model.ResponeData();
-            try
-            {
-                if (!string.IsNullOrEmpty(newItem.MonthReportId))
-                {
-                    responeData.data = APISeDinMonthReportService.SaveSeDinMonthReport1(newItem);
-                }
-                else
-                {
-                    responeData.code = 1;
-                    responeData.message = "请先保存月报主表信息！";
-                }
-            }
-            catch (Exception ex)
-            {
-                responeData.code = 0;
-                responeData.message = ex.Message;
-            }
-
-            return responeData;
-        }
-        #endregion
-        #region 保存 MonthReport2、项目安全工时统计
-        /// <summary>
-        /// 保存赛鼎月报
-        /// </summary>
-        /// <param name="newItem">赛鼎月报</param>
-        /// <returns></returns>
-        [HttpPost]
-        public Model.ResponeData SaveSeDinMonthReport2([FromBody] Model.SeDinMonthReport2Item newItem)
-        {
-            var responeData = new Model.ResponeData();
-            try
-            {
-                if (!string.IsNullOrEmpty(newItem.MonthReportId))
-                {
-                    responeData.data = APISeDinMonthReportService.SaveSeDinMonthReport2(newItem);
-                }
-                else
-                {
-                    responeData.code = 1;
-                    responeData.message = "请先保存月报主表信息！";
-                }
-            }
-            catch (Exception ex)
-            {
-                responeData.code = 0;
-                responeData.message = ex.Message;
-            }
-
-            return responeData;
-        }
-        #endregion
-        #region 保存 MonthReport3、项目HSE事故、事件统计
-        /// <summary>
-        /// 保存赛鼎月报
-        /// </summary>
-        /// <param name="newItem">赛鼎月报</param>
-        /// <returns></returns>
-        [HttpPost]
-        public Model.ResponeData SaveSeDinMonthReport3([FromBody] Model.SeDinMonthReportItem newItem)
-        {
-            var responeData = new Model.ResponeData();
-            try
-            {
-                if (!string.IsNullOrEmpty(newItem.MonthReportId))
-                {
-                    responeData.data = APISeDinMonthReportService.SaveSeDinMonthReport3(newItem);
-                }
-                else
-                {
-                    responeData.code = 1;
-                    responeData.message = "请先保存月报主表信息！";
-                }
-            }
-            catch (Exception ex)
-            {
-                responeData.code = 0;
-                responeData.message = ex.Message;
-            }
-
-            return responeData;
-        }
-        #endregion
-        #region 保存 MonthReport4、本月人员投入情况
-        /// <summary>
-        /// 保存赛鼎月报
-        /// </summary>
-        /// <param name="newItem">赛鼎月报</param>
-        /// <returns></returns>
-        [HttpPost]
-        public Model.ResponeData SaveSeDinMonthReport4([FromBody]  Model.SeDinMonthReportItem newItem)
-        {
-            var responeData = new Model.ResponeData();
-            try
-            {
-                if (!string.IsNullOrEmpty(newItem.MonthReportId))
-                {
-                    responeData.data = APISeDinMonthReportService.SaveSeDinMonthReport4(newItem);
-                }
-                else
-                {
-                    responeData.code = 1;
-                    responeData.message = "请先保存月报主表信息！";
-                }
-            }
-            catch (Exception ex)
-            {
-                responeData.code = 0;
-                responeData.message = ex.Message;
-            }
-
-            return responeData;
-        }
-        #endregion
-        #region 保存 MonthReport5、本月大型、特种设备投入情况
-        /// <summary>
-        /// 保存赛鼎月报
-        /// </summary>
-        /// <param name="newItem">赛鼎月报</param>
-        /// <returns></returns>
-        [HttpPost]
-        public Model.ResponeData SaveSeDinMonthReport5([FromBody] Model.SeDinMonthReportItem newItem)
-        {
-            var responeData = new Model.ResponeData();
-            try
-            {
-                if (!string.IsNullOrEmpty(newItem.MonthReportId))
-                {
-                    responeData.data = APISeDinMonthReportService.SaveSeDinMonthReport5(newItem);
-                }
-                else
-                {
-                    responeData.code = 1;
-                    responeData.message = "请先保存月报主表信息！";
-                }
-            }
-            catch (Exception ex)
-            {
-                responeData.code = 0;
-                responeData.message = ex.Message;
-            }
-
-            return responeData;
-        }
-        #endregion
-        #region 保存 MonthReport6、安全生产费用投入情况
-        /// <summary>
-        /// 保存赛鼎月报
-        /// </summary>
-        /// <param name="newItem">赛鼎月报</param>
-        /// <returns></returns>
-        [HttpPost]
-        public Model.ResponeData SaveSeDinMonthReport6([FromBody] Model.SeDinMonthReport6Item newItem)
-        {
-            var responeData = new Model.ResponeData();
-            try
-            {
-                if (!string.IsNullOrEmpty(newItem.MonthReportId))
-                {
-                    responeData.data = APISeDinMonthReportService.SaveSeDinMonthReport6(newItem);
-                }
-                else
-                {
-                    responeData.code = 1;
-                    responeData.message = "请先保存月报主表信息！";
-                }
-            }
-            catch (Exception ex)
-            {
-                responeData.code = 0;
-                responeData.message = ex.Message;
-            }
-
-            return responeData;
-        }
-        #endregion
-        #region 保存 MonthReport7、项目HSE培训统计
-        /// <summary>
-        /// 保存赛鼎月报
-        /// </summary>
-        /// <param name="newItem">赛鼎月报</param>
-        /// <returns></returns>
-        [HttpPost]
-        public Model.ResponeData SaveSeDinMonthReport7([FromBody] Model.SeDinMonthReport7Item newItem)
-        {
-            var responeData = new Model.ResponeData();
-            try
-            {
-                if (!string.IsNullOrEmpty(newItem.MonthReportId))
-                {
-                    responeData.data = APISeDinMonthReportService.SaveSeDinMonthReport7(newItem);
-                }
-                else
-                {
-                    responeData.code = 1;
-                    responeData.message = "请先保存月报主表信息！";
-                }
-            }
-            catch (Exception ex)
-            {
-                responeData.code = 0;
-                responeData.message = ex.Message;
-            }
-
-            return responeData;
-        }
-        #endregion
-        #region 保存 MonthReport8、项目HSE会议统计
-        /// <summary>
-        /// 保存赛鼎月报
-        /// </summary>
-        /// <param name="newItem">赛鼎月报</param>
-        /// <returns></returns>
-        [HttpPost]
-        public Model.ResponeData SaveSeDinMonthReport8([FromBody] Model.SeDinMonthReport8Item newItem)
-        {
-            var responeData = new Model.ResponeData();
-            try
-            {
-                if (!string.IsNullOrEmpty(newItem.MonthReportId))
-                {
-                    responeData.data = APISeDinMonthReportService.SaveSeDinMonthReport8(newItem);
-                }
-                else
-                {
-                    responeData.code = 1;
-                    responeData.message = "请先保存月报主表信息！";
-                }
-            }
-            catch (Exception ex)
-            {
-                responeData.code = 0;
-                responeData.message = ex.Message;
-            }
-
-            return responeData;
-        }
-        #endregion
-        #region 保存 MonthReport9、项目HSE检查统计
-        /// <summary>
-        /// 保存赛鼎月报
-        /// </summary>
-        /// <param name="newItem">赛鼎月报</param>
-        /// <returns></returns>
-        [HttpPost]
-        public Model.ResponeData SaveSeDinMonthReport9([FromBody] Model.SeDinMonthReport9Item newItem)
-        {
-            var responeData = new Model.ResponeData();
-            try
-            {
-                if (!string.IsNullOrEmpty(newItem.MonthReportId))
-                {
-                    responeData.data = APISeDinMonthReportService.SaveSeDinMonthReport9(newItem);
-                }
-                else
-                {
-                    responeData.code = 1;
-                    responeData.message = "请先保存月报主表信息！";
-                }
-            }
-            catch (Exception ex)
-            {
-                responeData.code = 0;
-                responeData.message = ex.Message;
-            }
-
-            return responeData;
-        }
-        #endregion
-        #region 保存 MonthReport10、项目奖惩情况统计
-        /// <summary>
-        /// 保存赛鼎月报
-        /// </summary>
-        /// <param name="newItem">赛鼎月报</param>
-        /// <returns></returns>
-        [HttpPost]
-        public Model.ResponeData SaveSeDinMonthReport10([FromBody] Model.SeDinMonthReport10Item newItem)
-        {
-            var responeData = new Model.ResponeData();
-            try
-            {
-                if (!string.IsNullOrEmpty(newItem.MonthReportId))
-                {
-                    responeData.data = APISeDinMonthReportService.SaveSeDinMonthReport10(newItem);
-                }
-                else
-                {
-                    responeData.code = 1;
-                    responeData.message = "请先保存月报主表信息！";
-                }
-            }
-            catch (Exception ex)
-            {
-                responeData.code = 0;
-                responeData.message = ex.Message;
-            }
-
-            return responeData;
-        }
-        #endregion
-        #region 保存 MonthReport11、项目危大工程施工情况
-        /// <summary>
-        /// 保存赛鼎月报
-        /// </summary>
-        /// <param name="newItem">赛鼎月报</param>
-        /// <returns></returns>
-        [HttpPost]
-        public Model.ResponeData SaveSeDinMonthReport11([FromBody] Model.SeDinMonthReport11Item newItem)
-        {
-            var responeData = new Model.ResponeData();
-            try
-            {
-                if (!string.IsNullOrEmpty(newItem.MonthReportId))
-                {
-                    responeData.data = APISeDinMonthReportService.SaveSeDinMonthReport11(newItem);
-                }
-                else
-                {
-                    responeData.code = 1;
-                    responeData.message = "请先保存月报主表信息！";
-                }
-            }
-            catch (Exception ex)
-            {
-                responeData.code = 0;
-                responeData.message = ex.Message;
-            }
-
-            return responeData;
-        }
-        #endregion
-        #region 保存 MonthReport12、项目应急演练情况
-        /// <summary>
-        /// 保存赛鼎月报
-        /// </summary>
-        /// <param name="newItem">赛鼎月报</param>
-        /// <returns></returns>
-        [HttpPost]
-        public Model.ResponeData SaveSeDinMonthReport12([FromBody] Model.SeDinMonthReport12Item newItem)
-        {
-            var responeData = new Model.ResponeData();
-            try
-            {
-                if (!string.IsNullOrEmpty(newItem.MonthReportId))
-                {
-                    responeData.data = APISeDinMonthReportService.SaveSeDinMonthReport12(newItem);
-                }
-                else
-                {
-                    responeData.code = 1;
-                    responeData.message = "请先保存月报主表信息！";
-                }
-            }
-            catch (Exception ex)
-            {
-                responeData.code = 0;
-                responeData.message = ex.Message;
-            }
-
-            return responeData;
-        }
-        #endregion
-        #region 保存 MonthReport13、14、本月HSE活动综述、下月HSE工作计划
-        /// <summary>
-        /// 保存赛鼎月报
-        /// </summary>
-        /// <param name="newItem">赛鼎月报</param>
-        /// <returns></returns>
-        [HttpPost]
-        public Model.ResponeData SaveSeDinMonthReport13([FromBody] Model.SeDinMonthReportItem newItem)
-        {
-            var responeData = new Model.ResponeData();
-            try
-            {
-                responeData.data = APISeDinMonthReportService.SaveSeDinMonthReport13(newItem);
-            }
-            catch (Exception ex)
-            {
-                responeData.code = 0;
-                responeData.message = ex.Message;
-            }
-
-            return responeData;
-        }
-        #endregion        
-        #endregion
-
-        #region 汇总到HSE数据
-        /// <summary>
-        /// 汇总到HSE数据
-        /// </summary>
-        /// <param name="newItem">赛鼎月报</param>
-        /// <returns></returns>
-        [HttpPost]
-        public Model.ResponeData SaveSeDinMonthHSEDataCollect([FromBody] Model.SeDinMonthReportItem newItem)
-        {
-            var responeData = new Model.ResponeData();
-            try
-            {
-                ////如果月报审核完成 月报信息写入到汇总   
-                var getSeDin_MonthReport = ManagerMonth_SeDinService.GetMonthReportByMonthReportId(newItem.MonthReportId);
-                if (getSeDin_MonthReport != null && getSeDin_MonthReport.States == Const.State_3 && getSeDin_MonthReport.ReporMonth.HasValue)
-                {
-                    HSEDataCollectService.SaveHSEDataCollectItem(getSeDin_MonthReport);
-                }
-                responeData.data = newItem.MonthReportId;
-            }
-            catch (Exception ex)
-            {
-                responeData.code = 0;
-                responeData.message = ex.Message;
-            }
-
-            return responeData;
-        }
-        #endregion
-    }
-}

SGGL/WebAPI/WebAPI.csproj

@@ -247,7 +247,6 @@
     <Compile Include="Controllers\HSSE\ReceiveFileManagerController.cs" />
     <Compile Include="Controllers\HSSE\RectifyNoticesController.cs" />
     <Compile Include="Controllers\HSSE\ResourcesController.cs" />
-    <Compile Include="Controllers\HSSE\SeDinMonthReportController.cs" />
     <Compile Include="Controllers\HSSE\ServerTestPlanController.cs" />
     <Compile Include="Controllers\HSSE\ServerTestRecordController.cs" />
     <Compile Include="Controllers\HSSE\TestPlanController.cs" />