20220915 焊接增加焊工功效分析界面

2022-09-15 23:20:10 +08:00 · 2022-09-15 23:20:10 +08:00 · e78dee144b
parent f4640cf410
commit e78dee144b
15 changed files with 551 additions and 14 deletions
--- a/DataBase/版本日志/SGGLDB_V2022-09-15.sql
+++ b/DataBase/版本日志/SGGLDB_V2022-09-15.sql
@ -0,0 +1,37 @@
+
+	INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+	VALUES('854C79DF-A1C0-4E3C-BCB4-7D5CD044F72B','焊工功效分析','HJGL/WeldingReport/WelderEfficacy.aspx',90,'F3B157B7-9BEE-4150-80CB-087828F1C51D','Menu_HJGL',0,1,1)
+	GO
+	INSERT INTO Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('47A49DB1-4689-421A-A93E-DCBD7C34D917','854C79DF-A1C0-4E3C-BCB4-7D5CD044F72B','查看',1)
+	GO
+
+
+CREATE  PROC [dbo].[sp_rpt_WelderEfficacy]    
+		  @unitcode NVARCHAR(50) = NULL,   --单位名称
+          @projectId NVARCHAR(50) = NULL,
+		  @JointAttribute NVARCHAR(50) = NULL
+          
+AS
+/*焊工功效分析*/
+select 
+Welder.PersonId,
+Welder.WelderCode,
+Welder.PersonName,
+cast( SUM(ISNULL(jot.Size,0))AS DECIMAL(8,0) ) as TotalDin,
+count(distinct daily.WeldingDailyId) as  worktime,
+cast(cast( SUM(ISNULL(jot.Size,0))AS DECIMAL(8,3) ) /count(distinct daily.WeldingDailyId) as  DECIMAL(8,0)) as  Effect
+from SitePerson_Person Welder 
+left join HJGL_WeldJoint jot on  jot.CoverWelderId=Welder.PersonId
+left join HJGL_WeldingDaily  daily on jot.WeldingDailyId=daily.WeldingDailyId
+where Welder.WorkPostId='19B8F2A9-28D3-4F20-867A-1B2237C2E228' 
+AND (welder.ProjectId = @projectId OR @projectId IS NULL)
+AND (welder.UnitId=@unitcode OR @unitcode IS NULL)
+And (jot.JointAttribute=@JointAttribute OR @JointAttribute IS NULL)
+group by Welder.PersonName,Welder.PersonId,Welder.WelderCode
+having count(distinct daily.WeldingDailyId) !=0
+ 
+
+
+GO
+
+ 
--- a/DataBase/版本日志/SGGLDB_V2022-09-15修改明细.txt
+++ b/DataBase/版本日志/SGGLDB_V2022-09-15修改明细.txt
@ -0,0 +1,4 @@
+--ADD BY lipengfei  2022-09-15
+1,焊接增加焊工功效分析
+--END
+ 
--- a/DataBase/菜单初始化脚本/1-5焊接管理（Menu_HJGL）.sql
+++ b/DataBase/菜单初始化脚本/1-5焊接管理（Menu_HJGL）.sql
@ -534,6 +534,14 @@ GO
 	GO
 	INSERT INTO Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('F17794E8-5ECC-4CCE-9BBF-0BC7A1E09CAF','EAD61207-E396-45B0-A1D2-7A5F0498AACC','查看',1)
 	GO
+
+	INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+	VALUES('854C79DF-A1C0-4E3C-BCB4-7D5CD044F72B','焊工功效分析','HJGL/WeldingReport/WelderEfficacy.aspx',90,'F3B157B7-9BEE-4150-80CB-087828F1C51D','Menu_HJGL',0,1,1)
+	GO
+	INSERT INTO Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('47A49DB1-4689-421A-A93E-DCBD7C34D917','854C79DF-A1C0-4E3C-BCB4-7D5CD044F72B','查看',1)
+	GO
+
+
 	--INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
 	--VALUES('CF3CB43C-4031-4CFD-905F-154DC1CB881E','管线综合信息','HJGL/WeldingReport/IsoCompreInfo.aspx',80,'F3B157B7-9BEE-4150-80CB-087828F1C51D','Menu_HJGL',0,1,1)
 	--GO
