2023-03-09 合同归档修改，安全首页修改

DataBase/版本日志/SUBQHSE_V2023-03-09.sql

@@ -0,0 +1,4 @@
+alter table [dbo].[HSSEData_HSSE] alter column [TotalEnergyConsumption] decimal(18,4) null
+alter table [dbo].[HSSEData_HSSE] alter column [IncomeComprehensiveEnergyConsumption] decimal(18,4) null
+alter table [dbo].[HSSEData_HSSE] alter column [NewWaterConsumption] decimal(18,4) null
+go

SGGL/BLL/PHTGL/ContractCompile/ContractReviewService.cs

@@ -618,34 +618,94 @@ namespace BLL
 
         }
 
-        public static void PrintApprovalForm(string ContractReviewId)
+        public static void PrintFileByDocument(Document doc,string name)
+        {
+            string rootPath = Funs.RootPath;
+ 
+            string newUrl = string.Empty;
+            newUrl = rootPath + "File\\Word\\PHTGL\\合同评审.docx";
+            newUrl = newUrl.Replace(".docx", string.Format("{0:yyyy-MM}", DateTime.Now) + ".docx");
+            if (File.Exists(newUrl))
+            {
+                File.Delete(newUrl);
+            }
+            doc.Save(newUrl);
+            //生成PDF文件
+            string pdfUrl = newUrl.Replace(".docx", ".pdf");
+            Document doc1 = new Aspose.Words.Document(newUrl);
+            //验证参数
+            if (doc1 == null) { throw new Exception("Word文件无效"); }
+            doc1.Save(pdfUrl, Aspose.Words.SaveFormat.Pdf);//还可以改成其它格式
+            string fileName = Path.GetFileName(pdfUrl).Replace("合同评审", name );
+            FileInfo info = new FileInfo(pdfUrl);
+            long fileSize = info.Length;
+            System.Web.HttpContext.Current.Response.Clear();
+            System.Web.HttpContext.Current.Response.ContentType = "application/x-zip-compressed";
+            System.Web.HttpContext.Current.Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
+            System.Web.HttpContext.Current.Response.AddHeader("Content-Length", fileSize.ToString());
+            System.Web.HttpContext.Current.Response.TransmitFile(pdfUrl, 0, fileSize);
+            System.Web.HttpContext.Current.Response.Flush();
+            System.Web.HttpContext.Current.Response.Close();
+            File.Delete(newUrl);
+            File.Delete(pdfUrl);
+
+        }
+
+        public static void  PrintApprovalForm(string ContractReviewId)
         {
             var ReviewModel = BLL.PHTGL_ContractReviewService.GetPHTGL_ContractReviewById(ContractReviewId);
             var getFireWork = BLL.ContractService.GetContractById(ReviewModel.ContractId);
+            Document doc=new Document();    
             switch (getFireWork.ConfirmWay)
             {
                 case "1":
+                    doc = PrintApprovalFormType_SetSub(ContractReviewId);
                     break;
                 case "2":
+                    doc = PrintApprovalFormType_SetSub(ContractReviewId);
+
                     break;
                 case "3":
+                    doc = PrintApprovalFormType_SetSub(ContractReviewId);
+
                     break;
                 case "4":
+                    doc = PrintApprovalFormType_Act(ContractReviewId);
+
                     break;
                 case "5":
+                    doc = PrintApprovalFormType_Act(ContractReviewId);
+
                     break; 
+                default :
+                    doc = PrintApprovalFormType__Con(ContractReviewId);
+                    break;
             }
+            PrintFileByDocument(doc, getFireWork.ContractNum+ getFireWork.ContractName+ "-合同管理资料");
         }
         /// <summary>
         /// ConfirmWay 4，5
         /// </summary>
-        public static  void PrintApprovalFormType_Act()
+        public static Document PrintApprovalFormType_Act(string ContractReviewId)
-        { 
+        {
+            Model.PHTGL_Contract Contract = new Model.PHTGL_Contract(); //合同信息
+            Model.PHTGL_ActionPlanFormation ActPlan = new Model.PHTGL_ActionPlanFormation(); //实施计划编制信息
+ 
+            var ReviewModel = BLL.PHTGL_ContractReviewService.GetPHTGL_ContractReviewById(ContractReviewId);
+            Contract = BLL.ContractService.GetContractById(ReviewModel.ContractId);
+            ActPlan = BLL.PHTGL_ActionPlanFormationService.GetPHTGL_ActionPlanFormationByCode(Contract.ActionPlanCode);
+ 
+
+            var Doc_ActPlan = PHTGL_ActionPlanFormationService.Print(ActPlan.ActionPlanID);
+            var Doc_Contract = Print(ContractReviewId);
+            Doc_ActPlan.AppendDocument(Doc_Contract, ImportFormatMode.UseDestinationStyles);
+
+            return Doc_ActPlan;
         }
         /// <summary>
         /// ConfirmWay 1，2，3
         /// </summary>
-        public static void PrintApprovalFormType_SetSub(string ContractReviewId)
+        public static Document PrintApprovalFormType_SetSub(string ContractReviewId)
         {
            
             Model.PHTGL_Contract Contract =new Model.PHTGL_Contract(); //合同信息
@@ -671,10 +731,16 @@ namespace BLL
             Doc_ActPlan.AppendDocument(Doc_ApproveUser, ImportFormatMode.UseDestinationStyles);
             Doc_ActPlan.AppendDocument(Doc_SetSub, ImportFormatMode.UseDestinationStyles);
             Doc_ActPlan.AppendDocument(Doc_Contract, ImportFormatMode.UseDestinationStyles);
-
+            return Doc_ActPlan;
         }
-        public static void PrintApprovalFormType__Con()
+        public static Document PrintApprovalFormType__Con(string ContractReviewId)
         {
+            Model.PHTGL_Contract Contract = new Model.PHTGL_Contract(); //合同信息
+            var ReviewModel = BLL.PHTGL_ContractReviewService.GetPHTGL_ContractReviewById(ContractReviewId);
+            Contract = BLL.ContractService.GetContractById(ReviewModel.ContractId);
+
+            var Doc_Contract = Print(ContractReviewId);
+            return Doc_Contract;
         }
         /// <summary>
         /// 分包合同协议书

SGGL/FineUIPro.Web/PHTGL/Filing/ContractFile.aspx

@@ -23,14 +23,8 @@
                     <Toolbars>
                         <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
-                                 <f:DropDownList runat="server" ID="DropDownList1"  Label="数据来源">
+                                <f:DropDownList ID="drpDepartId" runat="server" Label="主办部门" LabelAlign="Right" LabelWidth="140px"></f:DropDownList>
-                                    <f:ListItem Text="施工管理部" Value="Value1" />
+
-                                    <f:ListItem Text="环境工程事业部" Value="Value2"  />
-                                    <f:ListItem Text="基础设施事业部" Value="Value3"  />
-                                    <f:ListItem Text="运营管理部" Value="Value4" />
-                                    <f:ListItem Text="宁波公司" Value="Value5" />
-                                    <f:ListItem Text="焦化公司" Value="Value6" />
-                                </f:DropDownList>
                                 <f:TextBox runat="server" Label="合同名称" ID="txtContractName" EmptyText="输入查询条件" Width="300px" LabelWidth="90px"
                                     LabelAlign="right">
                                 </f:TextBox>

SGGL/FineUIPro.Web/PHTGL/Filing/ContractFile.aspx.cs

@@ -20,6 +20,8 @@ namespace FineUIPro.Web.PHTGL.Filing
             if (!IsPostBack)
             {
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                BLL.DepartService.InitDepartDropDownList(this.drpDepartId, false);
+
                 BindGrid();
             }
         }
@@ -105,6 +107,12 @@ namespace FineUIPro.Web.PHTGL.Filing
                 strSql += " AND Con.ContractName LIKE @ContractName";
                 listStr.Add(new SqlParameter("@ContractName", "%" + this.txtContractName.Text.Trim() + "%"));
             }
+            if (!string.IsNullOrEmpty(drpDepartId.SelectedValue))
+            {
+                strSql += " AND Con.DepartId = @DepartId";
+                listStr.Add(new SqlParameter("@DepartId", drpDepartId.SelectedValue));
+
+            }
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
             Grid1.RecordCount = tb.Rows.Count;

SGGL/FineUIPro.Web/PHTGL/Filing/ContractFile.aspx.designer.cs

@@ -60,13 +60,13 @@ namespace FineUIPro.Web.PHTGL.Filing
         protected global::FineUIPro.Toolbar Toolbar2;
 
         /// <summary>
