20230530集团看板数据来源页面添加

2023-05-30 08:52:00 +08:00
parent 9c804196e7
commit f4b1c42fa9
118 changed files with 18934 additions and 137 deletions
@@ -58,7 +58,7 @@ namespace FineUIPro.Web.HSSE.Accident
                          + @" FROM Accident_AccidentPersonRecord AS AccidentPersonRecord "
                          + @" LEFT JOIN Base_AccidentType AS AccidentType ON AccidentType.AccidentTypeId = AccidentPersonRecord.AccidentTypeId "
                          + @" LEFT JOIN WBS_UnitWork AS WorkArea ON WorkArea.UnitWorkId = AccidentPersonRecord.WorkAreaId "
-                          + @" LEFT JOIN SitePerson_Person AS Person ON Person.PersonId = AccidentPersonRecord.PersonId "
+                          + @" LEFT JOIN SitePerson_Person AS Person ON AccidentPersonRecord.ProjectId =Person.ProjectId AND  Person.PersonId = AccidentPersonRecord.PersonId  "
                          + @" LEFT JOIN Base_WorkPost AS WorkPost ON WorkPost.WorkPostId = Person.WorkPostId "
                          + @" LEFT JOIN Sys_FlowOperate AS FlowOperate ON AccidentPersonRecord.AccidentPersonRecordId = FlowOperate.DataId AND FlowOperate.IsClosed <> 1"
                          + @" LEFT JOIN Person_Persons AS OperateUser ON FlowOperate.OperaterId = OperateUser.PersonId"