--- a/SGGL/BLL/BLL.csproj
+++ b/SGGL/BLL/BLL.csproj
@ -64,6 +64,9 @@
      <HintPath>..\FineUIPro\Reference BLL\Interop.WIA.dll</HintPath>
      <EmbedInteropTypes>True</EmbedInteropTypes>
    </Reference>
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+    </Reference>
    <Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
      <HintPath>..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1000\lib\net20\Microsoft.Office.Interop.Excel.dll</HintPath>
      <EmbedInteropTypes>True</EmbedInteropTypes>
@ -96,7 +99,13 @@
    <Reference Include="office, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c">
      <EmbedInteropTypes>True</EmbedInteropTypes>
    </Reference>
+    <Reference Include="RestSharp, Version=106.15.0.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
+      <HintPath>..\packages\RestSharp.106.15.0\lib\net452\RestSharp.dll</HintPath>
+    </Reference>
    <Reference Include="System" />
+    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+    </Reference>
    <Reference Include="System.configuration" />
    <Reference Include="System.Core" />
    <Reference Include="System.Data.Linq" />
@ -104,9 +113,31 @@
    <Reference Include="System.Drawing" />
    <Reference Include="System.IO.Compression" />
    <Reference Include="System.Management" />
+    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+    </Reference>
    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
    <Reference Include="System.Runtime.Serialization" />
    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Text.Encodings.Web, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Encodings.Web.5.0.0\lib\net461\System.Text.Encodings.Web.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Text.Json, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Json.5.0.0\lib\net461\System.Text.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
+    </Reference>
    <Reference Include="System.Web" />
    <Reference Include="System.Web.DataVisualization" />
    <Reference Include="System.Xml.Linq" />
--- a/SGGL/BLL/HJGL/DataImport/DataImportService.cs
+++ b/SGGL/BLL/HJGL/DataImport/DataImportService.cs
@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using RestSharp;
+using System.Collections.Generic;
 using System.Data;
 using System.IO;
 using System.Linq;
@ -91,10 +92,37 @@ namespace BLL
            };

        }
-        public static void UploadFileToOa()
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="file">文件地址</param>
+        /// <param name="subject">主项</param>
+        /// <param name="fileType">1模型2图纸</param>
+        public static bool UploadFileToOa(string file, string unitworkid, string fileType)
        {
+            bool result = true;
+            try
+            {
+                var client = new RestClient("http://sgglnet.sedin.com.cn:6060/file/uploadSingle");
+                client.Timeout = -1;
+                var request = new RestRequest(Method.POST);
+                //   client.UserAgent = "apifox/1.0.0 (https://www.apifox.cn)";
+                //request.AddFile("file", @"E:\微信\WeChat\WeChat Files\wxid_9140361403112\FileStorage\File\2022-08\焊接管理尾项20220809.docx");
+                request.AddFile("file", file);
+                string unitworkname = BLL.UnitWorkService.GetNameById(unitworkid);
+                request.AddParameter("subject", unitworkname);
+                request.AddParameter("fileType", fileType);
+                IRestResponse response = client.Execute(request);
+                var contentPost = response.Content;
+            }
+            catch (System.Exception)
+            {

-        }
+                result =false;
+            }
+            return result;
+            
+         }
        /// <summary>
        /// 获取当前文件新的版本号
        /// </summary>
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@ -608,6 +608,7 @@
    <Content Include="HJGL\WeldingReport\UnitWorkAreaQuality.aspx" />
    <Content Include="HJGL\WeldingReport\UnitWorkAreaShowColumn.aspx" />
    <Content Include="HJGL\WeldingReport\WelderAvgPerformance.aspx" />
+    <Content Include="HJGL\WeldingReport\WelderEfficacy.aspx" />
    <Content Include="HJGL\WeldingReport\WelderPerformance.aspx" />
    <Content Include="HJGL\WeldingReport\WeldJointOut.aspx" />
    <Content Include="HJGL\WPQ\WPQEdit.aspx" />
@ -8119,6 +8120,13 @@
    <Compile Include="HJGL\WeldingReport\WelderAvgPerformance.aspx.designer.cs">
      <DependentUpon>WelderAvgPerformance.aspx</DependentUpon>
    </Compile>