-        /// DropDownList1 控件。
+        /// drpDepartId 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.DropDownList DropDownList1;
+        protected global::FineUIPro.DropDownList drpDepartId;
 
         /// <summary>
         /// txtContractName 控件。

SGGL/FineUIPro.Web/PHTGL/Filing/Files.aspx

@@ -13,9 +13,9 @@
         <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" EnableAjax="false"
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="基本信息" EnableCollapse="true" EnableAjax="false"
-                    runat="server" BoxFlex="1" DataKeyNames="ActionPlanReviewId" AllowCellEditing="true"
+                    runat="server" BoxFlex="1" DataKeyNames="ContractReviewId" AllowCellEditing="true"
-                    ClicksToEdit="2" DataIDField="ActionPlanReviewId" AllowSorting="true" SortField="CreateTime" OnSort="Grid1_Sort"
+                    ClicksToEdit="2" DataIDField="ContractReviewId" AllowSorting="true" SortField="ContractNum" OnSort="Grid1_Sort"
                     SortDirection="DESC" EnableColumnLines="true" OnPageIndexChange="Grid1_PageIndexChange"
                     AllowPaging="true" IsDatabasePaging="true" PageSize="10" ForceFit="true" OnRowCommand="Grid1_RowCommand" EnableRowClickEvent="true"
                     EnableRowDoubleClickEvent="true"
@@ -23,25 +23,23 @@
                     <Toolbars>
                         <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
-                                <f:DropDownList runat="server" ID="DropDownList1"  Label="数据来源">
+                                <f:DropDownList ID="drpDepartId" runat="server" Label="主办部门" LabelAlign="Right" LabelWidth="140px"></f:DropDownList>
-                                    <f:ListItem Text="施工管理部" Value="Value1" />
+
-                                    <f:ListItem Text="环境工程事业部" Value="Value2"  />
+                                <f:TextBox runat="server" Label="合同名称" ID="txtContractName" EmptyText="输入查询条件" Width="300px" LabelWidth="90px"
-                                    <f:ListItem Text="基础设施事业部" Value="Value3"  />
+                                    LabelAlign="right">
-                                    <f:ListItem Text="运营管理部" Value="Value4" />
-                                    <f:ListItem Text="宁波公司" Value="Value5" />
-                                    <f:ListItem Text="焦化公司" Value="Value6" />
-                                </f:DropDownList>
-                                <f:TextBox runat="server" Label="总承包合同编号" ID="txtActionPlanCode" EmptyText="输入查询条件" Width="300px" LabelWidth="140px"
-                                    LabelAlign="left">
                                 </f:TextBox>
-                                  <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:ToolbarFill runat="server"></f:ToolbarFill>
                                 <f:Button ID="btnQuery" OnClick="btnSearch_Click" ToolTip="查询" Text="查询" Icon="SystemSearch" EnablePostBack="true" runat="server">
-                                </f:Button>  
-                                 <f:Button ID="btnRset" OnClick="btnRset_Click" ToolTip="重置" Text="重置" Icon="ArrowUndo" EnablePostBack="true" runat="server">
                                 </f:Button>
-                             </Items>
+                                <f:Button ID="btnRset" OnClick="btnRset_Click" ToolTip="重置" Text="重置" Icon="ArrowUndo" EnablePostBack="true" runat="server">
+                                </f:Button>
+                                
+                                 <f:Button ID="btnPrinter" EnablePostBack="true" runat="server"
+                                    Text="导出评审单" Icon="Printer"  OnClick="btnPrinter_Click1" EnableAjax="false" DisableControlBeforePostBack="true">
+                                </f:Button>
+                            </Items>
                         </f:Toolbar>
-           
+
                     </Toolbars>
                     <Columns>
                         <f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
@@ -50,17 +48,23 @@
                                 <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
-                        <f:RenderField ColumnID="Name" DataField="Name" Width="120px" FieldType="String" HeaderText="项目名称" TextAlign="Center"
+                         <f:RenderField ColumnID="EPCCode" EnableLock="true" Locked="true" DataField="EPCCode" Width="120px" FieldType="String" HeaderText="总承包合同编号" TextAlign="Center"
                             HeaderTextAlign="Center">
                         </f:RenderField>
-                        <f:RenderField ColumnID="EPCCode" DataField="EPCCode" Width="120px" FieldType="String" HeaderText="总承包合同编号" TextAlign="Center"
+                        <f:RenderField ColumnID="ProjectShortName" EnableLock="true" Locked="true" DataField="ProjectShortName" Width="180px" FieldType="String" HeaderText="项目名称" TextAlign="Center"
                             HeaderTextAlign="Center">
                         </f:RenderField>
-                         <f:LinkButtonField ColumnID="export" HeaderText="导出" Width="60px" Icon="ArrowUp" CommandName="export" />
+                        <f:RenderField ColumnID="ContractName" EnableLock="true" Locked="true" DataField="ContractName" Width="180px" FieldType="String" HeaderText="合同名称" TextAlign="Center"
-                       
+                            HeaderTextAlign="Center">
-                        <f:LinkButtonField HeaderText="附件" ColumnID="download" Width="60px" Icon="ArrowDown" CommandName="download" />
+                        </f:RenderField>
+                        <f:RenderField ColumnID="ContractNum" EnableLock="true" Locked="true" DataField="ContractNum" Width="180px" FieldType="String" HeaderText="合同编号" TextAlign="Center"
+                            HeaderTextAlign="Center">
+                        </f:RenderField>
+                      <%--  <f:LinkButtonField ColumnID="export" HeaderText="导出" Width="60px" Icon="ArrowUp" CommandName="export" />
+
+                        <f:LinkButtonField HeaderText="附件" ColumnID="download" Width="60px" Icon="ArrowDown" CommandName="download" />--%>
                     </Columns>
-                     <PageItems>
+                    <PageItems>
                         <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
                         </f:ToolbarSeparator>
                         <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
@@ -81,10 +85,10 @@
             Target="Parent" EnableResize="false" runat="server" IsModal="true"
             Width="700px" Height="500px">
         </f:Window>
- 
+
     </form>
     <script type="text/javascript">
-      
+
-    </script>
+</script>
 </body>
-</html>
+</html>

SGGL/FineUIPro.Web/PHTGL/Filing/Files.aspx.cs

