From 319124aae91b91b4ac6996bfd9c26029fe51463f Mon Sep 17 00:00:00 2001
From: fly-l <1420031550@qq.com>
Date: Thu, 15 Sep 2022 23:26:18 +0800
Subject: [PATCH] =?UTF-8?q?20220915=20=E5=A2=9E=E5=8A=A0=E7=84=8A=E5=B7=A5?=
 =?UTF-8?q?=E5=8A=9F=E6=95=88=E5=88=86=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DataBase/版本日志/SGGLDB_V2022-09-16 lpf.sql  | 37 +++++++++++++++++++
 .../版本日志/SGGLDB_V2022-09-16修改明细.txt   |  7 ++++
 2 files changed, 44 insertions(+)
 create mode 100644 DataBase/版本日志/SGGLDB_V2022-09-16 lpf.sql
 create mode 100644 DataBase/版本日志/SGGLDB_V2022-09-16修改明细.txt

diff --git a/DataBase/版本日志/SGGLDB_V2022-09-16 lpf.sql b/DataBase/版本日志/SGGLDB_V2022-09-16 lpf.sql
new file mode 100644
index 00000000..d9a47697
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_V2022-09-16 lpf.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
+
+ 
\ No newline at end of file
diff --git a/DataBase/版本日志/SGGLDB_V2022-09-16修改明细.txt b/DataBase/版本日志/SGGLDB_V2022-09-16修改明细.txt
new file mode 100644
index 00000000..75dec6bd
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_V2022-09-16修改明细.txt
@@ -0,0 +1,7 @@
+ 
+--ADD BY lipengfei  2022-09-16
+1,焊接增加焊工功效分析
+--END
+ 
+
+