+    <Compile Include="HJGL\WeldingReport\WelderEfficacy.aspx.cs">
+      <DependentUpon>WelderEfficacy.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HJGL\WeldingReport\WelderEfficacy.aspx.designer.cs">
+      <DependentUpon>WelderEfficacy.aspx</DependentUpon>
+    </Compile>
    <Compile Include="HJGL\WeldingReport\WelderPerformance.aspx.cs">
      <DependentUpon>WelderPerformance.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
--- a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImportEdit.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImportEdit.aspx
@ -47,7 +47,7 @@
                </f:Toolbar>
            </Toolbars>
        </f:Form>
-        <f:Window ID="WindowAtt" Title="文件柜" Hidden="true" EnableMaximize="true" EnableIFrame="true"  
+        <f:Window ID="WindowAtt" Title="附件上传" Hidden="true" EnableMaximize="true" EnableIFrame="true"  
            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
            Height="500px">
        </f:Window>
--- a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImportEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImportEdit.aspx.cs
@ -54,13 +54,14 @@ namespace FineUIPro.Web.HJGL.DataImport


        }
-        public void Save()
+        public string  Save()
        {
+            string result = "";
            if (Session["AttachFile.webuploader"] == null)
            {
                ShowNotify("请先上传文件！", MessageBoxIcon.Error);

-                return;
+                return result;
            }
            List<Model.AttachSourceItems> root = JsonConvert.DeserializeObject<List<Model.AttachSourceItems>>(Session["AttachFile.webuploader"].ToString());
            foreach (var item in root)
@ -82,13 +83,29 @@ namespace FineUIPro.Web.HJGL.DataImport
                dataImport.CreateDate = DateTime.Now;
                BLL.HJGL_DataImportService.AddHJGL_DataImport(dataImport);

+                if (!BLL.HJGL_DataImportService.UploadFileToOa(Funs.RootPath + dataImport.FilePath, dataImport.UnitWorkId, "2"))
+                {
+                    string str ="   "+ dataImport.FileName+"推送失败|";
+                    result += str;
+                } 
+
+
            }
            Session.Remove("AttachFile.webuploader");
+            return result;
        }
        protected void btnSave_Click(object sender, EventArgs e)
        {
-            Save();
-            ShowNotify("保存成功！", MessageBoxIcon.Success);
+            string result= Save();
+            if (result =="")
+            {
+                ShowNotify("保存成功！", MessageBoxIcon.Success);
+            }
+            else
+            {
+                ShowNotify(result, MessageBoxIcon.Warning);
+
+            }
            PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());

        }
--- a/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImportEdit.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImportEdit.aspx
@ -48,7 +48,7 @@
                </f:Toolbar>
            </Toolbars>
        </f:Form>
-        <f:Window ID="WindowAtt" Title="文件柜" Hidden="true" EnableMaximize="true" EnableIFrame="true"  
+        <f:Window ID="WindowAtt" Title="附件上传" Hidden="true" EnableMaximize="true" EnableIFrame="true"  
            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
            Height="500px">
        </f:Window>
--- a/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImportEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/DataImport/TDMImportEdit.aspx.cs
@ -54,13 +54,14 @@ namespace FineUIPro.Web.HJGL.DataImport


        }
-        public void Save()
+        public string Save()
        {
+            string result = "";
            if (Session["AttachFile.webuploader"] == null)
            {
                ShowNotify("请先上传文件！", MessageBoxIcon.Error);

-                return;
+                return result;
            }
            List<Model.AttachSourceItems> root = JsonConvert.DeserializeObject<List<Model.AttachSourceItems>>(Session["AttachFile.webuploader"].ToString());
            foreach (var item in root)
@ -81,16 +82,31 @@ namespace FineUIPro.Web.HJGL.DataImport
                dataImport.CreateMan = this.CurrUser.PersonId;
                dataImport.CreateDate = DateTime.Now;
                BLL.HJGL_DataImportService.AddHJGL_DataImport(dataImport);
-
+                if (!BLL.HJGL_DataImportService.UploadFileToOa(Funs.RootPath + dataImport.FilePath, dataImport.UnitWorkId, "1"))
+                {
+                    string str = "   " + dataImport.FileName + "推送失败|";
+                    result += str;
+                }
            }
            Session.Remove("AttachFile.webuploader");