@@ -20,6 +20,8 @@ namespace FineUIPro.Web.PHTGL.Filing
         {
             if (!IsPostBack)
             {
+                BLL.DepartService.InitDepartDropDownList(this.drpDepartId, false);
+
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 GetButtonPower();
                 BindGrid();
@@ -34,8 +36,96 @@ namespace FineUIPro.Web.PHTGL.Filing
         /// </summary>
         private void BindGrid()
         {
-           
+            string strSql = @"SELECT Rev.ContractReviewId, 
+                                    Con.ContractId, 
+                                    Con.ProjectId, 
+                                    Con.ContractName, 
+                                    Con.ContractNum, 
+                                    Con.Parties, 
+                                    Con.Currency, 
+                                    Con.ContractAmount, 
+                                    Con.DepartId, 
+                                    Con.Agent, 
+                                    (CASE Con.ContractType WHEN '1' THEN '施工总承包分包合同'
+                                     WHEN '2' THEN '施工专业分包合同'
+                                     WHEN '3' THEN '施工劳务分包合同'
+                                     WHEN '4' THEN '试车服务合同'
+                                     WHEN '5' THEN 'ds' END) AS ContractType,
+                                    ( CASE Rev.State
+                                    WHEN  @ContractCreating     THEN '编制中'
+                                    WHEN  @Contract_countersign     THEN '会签中'
+                                    WHEN  @ContractReviewing        THEN '审批中'
+                                    WHEN  @ContractReview_Complete  THEN '审批成功'
+                                    WHEN  @ContractReview_Refuse    THEN '审批被拒'   END) AS State ,
+                                    Con.Remarks,
+                                    Con.EPCCode,
+                                    Con.ProjectShortName,
+                                    Con.[OpeningBank-TT] as OpeningBank_TT ,
+                                    Con.[OpeningBank-electrophore] as OpeningBank_electrophore,
+                                    Con.[BankAccount-TT] as BankAccount_TT,
+                                    Con.[BankAccount-electrophore] as BankAccount_electrophore,
+                                    Con.[LineNumber-electrophore] as LineNumber_electrophore,
+                                    Con.Retentionmoney,                               
+                                    (CASE Con.Status WHEN '0' THEN '已签订'
+                                     WHEN '1' THEN '已完毕' END) as Status,  
+                                    Con.ContactUnitOfPartyA,  
+                                    Con.ContactPersonOfPartyA,  
+                                    Con.ContactPersonOfPartyB,  
+                                    Con.ContactPersonPhoneOfPartyB,  
+                                    Con.ContactPersonEmailOfPartyB,  
+                                    Con.ContractAmountExcludingTax,   
+                                    Con.PriceMethod,  
+                                    CONVERT(varchar(100), SignedOnDate, 111) as SignedOnDate,
+                                    CONVERT(varchar(100), ContractStartDate, 111) as ContractStartDate,
+                                    CONVERT(varchar(100), ContractEndDate, 111) as ContractEndDate,
+                                    Con.PricingBasis,  
+                                    (CASE Con.SubcontractingMethod WHEN '1' then '内部分包'
+                                     WHEN '2' THEN '外部分包' END ) as SubcontractingMethod, 
+                                    (CASE Con.IsItACentralizedPurchaseSupplier WHEN '0' then '否'
+                                     WHEN '1' THEN '是' END ) as IsItACentralizedPurchaseSupplier,
+                                    Pro.ProjectCode,
+                                    Pro.ProjectName,
+                                    Dep.DepartName,
+                                    U.PersonName AS AgentName "
+                            + @" from PHTGL_ContractReview AS Rev"
+                            + @"  LEFT JOIN PHTGL_Contract AS Con  ON Con.ContractId=Rev.ContractId"
+                            //+ @"  left join PHTGL_ActionPlanFormation as Act on Act.EPCCode=Con.EPCCode"
+                            + @"  LEFT JOIN Base_Project AS Pro ON Pro.ProjectId = Con.ProjectId"
+                            + @"  LEFT JOIN Base_Depart AS Dep ON Dep.DepartId = Con.DepartId"
+                            + @"  LEFT JOIN Person_Persons AS U ON U.PersonId = Con.Agent WHERE 1=1  and Rev.State=@State";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            listStr.Add(new SqlParameter("@ContractCreating", Const.ContractCreating.ToString()));
+            listStr.Add(new SqlParameter("@Contract_countersign", Const.Contract_countersign));
+            listStr.Add(new SqlParameter("@ContractReviewing", Const.ContractReviewing));
+            listStr.Add(new SqlParameter("@ContractReview_Complete", Const.ContractReview_Complete));
+            listStr.Add(new SqlParameter("@ContractReview_Refuse", Const.ContractReview_Refuse));
+            listStr.Add(new SqlParameter("@State", Const.ContractReview_Complete));
+
+            if (!(this.CurrUser.PersonId == Const.sysglyId))
+            {
+                strSql += " and Con.ProjectId =@ProjectId";
+
+                listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+            }
+            if (!string.IsNullOrEmpty(this.txtContractName.Text.Trim()))
+            {
+                strSql += " AND Con.ContractName LIKE @ContractName";
+                listStr.Add(new SqlParameter("@ContractName", "%" + this.txtContractName.Text.Trim() + "%"));
+            }
+            if (! string .IsNullOrEmpty(drpDepartId.SelectedValue))
+            {
+                strSql += " AND Con.DepartId = @DepartId";
+                listStr.Add(new SqlParameter("@DepartId", drpDepartId.SelectedValue));
+
+            }
+            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 分页 排序
@@ -112,7 +202,7 @@ namespace FineUIPro.Web.PHTGL.Filing
 
         protected void btnRset_Click(object sender, EventArgs e)
         {
-            txtActionPlanCode.Text = "";
+            txtContractName.Text = "";
             BindGrid();
         }
 
@@ -146,24 +236,17 @@ namespace FineUIPro.Web.PHTGL.Filing
         #endregion
 
         #region 打印
-        protected void btnPrinter_Click(object sender, EventArgs e)
+        protected void btnPrinter_Click1(object sender, EventArgs e)
         {
-            //if (Grid1.SelectedRowIndexArray.Length == 0)
+            if (Grid1.SelectedRowIndexArray.Length == 0)
-            //{
+            {
-            //    Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
-            //    return;
+                return;
-            //}
+            }
-            //string Id = Grid1.SelectedRowID;
+            string Id = Grid1.SelectedRowID;
-            //var Act = PHTGL_ActionPlanReviewService.GetPHTGL_ActionPlanReviewById(Id);
+            PHTGL_ContractReviewService.PrintApprovalForm(Id);
-            //if (Act == null)
-            //{
-            //    Alert.ShowInTop("还未创建审批流无法导出！", MessageBoxIcon.Warning);
-            //    return;
-            //}
-            //string ActionPlanID = Act.ActionPlanID;
-            //ActionPlanFormation actionPlanFormation = new ActionPlanFormation();
-            //actionPlanFormation.Print(ActionPlanID);
         }
+
         #endregion
 
 

SGGL/FineUIPro.Web/PHTGL/Filing/Files.aspx.designer.cs

@@ -60,22 +60,22 @@ namespace FineUIPro.Web.PHTGL.Filing
         protected global::FineUIPro.Toolbar Toolbar2;
 
         /// <summary>
-        /// DropDownList1 控件。
+        /// drpDepartId 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.DropDownList DropDownList1;
+        protected global::FineUIPro.DropDownList drpDepartId;
 
         /// <summary>
-        /// txtActionPlanCode 控件。
+        /// txtContractName 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextBox txtActionPlanCode;
+        protected global::FineUIPro.TextBox txtContractName;
 
         /// <summary>
         /// btnQuery 控件。
@@ -95,6 +95,15 @@ namespace FineUIPro.Web.PHTGL.Filing
         /// </remarks>
         protected global::FineUIPro.Button btnRset;
 
+        /// <summary>
+        /// btnPrinter 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnPrinter;
+
         /// <summary>
         /// lblPageIndex 控件。
         /// </summary>

SGGL/FineUIPro.Web/ZHGL/DataSync/HSSEData_HSSE.aspx

@@ -34,7 +34,7 @@
         <Items>
             <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="HSSE首页数据表" EnableCollapse="true"
                 runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" 
-                ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="Id"
+                ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="ReportDate"
                 SortDirection="DESC" OnSort="Grid1_Sort"  EnableColumnLines="true"
                 AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
                 EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick">
@@ -99,13 +99,13 @@
                              FieldType="String" HeaderText="特种作业培训数" TextAlign="Left" HeaderTextAlign="Center" >
                            </f:RenderField>
                           <f:RenderField Width="150px" ColumnID="TotalEnergyConsumption" DataField="TotalEnergyConsumption" SortField="TotalEnergyConsumption"
-                             FieldType="String" HeaderText="能耗总量" TextAlign="Left" HeaderTextAlign="Center" >
+                             FieldType="String" HeaderText="能耗总量(万吨标准煤)" TextAlign="Left" HeaderTextAlign="Center" >
                            </f:RenderField>
                           <f:RenderField Width="150px" ColumnID="IncomeComprehensiveEnergyConsumption" DataField="IncomeComprehensiveEnergyConsumption" SortField="IncomeComprehensiveEnergyConsumption"
-                             FieldType="String" HeaderText="万元营业收入综合能耗" TextAlign="Left" HeaderTextAlign="Center" >
+                             FieldType="String" HeaderText="万元营业收入综合能耗(吨标准煤/万元)" TextAlign="Left" HeaderTextAlign="Center" >
                            </f:RenderField>
                           <f:RenderField Width="150px" ColumnID="NewWaterConsumption" DataField="NewWaterConsumption" SortField="NewWaterConsumption"
-                             FieldType="String" HeaderText="用新水量" TextAlign="Left" HeaderTextAlign="Center" >
+                             FieldType="String" HeaderText="用新水量(万吨)" TextAlign="Left" HeaderTextAlign="Center" >
                            </f:RenderField>
                           <f:RenderField Width="150px" ColumnID="HeadOfficeInspectorGeneralNum" DataField="HeadOfficeInspectorGeneralNum" SortField="HeadOfficeInspectorGeneralNum"
                              FieldType="String" HeaderText="企业总部总监人数" TextAlign="Left" HeaderTextAlign="Center" >

SGGL/FineUIPro.Web/ZHGL/DataSync/HSSEData_HSSEEdit.aspx

@@ -118,15 +118,15 @@
                             <Rows>
                                 <f:FormRow>
                                     <Items>
-                                        <f:NumberBox ID="txtTotalEnergyConsumption" runat="server" Label="能耗总量" LabelWidth="160"  NoDecimal="true" NoNegative="true">
+                                        <f:NumberBox ID="txtTotalEnergyConsumption" runat="server" Label="能耗总量(万吨标准煤)" LabelWidth="160"  NoDecimal="false" DecimalPrecision="4" NoNegative="true">
                                         </f:NumberBox>
-                                        <f:NumberBox ID="txtIncomeComprehensiveEnergyConsumption" runat="server" Label="万元营业收入综合能耗" LabelWidth="160"  NoDecimal="true" NoNegative="true">
+                                        <f:NumberBox ID="txtIncomeComprehensiveEnergyConsumption" runat="server" Label="万元营业收入综合能耗(吨标准煤/万元)" LabelWidth="160"  NoDecimal="false" DecimalPrecision="4" NoNegative="true">
                                         </f:NumberBox>
                                     </Items>
                                 </f:FormRow>
                                 <f:FormRow>
                                     <Items>
-                                        <f:NumberBox ID="txtNewWaterConsumption" runat="server" Label="用新水量" LabelWidth="160"  NoDecimal="true" NoNegative="true">
+                                        <f:NumberBox ID="txtNewWaterConsumption" runat="server" Label="用新水量(万吨)" LabelWidth="160"  NoDecimal="false" DecimalPrecision="4" NoNegative="true">
                                         </f:NumberBox>
                                         <f:Label runat="server"></f:Label>
                                     </Items>
@@ -515,6 +515,9 @@
              <Toolbars>
                 <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
                     <Items>
+                        <f:Button ID="btnCopy" Icon="Database" runat="server" ToolTip="复制上次数据" Text ="复制上次数据"
+                            ValidateForms="SimpleForm1" OnClick="btnCopy_Click" MarginLeft="10px">
+                        </f:Button>
                         <f:ToolbarFill runat="server"></f:ToolbarFill>
                         <f:Button ID="btnSave" Icon="SystemSave" Text="保存" runat="server" ValidateForms="Form15"
                             OnClick="btnSave_Click">

SGGL/FineUIPro.Web/ZHGL/DataSync/HSSEData_HSSEEdit.aspx.cs

@@ -334,7 +334,7 @@ namespace FineUIPro.Web.ZHGL.DataSync
                 }
                 else
                 {
-                    var base_Unit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_SEDIN);
+                    var base_Unit = BLL.UnitService.GetUnitByUnitId(Const.UnitId_SEDIN);
                     txtUnitName.Text = base_Unit.UnitName;
                     txtCollCropCode.Text = base_Unit.CollCropCode;
                     txtReportDate.SelectedDate = DateTime.Now;
@@ -389,7 +389,7 @@ namespace FineUIPro.Web.ZHGL.DataSync
 
             }
             Model.HSSEData_HSSE table = new Model.HSSEData_HSSE();
-            table.UnitId = BLL.Const.UnitId_SEDIN;
+            table.UnitId = Const.UnitId_SEDIN;
             table.CollCropCode = this.txtCollCropCode.Text;
             table.UnitName = this.txtUnitName.Text;
             table.ReportDate = this.txtReportDate.SelectedDate;
@@ -403,9 +403,9 @@ namespace FineUIPro.Web.ZHGL.DataSync
             table.SafeTrainNum = Funs.GetNewInt(this.txtSafeTrainNum.Text);
             table.SpecialTrainNum = Funs.GetNewInt(this.txtSpecialTrainNum.Text);
             table.SpecialOperationTrainNum = Funs.GetNewInt(this.txtSpecialOperationTrainNum.Text);
-            table.TotalEnergyConsumption = Funs.GetNewInt(this.txtTotalEnergyConsumption.Text);
+            table.TotalEnergyConsumption = Funs.GetNewDecimalOrZero(this.txtTotalEnergyConsumption.Text);
-            table.IncomeComprehensiveEnergyConsumption = Funs.GetNewInt(this.txtIncomeComprehensiveEnergyConsumption.Text);
+            table.IncomeComprehensiveEnergyConsumption = Funs.GetNewDecimalOrZero(this.txtIncomeComprehensiveEnergyConsumption.Text);
-            table.NewWaterConsumption = Funs.GetNewInt(this.txtNewWaterConsumption.Text);
+            table.NewWaterConsumption = Funs.GetNewDecimalOrZero(this.txtNewWaterConsumption.Text);
             table.HeadOfficeInspectorGeneralNum = Funs.GetNewInt(this.txtHeadOfficeInspectorGeneralNum.Text);
             table.HeadOfficeFullTimeNum = Funs.GetNewInt(this.txtHeadOfficeFullTimeNum.Text);
             table.BranchInspectorGeneralNum = Funs.GetNewInt(this.txtBranchInspectorGeneralNum.Text);
@@ -551,7 +551,301 @@ namespace FineUIPro.Web.ZHGL.DataSync
                 }
             }
         }
-        #endregion        
+        #endregion
 
+        #region 复制数据
+        /// <summary>
+        /// 复制报表数据
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnCopy_Click(object sender, EventArgs e)
+        {
+            Model.HSSEData_HSSE model = Funs.DB.HSSEData_HSSE.OrderByDescending(x=>x.ReportDate).FirstOrDefault();
+            if (model != null)
+            {
+                if (model.BeUnderConstructionNum.HasValue)
+                {
+                    this.txtBeUnderConstructionNum.Text = model.BeUnderConstructionNum.Value.ToString();
+                }
+                if (model.ShutdownNum.HasValue)
+                {
+                    this.txtShutdownNum.Text = model.ShutdownNum.Value.ToString();
+                }
+                if (model.JoinConstructionPersonNum.HasValue)
+                {
+                    this.txtJoinConstructionPersonNum.Text = model.JoinConstructionPersonNum.Value.ToString();
+                }
+                if (model.MajorProjectsUnderConstructionNum.HasValue)
+                {
+                    this.txtMajorProjectsUnderConstructionNum.Text = model.MajorProjectsUnderConstructionNum.Value.ToString();
+                }
+                if (model.TotalWorkingHour.HasValue)
+                {
+                    this.txtTotalWorkingHour.Text = model.TotalWorkingHour.Value.ToString();
+                }
+                if (model.LostWorkingHour.HasValue)
+                {
+                    this.txtLostWorkingHour.Text = model.LostWorkingHour.Value.ToString();
+                }
+                if (model.SafeWorkingHour.HasValue)
+                {
+                    this.txtSafeWorkingHour.Text = model.SafeWorkingHour.Value.ToString();
+                }
+                if (model.SafeTrainNum.HasValue)
+                {
+                    this.txtSafeTrainNum.Text = model.SafeTrainNum.Value.ToString();
+                }
+                if (model.SpecialTrainNum.HasValue)
+                {
+                    this.txtSpecialTrainNum.Text = model.SpecialTrainNum.Value.ToString();
+                }
+                if (model.SpecialOperationTrainNum.HasValue)
+                {
+                    this.txtSpecialOperationTrainNum.Text = model.SpecialOperationTrainNum.Value.ToString();
+                }
+                if (model.TotalEnergyConsumption.HasValue)
+                {
+                    this.txtTotalEnergyConsumption.Text = model.TotalEnergyConsumption.Value.ToString();
+                }
+                if (model.IncomeComprehensiveEnergyConsumption.HasValue)
+                {
+                    this.txtIncomeComprehensiveEnergyConsumption.Text = model.IncomeComprehensiveEnergyConsumption.Value.ToString();
+                }
+                if (model.NewWaterConsumption.HasValue)
+                {
+                    this.txtNewWaterConsumption.Text = model.NewWaterConsumption.Value.ToString();
+                }
+                if (model.HeadOfficeInspectorGeneralNum.HasValue)
+                {
+                    this.txtHeadOfficeInspectorGeneralNum.Text = model.HeadOfficeInspectorGeneralNum.Value.ToString();
+                }
+                if (model.HeadOfficeFullTimeNum.HasValue)
+                {
+                    this.txtHeadOfficeFullTimeNum.Text = model.HeadOfficeFullTimeNum.Value.ToString();
+                }
+                if (model.BranchInspectorGeneralNum.HasValue)
+                {
+                    this.txtBranchInspectorGeneralNum.Text = model.BranchInspectorGeneralNum.Value.ToString();
+                }
+                if (model.BranchFullTimeNum.HasValue)
+                {
+                    this.txtBranchFullTimeNum.Text = model.BranchFullTimeNum.Value.ToString();
+                }
+                if (model.ProjectInspectorGeneralNum.HasValue)
+                {
+                    this.txtProjectInspectorGeneralNum.Text = model.ProjectInspectorGeneralNum.Value.ToString();
+                }
+                if (model.ProjectFullTimeNum.HasValue)
+                {
+                    this.txtProjectFullTimeNum.Text = model.ProjectFullTimeNum.Value.ToString();
+                }
+                if (model.ProjectSafetyMonitorNum.HasValue)
+                {
+                    this.txtProjectSafetyMonitorNum.Text = model.ProjectSafetyMonitorNum.Value.ToString();
+                }
+                if (model.SafetyInjectionEngineer.HasValue)
+                {
+                    this.txtSafetyInjectionEngineer.Text = model.SafetyInjectionEngineer.Value.ToString();
+                }
+                if (model.CertificateANum.HasValue)
+                {
+                    this.txtCertificateANum.Text = model.CertificateANum.Value.ToString();
+                }
+                if (model.CertificateBNum.HasValue)
+                {
+                    this.txtCertificateBNum.Text = model.CertificateBNum.Value.ToString();
+                }
+                if (model.CertificateCNum.HasValue)
+                {
+                    this.txtCertificateCNum.Text = model.CertificateCNum.Value.ToString();
+                }
+                if (model.SafetyCommitteeMeetingNum.HasValue)
+                {
+                    this.txtSafetyCommitteeMeetingNum.Text = model.SafetyCommitteeMeetingNum.Value.ToString();
+                }
+                if (model.EnterpriseTopicsMeetingNum.HasValue)
+                {
+                    this.txtEnterpriseTopicsMeetingNum.Text = model.EnterpriseTopicsMeetingNum.Value.ToString();
+                }
+                if (model.ProjectSafetyLeadingGroupMeetingNum.HasValue)
+                {
+                    this.txtProjectSafetyLeadingGroupMeetingNum.Text = model.ProjectSafetyLeadingGroupMeetingNum.Value.ToString();
+                }
+                if (model.ProjectSafetyMeetingNum.HasValue)
+                {
+                    this.txtProjectSafetyMeetingNum.Text = model.ProjectSafetyMeetingNum.Value.ToString();
+                }
+                if (model.CompanyLeadShiftCheckNum.HasValue)
+                {
+                    this.txtCompanyLeadShiftCheckNum.Text = model.CompanyLeadShiftCheckNum.Value.ToString();
+                }
+                if (model.CompanyComprehensiveCheckNum.HasValue)
+                {
+                    this.txtCompanyComprehensiveCheckNum.Text = model.CompanyComprehensiveCheckNum.Value.ToString();
+                }
+                if (model.CompanySpecialCheckNum.HasValue)
+                {
+                    this.txtCompanySpecialCheckNum.Text = model.CompanySpecialCheckNum.Value.ToString();
+                }
+                if (model.ProjectLeadShiftCheckNum.HasValue)
+                {
+                    this.txtProjectLeadShiftCheckNum.Text = model.ProjectLeadShiftCheckNum.Value.ToString();
+                }
+                if (model.ProjectSpecialCheckNum.HasValue)
+                {
+                    this.txtProjectSpecialCheckNum.Text = model.ProjectSpecialCheckNum.Value.ToString();
+                }
+                if (model.ProjectMajorCheckNum.HasValue)
+                {
+                    this.txtProjectMajorCheckNum.Text = model.ProjectMajorCheckNum.Value.ToString();
+                }
+                if (model.NearMissNum.HasValue)
+                {
+                    this.txtNearMissNum.Text = model.NearMissNum.Value.ToString();
+                }
+                if (model.RecordableEventNum.HasValue)
+                {
+                    this.txtRecordableEventNum.Text = model.RecordableEventNum.Value.ToString();
+                }
+                if (model.GeneralAccidentNum.HasValue)
+                {
+                    this.txtGeneralAccidentNum.Text = model.GeneralAccidentNum.Value.ToString();
+                }
+                if (model.MajorAccidentNum.HasValue)
+                {
+                    this.txtMajorAccidentNum.Text = model.MajorAccidentNum.Value.ToString();
+                }
+                if (model.SeriousAccidentNum.HasValue)
+                {
+                    this.txtSeriousAccidentNum.Text = model.SeriousAccidentNum.Value.ToString();
+                }
+                if (model.SpecialSeriousAccidentNum.HasValue)
+                {
+                    this.txtSpecialSeriousAccidentNum.Text = model.SpecialSeriousAccidentNum.Value.ToString();
+                }
+                if (model.CompanyComprehensivePlanNum.HasValue)
+                {
+                    this.txtCompanyComprehensivePlanNum.Text = model.CompanyComprehensivePlanNum.Value.ToString();
+                }
+                if (model.CompanySpecialPlanNum.HasValue)
+                {
+                    this.txtCompanySpecialPlanNum.Text = model.CompanySpecialPlanNum.Value.ToString();
+                }
+                if (model.CompanyOnSiteDisposalPlan.HasValue)
+                {
+                    this.txtCompanyOnSiteDisposalPlan.Text = model.CompanyOnSiteDisposalPlan.Value.ToString();
+                }
+                if (model.CompanyDrillNum.HasValue)
+                {
+                    this.txtCompanyDrillNum.Text = model.CompanyDrillNum.Value.ToString();
+                }
+                if (model.ProjectComprehensivePlanNum.HasValue)
+                {
+                    this.txtProjectComprehensivePlanNum.Text = model.ProjectComprehensivePlanNum.Value.ToString();
+                }
+                if (model.ProjectSpecialPlanNum.HasValue)
+                {
+                    this.txtProjectSpecialPlanNum.Text = model.ProjectSpecialPlanNum.Value.ToString();
+                }
+                if (model.ProjectOnSiteDisposalPlan.HasValue)
+                {
+                    this.txtProjectOnSiteDisposalPlan.Text = model.ProjectOnSiteDisposalPlan.Value.ToString();
+                }
+                if (model.ProjectDrillNum.HasValue)
+                {
+                    this.txtProjectDrillNum.Text = model.ProjectDrillNum.Value.ToString();
+                }
+                if (model.CostExtract.HasValue)
+                {
+                    this.txtCostExtract.Text = model.CostExtract.Value.ToString();
+                }
+                if (model.CostUse.HasValue)
+                {
+                    this.txtCostUse.Text = model.CostUse.Value.ToString();
+                }
+                if (model.UseEquipmentNum.HasValue)
+                {
+                    this.txtUseEquipmentNum.Text = model.UseEquipmentNum.Value.ToString();
+                }
+                if (model.SpecialEquipmentNum.HasValue)
+                {
+                    this.txtSpecialEquipmentNum.Text = model.SpecialEquipmentNum.Value.ToString();
+                }
+                if (model.LicensesNum.HasValue)
+                {
+                    this.txtLicensesNum.Text = model.LicensesNum.Value.ToString();
+                }
+                if (model.LicensesCloseNum.HasValue)
+                {
+                    this.txtLicensesCloseNum.Text = model.LicensesCloseNum.Value.ToString();
+                }
+                if (model.GeneralClosedNum.HasValue)
+                {
+                    this.txtGeneralClosedNum.Text = model.GeneralClosedNum.Value.ToString();
+                }
+                if (model.GeneralNotClosedNum.HasValue)
+                {
+                    this.txtGeneralNotClosedNum.Text = model.GeneralNotClosedNum.Value.ToString();
+                }
+                if (model.MajorClosedNum.HasValue)
+                {
+                    this.txtMajorClosedNum.Text = model.MajorClosedNum.Value.ToString();
+                }
+                if (model.MajorNotClosedNum.HasValue)
+                {
+                    this.txtMajorNotClosedNum.Text = model.MajorNotClosedNum.Value.ToString();
+                }
+                if (model.GeneralRiskNum.HasValue)
+                {
+                    this.txtGeneralRiskNum.Text = model.GeneralRiskNum.Value.ToString();
+                }
+                if (model.LowRiskNum.HasValue)
+                {
+                    this.txtLowRiskNum.Text = model.LowRiskNum.Value.ToString();
+                }
+                if (model.MediumRiskNum.HasValue)
+                {
+                    this.txtMediumRiskNum.Text = model.MediumRiskNum.Value.ToString();
+                }
+                if (model.HighRiskNum.HasValue)
+                {
+                    this.txtHighRiskNum.Text = model.HighRiskNum.Value.ToString();
+                }
+                if (model.CompletedNum.HasValue)
+                {
+                    this.txtCompletedNum.Text = model.CompletedNum.Value.ToString();
+                }
+                if (model.TrainPersonNum.HasValue)
+                {
+                    this.txtTrainPersonNum.Text = model.TrainPersonNum.Value.ToString();
+                }
+                if (model.ConstructionNum.HasValue)
+                {
+                    this.txtConstructionNum.Text = model.ConstructionNum.Value.ToString();
+                }
+                if (model.FinishedNum.HasValue)
+                {
+                    this.txtFinishedNum.Text = model.FinishedNum.Value.ToString();
+                }
+                if (model.SuperCompletedNum.HasValue)
+                {
+                    this.txtSuperCompletedNum.Text = model.SuperCompletedNum.Value.ToString();
+                }
+                if (model.SuperTrainPersonNum.HasValue)
+                {
+                    this.txtSuperTrainPersonNum.Text = model.SuperTrainPersonNum.Value.ToString();
+                }
+                if (model.SuperConstructionNum.HasValue)
+                {
+                    this.txtSuperConstructionNum.Text = model.SuperConstructionNum.Value.ToString();
+                }
+                if (model.SuperFinishedNum.HasValue)
+                {
+                    this.txtSuperFinishedNum.Text = model.SuperFinishedNum.Value.ToString();
+                }
+            }
+        }
+        #endregion
     }
 }