+            return result;
+
        }
        protected void btnSave_Click(object sender, EventArgs e)
        {
-            Save();
-            ShowNotify("保存成功！", MessageBoxIcon.Success);
+            string result = Save();
+            if (result == "")
+            {
+                ShowNotify("保存成功！", MessageBoxIcon.Success);
+            }
+            else
+            {
+                ShowNotify(result, MessageBoxIcon.Warning);
+
+            }
            PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());

        }
+
    }
 }
--- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/WelderEfficacy.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/WelderEfficacy.aspx
@ -0,0 +1,84 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WelderEfficacy.aspx.cs" Inherits="FineUIPro.Web.HJGL.WeldingReport.WelderEfficacy" %>
+
+<!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" />
+</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" EnableColumnLines="true" DataKeyNames="WelderCode"
+                AllowCellEditing="true" ClicksToEdit="2" DataIDField="WelderCode" AllowSorting="true"
+                SortField="WelderCode" SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true"
+                IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
+                EnableTextSelection="True">
+                <Toolbars>
+                    <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
+                        <Items>
+                            <f:DropDownList ID="drpUnitId" runat="server" Label="单位名称"
+                                LabelAlign="Right"  Width="240px" LabelWidth="80px" >
+                            </f:DropDownList>                    
+                             <f:DropDownList ID="drpJointAttribute" Label="焊口属性" AutoPostBack="true"
+                                runat="server" Required="true" LabelWidth="80px"
+                                Width="240px" LabelAlign="Right">
+                            </f:DropDownList>
+                                 <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                            </f:ToolbarFill>
+                             <f:Button ID="BtnAnalyse" Text="统计" Icon="ChartPie"
+                                runat="server" OnClick="BtnAnalyse_Click">
+                            </f:Button>
+                            <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出"
+                                Icon="TableGo" EnableAjax="false" DisableControlBeforePostBack="false">
+                            </f:Button>      
+                           
+                        </Items>
+                    </f:Toolbar>
+                </Toolbars>
+                <Columns>
+                    
+                    <f:RenderField HeaderText="焊工号" ColumnID="WelderCode"
+                        DataField="WelderCode" SortField="WelderCode" FieldType="String" HeaderTextAlign="Center"
+                        Width="220px">
+                    </f:RenderField>
+                    <f:RenderField HeaderText="焊工姓名" ColumnID="PersonName"
+                        DataField="PersonName" SortField="PersonName" FieldType="String" HeaderTextAlign="Center"
+                        Width="220px">
+                    </f:RenderField>
+                    <f:RenderField HeaderText="完成工程量" ColumnID="TotalDin"
+                        DataField="TotalDin"  FieldType="String" HeaderTextAlign="Center"
+                        Width="220px">
+                    </f:RenderField>
+                    <f:RenderField HeaderText="完成所用时间" ColumnID="worktime"
+                        DataField="worktime"  FieldType="String" HeaderTextAlign="Center"
+                        Width="220px">
+                    </f:RenderField>
+                    <f:RenderField HeaderText="功效" ColumnID="Effect"
+                        DataField="Effect"  FieldType="String" HeaderTextAlign="Center"
+                        Width="220px">
+                    </f:RenderField>
+                 </Columns>
+                <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:ListItem Text="10" Value="10" />
+                        <f:ListItem Text="15" Value="15" />
+                        <f:ListItem Text="20" Value="20" />
+                        <f:ListItem Text="25" Value="25" />
+                    </f:DropDownList>
+                </PageItems>
+            </f:Grid>
+        </Items>
+    </f:Panel>
+    </form>
+</body>
+</html>
--- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/WelderEfficacy.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/WelderEfficacy.aspx.cs
@ -0,0 +1,167 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Text;
+using AspNet = System.Web.UI.WebControls;
+
+
+namespace FineUIPro.Web.HJGL.WeldingReport
+{
+    public partial class WelderEfficacy : PageBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
+                this.drpJointAttribute.DataTextField = "Text";
+                this.drpJointAttribute.DataValueField = "Value";
+                this.drpJointAttribute.DataSource = BLL.DropListService.HJGL_JointAttribute();
+                this.drpJointAttribute.DataBind();
+                Funs.FineUIPleaseSelect(drpJointAttribute);
+
+                BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.drpUnitId, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);
+
+            }
+        }
+
+        #region
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            List<SqlParameter> listStr = new List<SqlParameter>();
+
+            listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
+            if (this.drpUnitId.SelectedValue != BLL.Const._Null)
+            {
+                listStr.Add(new SqlParameter("@unitcode", this.drpUnitId.SelectedValue));
+            }
+            else
+            {
+                listStr.Add(new SqlParameter("@unitcode", null));
+            }
+
+            if (drpJointAttribute.SelectedValue != Const._Null)
+            {
+                listStr.Add(new SqlParameter("@JointAttribute", drpJointAttribute.SelectedValue));
+            }
+            else
+            {
+                listStr.Add(new SqlParameter("@JointAttribute", null));
+
+            }
+           
+
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunProc("sp_rpt_WelderEfficacy", parameter);
+            this.Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+
+        /// <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 ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+
+        #region 统计按钮事件
+        /// <summary>
+        /// 统计
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void BtnAnalyse_Click(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+        #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;
+            Response.Write(GetGridTableHtml(Grid1));
+            Response.End();
+        }
+
+        /// <summary>
+        /// 导出方法
+        /// </summary>
+        /// <param name="grid"></param>
+        /// <returns></returns>
+        private string GetGridTableHtml(Grid grid)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");
+            sb.Append("<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">");
+            sb.Append("<tr>");
+            grid.PageSize = 10000;
+            BindGrid();
+            foreach (GridColumn column in grid.Columns)
+            {
+                sb.AppendFormat("<td>{0}</td>", column.HeaderText);
+            }
+            sb.Append("</tr>");
+            foreach (GridRow row in grid.Rows)
+            {
+                sb.Append("<tr>");
+                foreach (GridColumn column in grid.Columns)
+                {
+                    string html = row.Values[column.ColumnIndex].ToString();
+                    if (column.ColumnID == "tfNumber")
+                    {
+                        html = (row.FindControl("labNumber") as AspNet.Label).Text;
+                    }
+                    sb.AppendFormat("<td>{0}</td>", html);
+                }
+
+                sb.Append("</tr>");
+            }
+
+            sb.Append("</table>");
+
+            return sb.ToString();
+        }
+        #endregion
+    }
+}
--- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/WelderEfficacy.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/WelderEfficacy.aspx.designer.cs
@ -0,0 +1,134 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.HJGL.WeldingReport
+{
+
+
+    public partial class WelderEfficacy
+    {
+
+        /// <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>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+
+        /// <summary>
+        /// drpUnitId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpUnitId;
+
+        /// <summary>
+        /// drpJointAttribute 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpJointAttribute;
+
+        /// <summary>
+        /// ToolbarFill1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+        /// <summary>
+        /// BtnAnalyse 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button BtnAnalyse;
+
+        /// <summary>
+        /// btnOut 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+
+        /// <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;
+    }
+}
--- a/SGGL/FineUIPro.Web/common/Menu_HJGL.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_HJGL.xml
@ -61,5 +61,6 @@
 <TreeNode id="41C22E63-36B7-4C44-89EC-F765BFBB7C55" Text="焊工业绩分析" NavigateUrl="HJGL/WeldingReport/WelderPerformance.aspx"></TreeNode>
 <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>
 </Tree>
--- a/SGGL/FineUIPro.Web/common/Menu_HTGL.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_HTGL.xml
@ -7,4 +7,6 @@
 <TreeNode id="98573D16-3310-4292-96A5-A59B9A5E6B6B" Text="通用条款" NavigateUrl="PHTGL/ContractCompile/GeneralTermsConditions.aspx"></TreeNode>
 <TreeNode id="98367C43-9C85-467E-9144-288D80101E41" Text="专用条款" NavigateUrl="PHTGL/ContractCompile/SpecialTermsConditions.aspx"></TreeNode>
 </TreeNode>
+<TreeNode id="E3978B9E-89D7-4B23-B44B-A680FAFA0443" Text="施工长名单管理" NavigateUrl=""><TreeNode id="9C4E7381-4080-4082-8C4D-B041149D48C7" Text="施工长名单入网申请" NavigateUrl="PHTGL/LongListManager/LongListNetApplication.aspx"></TreeNode>
+</TreeNode>
 </Tree>