SGGL/FineUIPro.Web/common/Menu_HJGL.xml

@@ -60,6 +60,5 @@
 <TreeNode id="5F0969E3-2A0A-473E-92BE-4DD390602556" Text="焊接缺陷分析" NavigateUrl="HJGL/WeldingReport/DefectStatistics.aspx"></TreeNode>
 <TreeNode id="EAD61207-E396-45B0-A1D2-7A5F0498AACC" Text="管道预制率分析" NavigateUrl="HJGL/WeldingReport/PipePrefabricationRateStatistics.aspx"></TreeNode>
 <TreeNode id="854C79DF-A1C0-4E3C-BCB4-7D5CD044F72B" Text="焊工功效分析" NavigateUrl="HJGL/WeldingReport/WelderEfficacy.aspx"></TreeNode>
-<TreeNode id="6035E549-66FF-4B6D-989B-BE99C9EF5EB7" Text="焊接数据" NavigateUrl="ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx"></TreeNode>
 </TreeNode>
 </Tree>

SGGL/FineUIPro.Web/common/Menu_ZHGL.xml

@@ -26,5 +26,6 @@
 <TreeNode id="1E216BE3-DB22-4649-BD9A-0777B0DC03E6" Text="QHSE上报" NavigateUrl=""><TreeNode id="94F94EC1-54B3-4BEB-A019-0A755A66D8FD" Text="安全数据" NavigateUrl="ZHGL/DataSync/HSSEData_HSSE.aspx"></TreeNode>
 <TreeNode id="4C9920AE-F335-48B1-BDB0-276173305952" Text="质量数据" NavigateUrl="ZHGL/DataSync/CQMSData_CQMS.aspx"></TreeNode>
 <TreeNode id="2110702F-4E12-479A-8EA1-E5A8EEF77276" Text="焊接数据" NavigateUrl="ZHGL/DataSync/HJGLData_HJGL.aspx"></TreeNode>
+<TreeNode id="S89E5EC2-F725-4656-9110-5AF83C18FB6C" Text="实业数据" NavigateUrl="ZHGL/DataSync/SYHSEData_Data.aspx"></TreeNode>
 </TreeNode>
 </Tree>

SGGL/FineUIPro.Web/common/mainMenu_HSSE2.aspx

@@ -192,16 +192,16 @@
                         <div class="i-item">
                             <div class="ii-desc">环保数据</div>
                             <div class="ii-item bg5">
-                                <div class="desc">能耗总量</div>
+                                <div class="desc">能耗总量<br/>(万吨标准煤)</div>
-                                <div class="num num-cl3"><%=showData(hSSEData_HSSE.TotalEnergyConsumption,"--") %></div>
+                                <div class="num num-cl3"><%=showDecimalData(hSSEData_HSSE.TotalEnergyConsumption,"--") %></div>
                             </div>
                             <div class="ii-item bg5">
-                                <div class="desc">万元营业收入综合能耗</div>
+                                <div class="desc">万元营业收入综合能耗<br/>(吨标准煤/万元)</div>
-                                <div class="num num-cl3"><%=showData(hSSEData_HSSE.IncomeComprehensiveEnergyConsumption,"--") %></div>
+                                <div class="num num-cl3"><%=showDecimalData(hSSEData_HSSE.IncomeComprehensiveEnergyConsumption,"--") %></div>
                             </div>
                             <div class="ii-item bg5">
-                                <div class="desc">用新水量</div>
+                                <div class="desc">用新水量<br/>(万吨)</div>
-                                <div class="num num-cl3"><%=showData(hSSEData_HSSE.NewWaterConsumption,"--") %></div>
+                                <div class="num num-cl3"><%=showDecimalData(hSSEData_HSSE.NewWaterConsumption,"--") %></div>
                             </div>
                         </div>
                     </div>
@@ -415,7 +415,6 @@
     <script src="../res/assets/js/video-7.15.0.min.js"></script>
     <script src="../res/assets/js/china.js"></script>
     <script>
-
         function initMapEchart() {
             // 1. 实例化对象
             var myChart = echarts.init(document.querySelector(".sd-map"));
@@ -464,9 +463,9 @@
                             html += '<div style="font-size:18px;margin-bottom:8px;">' + params.data.name + '</div>'
                             //html += '<div style="width: 98px;height: 24px;margin-bottom:10px;background: #F24166;border-radius: 12px;text-align:center;">' + '在施危大工程' + '</div>'
                             html += '<div style="width: 240px; white-space:normal; word-break:break-all;word-break:break-all;overflow:auto; white-space:normal; margin-bottom:12px;">监理单位：' + params.data.jLUnit  + '</div>'
-                            html += '<div style="width: 240px; white-space:normal; word-break:break-all;word-break:break-all;overflow:auto; white-space:normal; margin-bottom:12px;">施工单位：' + params.data.sGUnit  + '</div>'
+                            html += '<div style="width: 240px; white-space:normal; word-break:break-all;word-break:break-all;overflow:auto; white-space:normal; margin-bottom:12px;">施工单位：' + params.data.SGUnit  + '</div>'
                             html += '<div style="width: 240px; white-space:normal; word-break:break-all;word-break:break-all;overflow:auto; white-space:normal; margin-bottom:12px;">建设单位：' + params.data.ownUnit  + '</div>'
-                            html += '<div style="width: 240px; white-space:normal; word-break:break-all;word-break:break-all;overflow:auto; white-space:normal; margin-bottom:12px;">工程造价：' + params.data.projectMoney  + '</div>'
+                            html += '<div style="width: 240px; white-space:normal; word-break:break-all;word-break:break-all;overflow:auto; white-space:normal; margin-bottom:12px;">工程造价：' + params.data.ProjectMoney  + '</div>'
                             html += '<div style="width: 240px; white-space:normal; word-break:break-all;word-break:break-all;overflow:auto; white-space:normal; ">工程地点：' + params.data.address + '</div>'
                             html += '<div><a style="font-size:12px;color:#1AB1FF;cursor:pointer;" href="../indexProject.aspx?projectId=' + params.data.id +'" target="_blank">项目详情>></a></div>'
                             html += '</div>'
@@ -1072,7 +1071,8 @@
             var xArrYH = [<%=xArrYH%>]
             intiYhpczlsj('yhpczlsj', xArrYH, dataYHQ, dataYHZ)
             var dataaq = [<%=showData(hSSEData_HSSE.CompanyLeadShiftCheckNum,"0")%>, <%=showData(hSSEData_HSSE.CompanyComprehensiveCheckNum,"0")%>, <%=showData(hSSEData_HSSE.CompanySpecialCheckNum,"0")%>, <%=showData(hSSEData_HSSE.ProjectLeadShiftCheckNum,"0")%>, <%=showData(hSSEData_HSSE.ProjectSpecialCheckNum,"0")%>, <%=showData(hSSEData_HSSE.ProjectMajorCheckNum,"0")%>]
-            initAqjdjcsj('aqjdjcsj', dataaq, 50)
+            var max = Math.max(<%=showData(hSSEData_HSSE.CompanyLeadShiftCheckNum,"0")%>, <%=showData(hSSEData_HSSE.CompanyComprehensiveCheckNum,"0")%>, <%=showData(hSSEData_HSSE.CompanySpecialCheckNum,"0")%>, <%=showData(hSSEData_HSSE.ProjectLeadShiftCheckNum,"0")%>, <%=showData(hSSEData_HSSE.ProjectSpecialCheckNum,"0")%>, <%=showData(hSSEData_HSSE.ProjectMajorCheckNum,"0")%>);
+            initAqjdjcsj('aqjdjcsj', dataaq, max)
             var datasg = [
                 { value:  <%=showData(hSSEData_HSSE.GeneralAccidentNum,"0")%>, name: '一般事故' },
                 { value:  <%=showData(hSSEData_HSSE.MajorAccidentNum,"0")%>, name: '较大事故' },
@@ -1081,7 +1081,7 @@
             ]
             initSgsjsj('sgsjsj', datasg)
             var data = [          // 数据数组，name 为数据项名称，value 为数据项值
-                { value: <%=showData(hSSEData_HSSE.CompletedNum,"0")%>, name: '一般' },
+                { value: <%=showData(hSSEData_HSSE.GeneralRiskNum,"0")%>, name: '一般' },
                 { value: <%=showData(hSSEData_HSSE.LowRiskNum,"0")%>, name: '低风险' },
                 { value: <%=showData(hSSEData_HSSE.MediumRiskNum,"0")%>, name: '中风险' },
                 { value: <%=showData(hSSEData_HSSE.HighRiskNum,"0")%>, name: '高风险' },

SGGL/FineUIPro.Web/common/mainMenu_HSSE2.aspx.cs

@@ -5,7 +5,6 @@ using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
 using BLL;
-
 namespace FineUIPro.Web.common
 {
     public partial class mainMenu_HSSE2 : PageBase
@@ -29,7 +28,8 @@ namespace FineUIPro.Web.common
                     hSSEData_HSSE = new Model.HSSEData_HSSE();
                 }
 
-
+                zgl1 = "0";
+                zgl2 = "0";
                 if (hSSEData_HSSE.GeneralClosedNum.HasValue && hSSEData_HSSE.GeneralNotClosedNum.HasValue)
                 {
                     zgl1 = String.Format("{0:N2}", 100.0 * hSSEData_HSSE.GeneralClosedNum.Value / (hSSEData_HSSE.GeneralClosedNum.Value + hSSEData_HSSE.GeneralNotClosedNum.Value));
@@ -77,7 +77,7 @@ namespace FineUIPro.Web.common
                 }
 
 
-                var projectList = Funs.DB.Base_Project.ToList();
+                var projectList = Funs.DB.Base_Project.Where(x => x.MapCoordinates != null).ToList();
                 if (projectList != null && projectList.Count > 0)
                 {
                     foreach (var p in projectList)
@@ -103,5 +103,17 @@ namespace FineUIPro.Web.common
                 return format;
             }
         }
+
+        public string showDecimalData(decimal? value, string format)
+        {
+            if (value.HasValue)
+            {
+                return value.Value.ToString();
+            }
+            else
+            {
+                return format;
+            }
+        }
     }
 }

SGGL/FineUIPro.Web/common/mainMenu_HSSE2.aspx.designer.cs

@@ -7,9 +7,11 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.common {
+namespace FineUIPro.Web.common
-    
+{
-    
+
-    public partial class mainMenu_HSSE2 {
+
+    public partial class mainMenu_HSSE2
+    {
     }
 }

SGGL/Model/APIItem/HSSEItem.cs

@@ -0,0 +1,313 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model
+{
+	public class HSSEItem
+	{
+		/// <summary>
+		/// Id
+		/// </summary>
+		public string Id { get; set; }
+		/// <summary>
+		/// 单位id
+		/// </summary>
+		public string UnitId { get; set; }
+
+		/// <summary>
+		/// 社会统一信用码
+		/// </summary>
+		public string CollCropCode { get; set; }
+		/// <summary>
+		/// 单位名称
+		/// </summary>
+		public string UnitName { get; set; }
+		/// <summary>
+		/// 上报日期
+		/// </summary>
+		public DateTime? ReportDate { get; set; }
+		/// <summary>
+		/// 在建项目数
+		/// </summary>
+		public int? BeUnderConstructionNum { get; set; }
+		/// <summary>
+		/// 停工项目数
+		/// </summary>
+		public int? ShutdownNum { get; set; }
+		/// <summary>
+		/// 参建人数
+		/// </summary>
+		public int? JoinConstructionPersonNum { get; set; }
+		/// <summary>
+		/// 在施危大工程数
+		/// </summary>
+		public int? MajorProjectsUnderConstructionNum { get; set; }
+		/// <summary>
+		/// 总工时数
+		/// </summary>
+		public int? TotalWorkingHour { get; set; }
+		/// <summary>
+		/// 损失工时数
+		/// </summary>
+		public int? LostWorkingHour { get; set; }
+		/// <summary>
+		/// 安全工时数
+		/// </summary>
+		public int? SafeWorkingHour { get; set; }
+		/// <summary>
+		/// 三级安全教育培训数
+		/// </summary>
+		public int? SafeTrainNum { get; set; }
+		/// <summary>
+		/// 专项培训数
+		/// </summary>
+		public int? SpecialTrainNum { get; set; }
+		/// <summary>
+		/// 特种作业培训数
+		/// </summary>
+		public int? SpecialOperationTrainNum { get; set; }
+		/// <summary>
+		/// 能耗总量
+		/// </summary>
+		public decimal? TotalEnergyConsumption { get; set; }
+		/// <summary>
+		/// 万元营业收入综合能耗
+		/// </summary>
+		public decimal? IncomeComprehensiveEnergyConsumption { get; set; }
+		/// <summary>
+		/// 用新水量
+		/// </summary>
+		public decimal? NewWaterConsumption { get; set; }
+		/// <summary>
+		/// 企业总部总监人数
+		/// </summary>
+		public int? HeadOfficeInspectorGeneralNum { get; set; }
+		/// <summary>
+		/// 企业总部专职人数
+		/// </summary>
+		public int? HeadOfficeFullTimeNum { get; set; }
+		/// <summary>
+		/// 分支机构总监人数
+		/// </summary>
+		public int? BranchInspectorGeneralNum { get; set; }
+		/// <summary>
+		/// 分支机构专职人数
+		/// </summary>
+		public int? BranchFullTimeNum { get; set; }
+		/// <summary>
+		/// 项目总监人数
+		/// </summary>
+		public int? ProjectInspectorGeneralNum { get; set; }
+		/// <summary>
+		/// 项目专职人数
+		/// </summary>
+		public int? ProjectFullTimeNum { get; set; }
+		/// <summary>
+		/// 项目安全监护人数
+		/// </summary>
+		public int? ProjectSafetyMonitorNum { get; set; }
+		/// <summary>
+		/// 在岗执业注安师
+		/// </summary>
+		public int? SafetyInjectionEngineer { get; set; }
+		/// <summary>
+		/// A证人员
+		/// </summary>
+		public int? CertificateANum { get; set; }
+		/// <summary>
+		/// B证人员
+		/// </summary>
+		public int? CertificateBNum { get; set; }
+		/// <summary>
+		/// C证人员
+		/// </summary>
+		public int? CertificateCNum { get; set; }
+		/// <summary>
+		/// 企业安委会会议数
+		/// </summary>
+		public int? SafetyCommitteeMeetingNum { get; set; }
+		/// <summary>
+		/// 企业专题会议数
+		/// </summary>
+		public int? EnterpriseTopicsMeetingNum { get; set; }
+		/// <summary>
+		/// 项目安全领导小组会议数
+		/// </summary>
+		public int? ProjectSafetyLeadingGroupMeetingNum { get; set; }
+		/// <summary>
+		/// 项目安全例会数
+		/// </summary>
+		public int? ProjectSafetyMeetingNum { get; set; }
+		/// <summary>
+		/// 企业负责人带班检查次数
+		/// </summary>
+		public int? CompanyLeadShiftCheckNum { get; set; }
+		/// <summary>
+		/// 企业综合检查次数
+		/// </summary>
+		public int? CompanyComprehensiveCheckNum { get; set; }
+		/// <summary>
+		/// 企业专项检查次数
+		/// </summary>
+		public int? CompanySpecialCheckNum { get; set; }
+		/// <summary>
+		/// 项目负责人带班检查次数
+		/// </summary>
+		public int? ProjectLeadShiftCheckNum { get; set; }
+		/// <summary>
+		/// 项目专项检查次数
+		/// </summary>
+		public int? ProjectSpecialCheckNum { get; set; }
+		/// <summary>
+		/// 项目专业检查次数
+		/// </summary>
+		public int? ProjectMajorCheckNum { get; set; }
+		/// <summary>
+		/// 未遂事件数
+		/// </summary>
+		public int? NearMissNum { get; set; }
+		/// <summary>
+		/// 可记录事件数
+		/// </summary>
+		public int? RecordableEventNum { get; set; }
+		/// <summary>
+		/// 一般事故数
+		/// </summary>
+		public int? GeneralAccidentNum { get; set; }
+		/// <summary>
+		/// 较大事故数
+		/// </summary>
+		public int? MajorAccidentNum { get; set; }
+		/// <summary>
+		/// 重大事故数
+		/// </summary>
+		public int? SeriousAccidentNum { get; set; }
+		/// <summary>
+		/// 特别重大事故数
+		/// </summary>
+		public int? SpecialSeriousAccidentNum { get; set; }
+		/// <summary>
+		/// 企业级综合预案数
+		/// </summary>
+		public int? CompanyComprehensivePlanNum { get; set; }
+		/// <summary>
+		/// 企业级专项预案数
+		/// </summary>
+		public int? CompanySpecialPlanNum { get; set; }
+		/// <summary>
+		/// 企业级现场处置预案
+		/// </summary>
+		public int? CompanyOnSiteDisposalPlan { get; set; }
+		/// <summary>
+		/// 企业级演练次数
+		/// </summary>
+		public int? CompanyDrillNum { get; set; }
+		/// <summary>
+		/// 项目级综合预案
+		/// </summary>
+		public int? ProjectComprehensivePlanNum { get; set; }
+		/// <summary>
+		/// 项目级专项预案数
+		/// </summary>
+		public int? ProjectSpecialPlanNum { get; set; }
+		/// <summary>
+		/// 项目级现场处置预案
+		/// </summary>
+		public int? ProjectOnSiteDisposalPlan { get; set; }
+		/// <summary>
+		/// 项目级演练次数
+		/// </summary>
+		public int? ProjectDrillNum { get; set; }
+		/// <summary>
+		/// 费用提取（万元）
+		/// </summary>
+		public int? CostExtract { get; set; }
+		/// <summary>
+		/// 费用使用（万元）
+		/// </summary>
+		public int? CostUse { get; set; }
+		/// <summary>
+		/// 施工机具在用数
+		/// </summary>
+		public int? UseEquipmentNum { get; set; }
+		/// <summary>
+		/// 施工机具特种设备数
+		/// </summary>
+		public int? SpecialEquipmentNum { get; set; }
+		/// <summary>
+		/// 作业许可项数
+		/// </summary>
+		public int? LicensesNum { get; set; }
+		/// <summary>
+		/// 作业许可关闭项数
+		/// </summary>
+		public int? LicensesCloseNum { get; set; }
+		/// <summary>
+		/// 一般隐患整改闭环项
+		/// </summary>
+		public int? GeneralClosedNum { get; set; }
+		/// <summary>
+		/// 一般隐患未整改完成项
+		/// </summary>
+		public int? GeneralNotClosedNum { get; set; }
+		/// <summary>
+		/// 重大隐患整改闭环项
+		/// </summary>
+		public int? MajorClosedNum { get; set; }
+		/// <summary>
+		/// 重大隐患未整改完成项
+		/// </summary>
+		public int? MajorNotClosedNum { get; set; }
+		/// <summary>
+		/// 一般风险数
+		/// </summary>
+		public int? GeneralRiskNum { get; set; }
+		/// <summary>
+		/// 低风险数	
+		/// </summary>
+		public int? LowRiskNum { get; set; }
+		/// <summary>
+		/// 中风险数
+		/// </summary>
+		public int? MediumRiskNum { get; set; }
+		/// <summary>
+		/// 高风险数
+		/// </summary>
+		public int? HighRiskNum { get; set; }
+		/// <summary>
+		/// 危大工程审批完成数
+		/// </summary>
+		public int? CompletedNum { get; set; }
+		/// <summary>
+		/// 危大工程培训人次数
+		/// </summary>
+		public int? TrainPersonNum { get; set; }
+		/// <summary>
+		/// 危大工程施工个数
+		/// </summary>
+		public int? ConstructionNum { get; set; }
+		/// <summary>
+		/// 危大工程完工个数
+		/// </summary>
+		public int? FinishedNum { get; set; }
+		/// <summary>
+		/// 超危大工程审批完成数
+		/// </summary>
+		public int? SuperCompletedNum { get; set; }
+		/// <summary>
+		/// 超危大工程培训人次数
+		/// </summary>
+		public int? SuperTrainPersonNum { get; set; }
+		/// <summary>
+		/// 超危大工程施工个数
+		/// </summary>
+		public int? SuperConstructionNum { get; set; }
+		/// <summary>
+		/// 超危大工程完工个数
+		/// </summary>
+		public int? SuperFinishedNum { get; set; }
+	}
+}

SGGL/Model/Model.cs

@@ -85649,11 +85649,11 @@ namespace Model
 		
 		private System.Nullable<int> _SpecialOperationTrainNum;
 		
-		private System.Nullable<int> _TotalEnergyConsumption;
+		private System.Nullable<decimal> _TotalEnergyConsumption;
 		
-		private System.Nullable<int> _IncomeComprehensiveEnergyConsumption;
+		private System.Nullable<decimal> _IncomeComprehensiveEnergyConsumption;
 		
-		private System.Nullable<int> _NewWaterConsumption;
+		private System.Nullable<decimal> _NewWaterConsumption;
 		
 		private System.Nullable<int> _HeadOfficeInspectorGeneralNum;
 		
@@ -85809,11 +85809,11 @@ namespace Model
     partial void OnSpecialTrainNumChanged();
     partial void OnSpecialOperationTrainNumChanging(System.Nullable<int> value);
     partial void OnSpecialOperationTrainNumChanged();
-    partial void OnTotalEnergyConsumptionChanging(System.Nullable<int> value);
+    partial void OnTotalEnergyConsumptionChanging(System.Nullable<decimal> value);
     partial void OnTotalEnergyConsumptionChanged();
-    partial void OnIncomeComprehensiveEnergyConsumptionChanging(System.Nullable<int> value);
+    partial void OnIncomeComprehensiveEnergyConsumptionChanging(System.Nullable<decimal> value);
     partial void OnIncomeComprehensiveEnergyConsumptionChanged();
-    partial void OnNewWaterConsumptionChanging(System.Nullable<int> value);
+    partial void OnNewWaterConsumptionChanging(System.Nullable<decimal> value);
     partial void OnNewWaterConsumptionChanged();
     partial void OnHeadOfficeInspectorGeneralNumChanging(System.Nullable<int> value);
     partial void OnHeadOfficeInspectorGeneralNumChanged();
@@ -86242,8 +86242,8 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TotalEnergyConsumption", DbType="Int")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TotalEnergyConsumption", DbType="Decimal(18,4)")]
-		public System.Nullable<int> TotalEnergyConsumption
+		public System.Nullable<decimal> TotalEnergyConsumption
 		{
 			get
 			{
@@ -86262,8 +86262,8 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IncomeComprehensiveEnergyConsumption", DbType="Int")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IncomeComprehensiveEnergyConsumption", DbType="Decimal(18,4)")]
-		public System.Nullable<int> IncomeComprehensiveEnergyConsumption
+		public System.Nullable<decimal> IncomeComprehensiveEnergyConsumption
 		{
 			get
 			{
@@ -86282,8 +86282,8 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_NewWaterConsumption", DbType="Int")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_NewWaterConsumption", DbType="Decimal(18,4)")]
-		public System.Nullable<int> NewWaterConsumption
+		public System.Nullable<decimal> NewWaterConsumption
 		{
 			get
 			{

SGGL/Model/Model.csproj

@@ -72,6 +72,7 @@
     <Compile Include="APIItem\HJGL\TestPackageApprove.cs" />
     <Compile Include="APIItem\HJGL\TestPackageItem.cs" />
     <Compile Include="APIItem\HJGL\WelderPerformanceItem.cs" />
+    <Compile Include="APIItem\HSSEItem.cs" />
     <Compile Include="APIItem\HSSE\ChartAnalysisItem.cs" />
     <Compile Include="APIItem\HSSE\CheckSpecialDetailItem.cs" />
     <Compile Include="APIItem\HSSE\CheckSpecialItem.cs" />

SGGL/Model/ZHGL/DataSync/HSSEDataItem.cs

@@ -48,7 +48,7 @@ namespace Model
         public int? HeadOfficeInspectorGeneralNum { get; set; }
         public int? HighRiskNum { get; set; }
         public string Id { get; set; }
-        public int? IncomeComprehensiveEnergyConsumption { get; set; }
+        public decimal? IncomeComprehensiveEnergyConsumption { get; set; }
         public int? JoinConstructionPersonNum { get; set; }
         public int? LicensesCloseNum { get; set; }
         public int? LicensesNum { get; set; }
@@ -61,7 +61,7 @@ namespace Model
         public string MajorRate { get; set; }
         public int? MediumRiskNum { get; set; }
         public int? NearMissNum { get; set; }
-        public int? NewWaterConsumption { get; set; }
+        public decimal? NewWaterConsumption { get; set; }
         public int? ProjectComprehensivePlanNum { get; set; }
         public int? ProjectDrillNum { get; set; }
         public int? ProjectFullTimeNum { get; set; }
@@ -90,7 +90,7 @@ namespace Model
         public int? SuperConstructionNum { get; set; }
         public int? SuperFinishedNum { get; set; }
         public int? SuperTrainPersonNum { get; set; }
-        public int? TotalEnergyConsumption { get; set; }
+        public decimal? TotalEnergyConsumption { get; set; }
         public int? TotalWorkingHour { get; set; }
         public int? TrainPersonNum { get; set; }
         public string UnitId { get; set; }