From ba8a84b2e07c883da4511bac429f86054d50a937 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Thu, 14 Sep 2023 20:11:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=9C=E4=B8=9A=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../版本日志/SGGLDB_WH_2023-09-14.sql | 357 ++++++++++++++++++ SGGL/BLL/HSSE/Manager/HSSELogService.cs | 93 ++++- .../File/Word/HSSE/临时用电作业票.doc | Bin 0 -> 29184 bytes SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 1 + .../HSSE/License/Electricity.aspx.cs | 6 +- SGGL/Model/APIItem/HSSE/HSSELogItem.cs | 47 +++ SGGL/Model/Model.csproj | 1 + .../Controllers/HSSE/HSSELogController.cs | 118 ++++++ SGGL/WebAPI/WebAPI.csproj | 1 + 9 files changed, 620 insertions(+), 4 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_WH_2023-09-14.sql create mode 100644 SGGL/FineUIPro.Web/File/Word/HSSE/临时用电作业票.doc create mode 100644 SGGL/Model/APIItem/HSSE/HSSELogItem.cs create mode 100644 SGGL/WebAPI/Controllers/HSSE/HSSELogController.cs diff --git a/DataBase/版本日志/SGGLDB_WH_2023-09-14.sql b/DataBase/版本日志/SGGLDB_WH_2023-09-14.sql new file mode 100644 index 00000000..dd9d259d --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2023-09-14.sql @@ -0,0 +1,357 @@ + +--ȡǰ˴ +ALTER PROCEDURE [dbo].[Sp_APP_GetToDoItems] + @projectId NVARCHAR(50)=NULL, + @userId NVARCHAR(200)=NULL +AS +/*ȡǰ˴*/ +BEGIN +SELECT HazardRegisterId AS DataId + ,'B6BE5FE0-CB84-47FF-A6C3-5AD9E1CCE079' AS MenuId + ,'ȫѲ' AS MenuName + ,register.RegisterDef AS Content + ,UserId + ,users.UserName + ,register.RegisterDate AS DataTime + ,CONVERT(varchar(100),register.RegisterDate, 23) AS DataTimeStr + ,'/pagesHSSE/safe/inspecitonconfirm' AS UrlStr +FROM HSSE_Hazard_HazardRegister AS register +LEFT JOIN Sys_User AS users ON users.UserId =@userId +WHERE register.ProjectId=@projectId AND +((register.states = '1' AND (register.ResponsibleMan =@userId OR register.CCManIds LIKE ('%'+@userId+'%') )) +OR (register.states = '2' AND register.CheckManId =@userId)) + +UNION ALL +SELECT PlanId AS DataId + ,'B782A26B-D85C-4F84-8B45-F7AA47B3159E' AS MenuId + ,'ѵƻ' AS MenuName + ,PlanName AS Content + ,UserId + ,users.UserName + ,DesignerDate AS DataTime + ,CONVERT(varchar(100),DesignerDate, 23) AS DataTimeStr + ,'/pagesTest/test/trainindex' AS UrlStr +FROM Training_Plan AS ePlan +LEFT JOIN Sys_User AS users ON ePlan.DesignerId= users.UserId +WHERE (ePlan.ProjectId=@projectId or (@projectId is null and ePlan.ProjectId is null)) + AND (States = '0' OR States = '1' ) AND ePlan.DesignerId =@userId + +UNION ALL +SELECT TestPlanId AS DataId + ,'FAF7F4A4-A4BC-4D94-9E88-0CF5A380DB34' AS MenuId + ,'Լƻ' AS MenuName + ,PlanName AS Content + ,UserId + ,users.UserName + ,PlanDate AS DataTime + ,CONVERT(varchar(100),PlanDate, 23) AS DataTimeStr + ,'/pagesTest/test/testplan' AS UrlStr +FROM Training_TestPlan AS TPlan +LEFT JOIN Sys_User AS users ON users.UserId =TPlan.PlanManId +WHERE (TPlan.ProjectId=@projectId or (@projectId is null and TPlan.ProjectId is null)) + AND (States = '0' OR States = '1' ) AND PlanManId =@userId + +UNION ALL +SELECT TaskId AS DataId + ,'E108F75D-89D0-4DCA-8356-A156C328805C' AS MenuId + ,'ѵ' AS MenuName + ,Plans.PlanName AS Content + ,users.UserId + ,users.UserName + ,TaskDate AS DataTime + ,CONVERT(varchar(100),TaskDate, 23) AS DataTimeStr + ,('/pagesTest/test/taskindex') AS UrlStr +FROM Training_Task AS Task + LEFT JOIN Sys_User AS users ON users.UserId =@userId + LEFT JOIN Training_Plan AS Plans ON Plans.PlanId =Task.PlanId +WHERE (Task.ProjectId=@projectId or (@projectId is null and Task.ProjectId is null)) + AND (Task.States IS NULL OR Task.States != 2) + AND Task.UserId = @userId + +UNION ALL +SELECT TestRecordId AS DataId + ,'0EEB138D-84F9-4686-8CBB-CAEAA6CF1B2A' AS MenuId + ,'ɨ뿼' AS MenuName + ,TestPlan.PlanName AS Content + ,TestRecord.TestManId + ,Person.PersonName + ,TestPlan.TestStartTime AS DataTime + ,CONVERT(varchar(100),TestPlan.TestStartTime, 23) AS DataTimeStr + ,('/pages/temp_index/index') AS UrlStr +FROM Training_TestRecord AS TestRecord +left join Training_TestPlan as TestPlan on TestRecord.TestPlanId = TestPlan.TestPlanId +left join SitePerson_Person as Person on Person.PersonId = TestRecord.TestManId +left join Sys_User as uses on Person.IdentityCard = uses.IdentityCard +WHERE (TestRecord.ProjectId=@projectId or (@projectId is null and TestRecord.ProjectId is null)) +AND TestPlan.States ='1' +AND TestRecord.TestEndTime IS NULL +AND (TestRecord.TestManId = @userId or uses.UserId = @userId) + +UNION ALL +SELECT FireWorkId AS DataId + ,'2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B' AS MenuId + ,'ҵ' AS MenuName + ,LicenseCode AS Content + ,UserId + ,users.UserName + ,ApplyDate AS DataTime + ,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr + ,(CASE WHEN States = '0' THEN '/pagesWork/dhuo/add' + ELSE '/pagesWork/dhuo/approval' END) AS UrlStr +FROM License_FireWork AS License + LEFT JOIN Sys_User AS users ON users.UserId =License.NextManId +WHERE License.ProjectId=@projectId + AND (States = '0' OR States = '1' ) + AND License.NextManId LIKE '%'+ @userId+'%' + +UNION ALL +SELECT HeightWorkId AS DataId + ,'DA1CAE8E-B5BF-4AC0-9996-AF6CAA412CA9' AS MenuId + ,'ߴҵ' AS MenuName + ,LicenseCode AS Content + ,UserId + ,users.UserName + ,ApplyDate AS DataTime + ,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr + ,(CASE WHEN States = '0' THEN '/pagesWork/gchu/add' + ELSE '/pagesWork/dhuo/approval' END) AS UrlStr +FROM License_HeightWork AS License + LEFT JOIN Sys_User AS users ON users.UserId =License.NextManId +WHERE License.ProjectId=@projectId + AND (States = '0' OR States = '1' ) + AND License.NextManId LIKE '%'+ @userId+'%' + +UNION ALL +SELECT LimitedSpaceId AS DataId + ,'AEC9166D-1C91-45F0-8BFE-D3D0479A28C7' AS MenuId + ,'޿ռ' AS MenuName + ,LicenseCode AS Content + ,UserId + ,users.UserName + ,ApplyDate AS DataTime + ,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr + ,(CASE WHEN States = '0' THEN '/pagesWork/sxkj/add' + ELSE '/pagesWork/dhuo/approval' END) AS UrlStr +FROM License_LimitedSpace AS License + LEFT JOIN Sys_User AS users ON users.UserId =License.NextManId +WHERE License.ProjectId=@projectId + AND (States = '0' OR States = '1' ) + AND License.NextManId LIKE '%'+ @userId+'%' + +UNION ALL +SELECT RadialWorkId AS DataId + ,'F72FF20B-D3EB-46A5-97F7-C99B2473A140' AS MenuId + ,'ҵ' AS MenuName + ,LicenseCode AS Content + ,UserId + ,users.UserName + ,ApplyDate AS DataTime + ,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr + ,(CASE WHEN States = '0' THEN '/pagesWork/sx/add' + ELSE '/pagesWork/dhuo/approval' END) AS UrlStr +FROM License_RadialWork AS License + LEFT JOIN Sys_User AS users ON users.UserId =License.NextManId +WHERE License.ProjectId=@projectId + AND (States = '0' OR States = '1' ) + AND License.NextManId LIKE '%'+ @userId+'%' + +UNION ALL +SELECT OpenCircuitId AS DataId + ,'4E607E83-41FC-4F49-B26F-A21CFE38328F' AS MenuId + ,'·(ռ)' AS MenuName + ,LicenseCode AS Content + ,UserId + ,users.UserName + ,ApplyDate AS DataTime + ,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr + ,(CASE WHEN States = '0' THEN '/pagesWork/dlu/add' + ELSE '/pagesWork/dhuo/approval' END) AS UrlStr +FROM License_OpenCircuit AS License + LEFT JOIN Sys_User AS users ON users.UserId =License.NextManId +WHERE License.ProjectId=@projectId + AND (States = '0' OR States = '1' ) + AND License.NextManId LIKE '%'+ @userId+'%' + +UNION ALL +SELECT BreakGroundId AS DataId + ,'755C6AC9-2E38-4D4F-AF33-33CB1744A907' AS MenuId + ,'ҵ' AS MenuName + ,LicenseCode AS Content + ,UserId + ,users.UserName + ,ApplyDate AS DataTime + ,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr + ,(CASE WHEN States = '0' THEN '/pagesWork/dtu/add' + ELSE '/pagesWork/dhuo/approval' END) AS UrlStr +FROM License_BreakGround AS License + LEFT JOIN Sys_User AS users ON users.UserId =License.NextManId +WHERE License.ProjectId=@projectId + AND (States = '0' OR States = '1' ) + AND License.NextManId LIKE '%'+ @userId+'%' + +UNION ALL +SELECT NightWorkId AS DataId + ,'7BBAE649-7B00-4475-A911-BFE3A37AC55B' AS MenuId + ,'ҹʩ' AS MenuName + ,LicenseCode AS Content + ,UserId + ,users.UserName + ,ApplyDate AS DataTime + ,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr + ,(CASE WHEN States = '0' THEN '/pagesWork/yjsg/add' + ELSE '/pagesWork/dhuo/approval' END) AS UrlStr +FROM License_NightWork AS License + LEFT JOIN Sys_User AS users ON users.UserId =License.NextManId +WHERE License.ProjectId=@projectId + AND (States = '0' OR States = '1' ) + AND License.NextManId LIKE '%'+ @userId+'%' + +UNION ALL +SELECT LiftingWorkId AS DataId + ,'A1BE3AB6-9D4A-41E7-8870-E73423165451' AS MenuId + ,'װҵ' AS MenuName + ,LicenseCode AS Content + ,UserId + ,users.UserName + ,ApplyDate AS DataTime + ,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr + ,(CASE WHEN States = '0' THEN '/pagesWork/dzhuang/add' + ELSE '/pagesWork/dhuo/approval' END) AS UrlStr +FROM License_LiftingWork AS License + LEFT JOIN Sys_User AS users ON users.UserId =License.NextManId +WHERE License.ProjectId=@projectId + AND (States = '0' OR States = '1' ) + AND License.NextManId LIKE '%'+ @userId+'%' + +UNION ALL +SELECT RectifyNoticesId AS DataId + ,'0038D764-D628-46F0-94FF-D0A22C3C45A3' AS MenuId + ,'' AS MenuName + ,(CASE WHEN Rectify.States =1 THEN 'ǩ' + WHEN Rectify.States =2 THEN 'ģ' + WHEN Rectify.States =3 THEN 'ˣ' + WHEN Rectify.States =4 THEN '飺' + WHEN Rectify.States =5 THEN 'ɣ' + ELSE 'ύ' END + RectifyNoticesCode) AS Content + ,users.UserId + ,users.UserName + ,CheckedDate AS DataTime + ,CONVERT(varchar(100),CheckedDate, 23) AS DataTimeStr + ,(CASE WHEN ISNULL(Rectify.States,0) =0 THEN '/pagesHSSE/rn/rn_add' --ύ + WHEN Rectify.States =1 THEN '/pagesHSSE/rn/rn_approval' --ǩ + WHEN Rectify.States =2 THEN '/pagesHSSE/rn/rn_rectify' -- + WHEN Rectify.States =3 THEN '/pagesHSSE/rn/rn_rectifycf' -- + WHEN Rectify.States =4 THEN '/pagesHSSE/rn/rn_confirm' -- + ELSE '/pagesHSSE/rn/rn_add' END) AS UrlStr +FROM Check_RectifyNotices AS Rectify + LEFT JOIN Sys_User AS users ON users.UserId =@userId +WHERE Rectify.Projectid=@projectId AND Rectify.States <> 5 + AND ((ISNULL(Rectify.States,0) =0 AND Rectify.CompleteManId LIKE '%'+ @userId+'%') + OR (Rectify.States =1 AND Rectify.SignPerson LIKE '%'+ @userId+'%') + OR (Rectify.States =2 AND Rectify.DutyPersonId LIKE '%'+ @userId+'%') + OR (Rectify.States =3 AND Rectify.UnitHeadManId LIKE '%'+ @userId+'%') + OR (Rectify.States =4 AND Rectify.CheckPerson LIKE '%'+ @userId+'%') + OR (Rectify.ProfessionalEngineerId LIKE '%'+ @userId+'%' AND (ProfessionalEngineerTime1 IS NULL OR ProfessionalEngineerTime2 IS NULL)) + OR (Rectify.ConstructionManagerId LIKE '%'+ @userId+'%' AND (ConstructionManagerTime1 IS NULL OR ConstructionManagerTime2 IS NULL)) + OR (Rectify.ProjectManagerId LIKE '%'+ @userId+'%' AND (ProjectManagerTime1 IS NULL OR ProjectManagerTime2 IS NULL))) + +UNION ALL +SELECT PersonId AS DataId + ,'EE260447-028F-46AF-8864-9A5DC9DAA5BD' AS MenuId + ,'ֳԱ' AS MenuName + ,Person.PersonName AS Content + ,users.UserId + ,users.UserName + ,Person.InTime AS DataTime + ,CONVERT(varchar(100),Person.InTime, 23) AS DataTimeStr + ,('/pagesHSSE/info/peopledetail') AS UrlStr +FROM SitePerson_Person AS Person + LEFT JOIN Sys_User AS users ON users.UserId =@userId +WHERE Person.ProjectId=@projectId AND (Person.IsUsed IS NULL OR Person.IsUsed= 0) + AND Person.AuditorId = @userId AND Person.AuditorDate IS NULL + + +UNION ALL +SELECT PauseNoticeId AS DataId + ,'C81DB7ED-165E-4C69-86B0-A3AAE37059FE' AS MenuId + ,'ͣ' AS MenuName + ,(CASE WHEN PauseNotice.PauseStates =1 THEN 'ǩ' + WHEN PauseNotice.PauseStates =2 THEN '׼' + WHEN PauseNotice.PauseStates =3 THEN 'գ' + ELSE 'ύ' END + PauseNoticeCode) AS Content + ,users.UserId + ,users.UserName + ,PauseTime AS DataTime + ,CONVERT(varchar(100),PauseTime, 23) AS DataTimeStr + ,(CASE WHEN ISNULL(PauseNotice.PauseStates,0) =0 THEN '/pagesHSSE/info/stop_add ' --ύ + WHEN PauseNotice.PauseStates =1 AND PauseNotice.SignManId=@userId THEN '/pagesHSSE/info/stop_approval' --ǩ + WHEN PauseNotice.PauseStates =2 AND PauseNotice.ApproveManId=@userId THEN '/pagesHSSE/info/stop_confirm' --׼ + WHEN PauseNotice.PauseStates =3 AND PauseNotice.DutyPersonId=@userId THEN '/pagesHSSE/info/stop_feedback' -- + ELSE '/pagesHSSE/info/stop_detail' END) AS UrlStr +FROM Check_PauseNotice AS PauseNotice + LEFT JOIN Sys_User AS users ON users.UserId =@userId +WHERE PauseNotice.ProjectId=@projectId AND PauseNotice.PauseStates <> 4 + AND ((ISNULL(PauseNotice.PauseStates,0) =0 AND PauseNotice.CompileManId LIKE '%'+ @userId+'%') + OR (PauseNotice.PauseStates =1 AND PauseNotice.SignManId LIKE '%'+ @userId+'%') + OR (PauseNotice.PauseStates =2 AND PauseNotice.ApproveManId LIKE '%'+ @userId+'%') + OR (PauseNotice.PauseStates =3 AND PauseNotice.DutyPersonId LIKE '%'+ @userId+'%') + OR (PauseNotice.ProfessionalEngineerId LIKE '%'+ @userId+'%' AND ProfessionalEngineerTime IS NULL) + OR (PauseNotice.ConstructionManagerId LIKE '%'+ @userId+'%' AND ConstructionManagerTime IS NULL) + OR (PauseNotice.UnitHeadManId LIKE '%'+ @userId+'%' AND UnitHeadManTime IS NULL) + OR (PauseNotice.SupervisorManId LIKE '%'+ @userId+'%' AND SupervisorManTime IS NULL) + OR (PauseNotice.OwnerId LIKE '%'+ @userId+'%' AND OwnerTime IS NULL)) +UNION ALL +SELECT PunishNoticeId AS DataId + ,'755F1C1D-2178-47D8-9F82-A501B53A2436' AS MenuId + ,'' AS MenuName + ,(CASE WHEN PunishNotice.PunishStates =1 THEN 'ǩ' + WHEN PunishNotice.PunishStates =2 THEN '׼' + WHEN PunishNotice.PunishStates =3 THEN 'ִ' + ELSE 'ύ' END + PunishNoticeCode) AS Content + ,users.UserId + ,users.UserName + ,PunishNoticeDate AS DataTime + ,CONVERT(varchar(100),PunishNoticeDate, 23) AS DataTimeStr + ,(CASE WHEN ISNULL(PunishNotice.PunishStates,0) =0 THEN '/pagesTest/punish/add' --ύ + WHEN PunishNotice.PunishStates =1 AND PunishNotice.SignMan=@userId THEN '/pagesTest/punish/approval' --ǩ + WHEN PunishNotice.PunishStates =2 AND PunishNotice.ApproveMan=@userId THEN '/pagesTest/punish/rectify' --׼ + WHEN PunishNotice.PunishStates =3 AND PunishNotice.DutyPersonId=@userId THEN '/pagesTest/punish/rectifycf' --ִ + ELSE '/pagesTest/punish/detail' END) AS UrlStr +FROM Check_PunishNotice AS PunishNotice + LEFT JOIN Sys_User AS users ON users.UserId =@userId +WHERE PunishNotice.ProjectId=@projectId AND PunishNotice.PunishStates <> 4 + AND ((ISNULL(PunishNotice.PunishStates,0) =0 AND PunishNotice.CompileMan LIKE '%'+ @userId+'%') + OR (PunishNotice.PunishStates =1 AND PunishNotice.SignMan LIKE '%'+ @userId+'%') + OR (PunishNotice.PunishStates =2 AND PunishNotice.ApproveMan LIKE '%'+ @userId+'%') + OR (PunishNotice.PunishStates =3 AND PunishNotice.DutyPersonId LIKE '%'+ @userId+'%') + OR (PunishNotice.ProfessionalEngineerId LIKE '%'+ @userId+'%' AND ProfessionalEngineerTime IS NULL) + OR (PunishNotice.ConstructionManagerId LIKE '%'+ @userId+'%' AND ConstructionManagerTime IS NULL) + OR (PunishNotice.UnitHeadManId LIKE '%'+ @userId+'%' AND UnitHeadManTime IS NULL)) +UNION ALL +SELECT ElectricityId AS DataId + ,'48F64E0F-38B2-4BDC-9B61-6200BD02CBF5' AS MenuId + ,'ʱõ' AS MenuName + ,LicenseCode AS Content + ,UserId + ,users.UserName + ,ApplyDate AS DataTime + ,CONVERT(varchar(100),ApplyDate, 23) AS DataTimeStr + ,(CASE WHEN States = '0' THEN '/pagesWork/ldian/add' + ELSE '/pagesWork/dhuo/approval' END) AS UrlStr +FROM License_Electricity AS License + LEFT JOIN Sys_User AS users ON users.UserId =License.NextManId +WHERE License.ProjectId=@projectId + AND (States = '0' OR States = '1' ) + AND License.NextManId LIKE '%'+ @userId+'%' + +ORDER BY DataTime DESC +END + + + + + + +GO + + diff --git a/SGGL/BLL/HSSE/Manager/HSSELogService.cs b/SGGL/BLL/HSSE/Manager/HSSELogService.cs index 6b39376a..4c1d448e 100644 --- a/SGGL/BLL/HSSE/Manager/HSSELogService.cs +++ b/SGGL/BLL/HSSE/Manager/HSSELogService.cs @@ -102,7 +102,7 @@ namespace BLL { using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) { - Model.Manager_HSSELog newHSSELog =db.Manager_HSSELog.FirstOrDefault(e => e.HSSELogId == updateHSSELog.HSSELogId); + Model.Manager_HSSELog newHSSELog = db.Manager_HSSELog.FirstOrDefault(e => e.HSSELogId == updateHSSELog.HSSELogId); if (newHSSELog != null) { newHSSELog.CompileDate = updateHSSELog.CompileDate; @@ -980,5 +980,96 @@ namespace BLL } } #endregion + + #region 小程序接口 + /// + /// 返回列表 + /// + /// + /// + /// + public static List getHSSELogDataList(string projectId, string userId) + { + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + List getInfoList = new List(); + getInfoList = (from x in db.Manager_HSSELog + join y in db.Sys_User on x.CompileMan equals y.UserId + join z in db.Sys_Const on x.Weather equals z.ConstValue + orderby x.CompileDate + where x.IsVisible != false && z.GroupId == BLL.ConstValue.Group_Weather && x.ProjectId == projectId + select new Model.HSSELogItem + { + HSSELogId = x.HSSELogId, + ProjectId = x.ProjectId, + CompileDate = string.Format("{0:yyyy-MM-dd HH:mm}", x.CompileDate), + CompileMan = x.CompileMan, + Weather = x.Weather, + IsVisible = x.IsVisible, + CompileManName = y.UserName, + WeatherName = z.ConstText + }).ToList(); + Model.Project_ProjectUser projectUser = BLL.ProjectUserService.GetProjectUserByUserIdProjectId(projectId, userId); + if (projectUser != null) + { + if (projectUser.RoleId.Contains(BLL.Const.HSSEEngineer)) //项目安全工程师只能看到自己的日志内容 + { + getInfoList = getInfoList.Where(x => x.CompileMan == userId).ToList(); + } + } + return getInfoList; + } + } + + public static Model.HSSELogItem getHSSELogData(string HSSELogId) + { + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + Model.HSSELogItem model = new Model.HSSELogItem(); + model = (from x in db.Manager_HSSELog + join y in db.Sys_User on x.CompileMan equals y.UserId + join z in db.Sys_Const on x.Weather equals z.ConstValue + orderby x.CompileDate + where x.IsVisible != false && z.GroupId == BLL.ConstValue.Group_Weather && x.HSSELogId == HSSELogId + select new Model.HSSELogItem + { + HSSELogId = x.HSSELogId, + ProjectId = x.ProjectId, + CompileDate = string.Format("{0:yyyy-MM-dd HH:mm}", x.CompileDate), + CompileMan = x.CompileMan, + Weather = x.Weather, + IsVisible = x.IsVisible, + CompileManName = y.UserName, + WeatherName = z.ConstText, + + + Num11=x.Num11, + Contents12=x.Contents12, + Contents13=x.Contents13, + Contents21=x.Contents21, + Num21=x.Num21, + Contents22=x.Contents22, + Num22=x.Num22, + Contents23=x.Contents23, + Num23=x.Num23, + Contents24=x.Contents24, + Num24=x.Num24, + Contents210=x.Contents210, + Num210=x.Num210, + Num211=x.Num211, + Contents31=x.Contents31, + Num31=x.Num31, + Contents32=x.Contents32, + Num32=x.Num32, + Contents41=x.Contents41, + Contents42=x.Contents42 + }).FirstOrDefault(); + + return model; + } + } + + + #endregion } } diff --git a/SGGL/FineUIPro.Web/File/Word/HSSE/临时用电作业票.doc b/SGGL/FineUIPro.Web/File/Word/HSSE/临时用电作业票.doc new file mode 100644 index 0000000000000000000000000000000000000000..10c82e65a4017e553a689a8bf477d93c6e2fb468 GIT binary patch literal 29184 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 + diff --git a/SGGL/FineUIPro.Web/HSSE/License/Electricity.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/Electricity.aspx.cs index 0d69be05..a6cb41e6 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/Electricity.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/Electricity.aspx.cs @@ -289,7 +289,7 @@ namespace FineUIPro.Web.HSSE.License string uploadfilepath = string.Empty; string newUrl = string.Empty; string filePath = string.Empty; - initTemplatePath = "File\\Word\\HSSE\\动土作业票.doc"; + initTemplatePath = "File\\Word\\HSSE\\临时用电作业票.doc"; uploadfilepath = rootPath + initTemplatePath; newUrl = uploadfilepath.Replace(".doc", string.Format("{0:yyyy-MM}", DateTime.Now) + ".doc"); filePath = initTemplatePath.Replace(".doc", string.Format("{0:yyyy-MM}", DateTime.Now) + ".pdf"); @@ -340,12 +340,12 @@ namespace FineUIPro.Web.HSSE.License } } - Bookmark bookmarkWorkDepth = doc.Range.Bookmarks["WorkDepth"];//开挖深度 + Bookmark bookmarkWorkDepth = doc.Range.Bookmarks["WorkDepth"];//作业原因 if (bookmarkWorkDepth != null) { if (getElectricity != null) { - bookmarkWorkDepth.Text = getElectricity.WorkDepth; + bookmarkWorkDepth.Text = getElectricity.Reason; } } diff --git a/SGGL/Model/APIItem/HSSE/HSSELogItem.cs b/SGGL/Model/APIItem/HSSE/HSSELogItem.cs new file mode 100644 index 00000000..8aa16960 --- /dev/null +++ b/SGGL/Model/APIItem/HSSE/HSSELogItem.cs @@ -0,0 +1,47 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Model +{ + public class HSSELogItem + { + public string HSSELogId { get; set; } + + public string ProjectId { get; set; } + public string CompileDate { get; set; } + public string CompileMan { get; set; } + public string Weather { get; set; } + public bool? IsVisible { get; set; } + public string CompileManName { get; set; } + public string WeatherName { get; set; } + + public int? Num11 { get; set; } + + + + public string Contents12 { get; set; } + public string Contents13 { get; set; } + public string Contents21 { get; set; } + + public int? Num21 { get; set; } + public string Contents22 { get; set; } + + public int? Num22 { get; set; } + public string Contents23 { get; set; } + public int? Num23 { get; set; } + public string Contents24 { get; set; } + public int? Num24 { get; set; } + public string Contents210 { get; set; } + public int? Num210 { get; set; } + public int? Num211 { get; set; } + public string Contents31 { get; set; } + public int? Num31 { get; set; } + public string Contents32 { get; set; } + public int? Num32 { get; set; } + public string Contents41 { get; set; } + public string Contents42 { get; set; } + } +} diff --git a/SGGL/Model/Model.csproj b/SGGL/Model/Model.csproj index 021d6974..132bd4b1 100644 --- a/SGGL/Model/Model.csproj +++ b/SGGL/Model/Model.csproj @@ -94,6 +94,7 @@ + diff --git a/SGGL/WebAPI/Controllers/HSSE/HSSELogController.cs b/SGGL/WebAPI/Controllers/HSSE/HSSELogController.cs new file mode 100644 index 00000000..a9642904 --- /dev/null +++ b/SGGL/WebAPI/Controllers/HSSE/HSSELogController.cs @@ -0,0 +1,118 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net; +using System.Net.Http; +using System.Web.Http; +using BLL; +using Mvc.Controllers; + +namespace WebAPI.Controllers.HSSE +{ + public class HSSELogController : ApiController + { + /// + /// 加载日志列表 + /// + /// + /// + /// + /// + public Model.ResponeData getHSSELogDataList( string projectId, string userId, int pageIndex=0) + { + var responeData = new Model.ResponeData(); + try + { + var getDataList = HSSELogService.getHSSELogDataList(projectId, userId); + int pageCount = getDataList.Count; + if (pageCount > 0 && pageIndex > 0) + { + getDataList = (from x in getDataList.Skip(Funs.PageSize * (pageIndex - 1)).Take(Funs.PageSize) + select x).ToList(); + } + responeData.data = new { pageCount, getDataList }; + } + catch (Exception ex) + { + responeData.code = 0; + responeData.message = ex.Message; + } + return responeData; + } + + /// + /// 加载日志列表 + /// + /// + /// + /// + /// + public Model.ResponeData getHSSELogData(string HSSELogId) + { + var responeData = new Model.ResponeData(); + try + { + responeData.data = HSSELogService.getHSSELogData(HSSELogId); + } + catch (Exception ex) + { + responeData.code = 0; + responeData.message = ex.Message; + } + return responeData; + } + + /// + /// 加载天气 + /// + /// + public Model.ResponeData getWeatherDataList() + { + var responeData = new Model.ResponeData(); + try + { + responeData.data = ConstValue.drpConstItemList(BLL.ConstValue.Group_Weather); + } + catch (Exception ex) + { + responeData.code = 0; + responeData.message = ex.Message; + } + return responeData; + } + + /// + /// 保存日志 + /// + /// 作业票记录 + [HttpPost] + public Model.ResponeData SaveHSSELogData([FromBody] Model.Manager_HSSELog HSSELog) + { + var responeData = new Model.ResponeData(); + HSSELog.IsVisible = true; + try + { + if (!string.IsNullOrEmpty(HSSELog.HSSELogId)) + { + BLL.HSSELogService.UpdateHSSELog(HSSELog); + responeData.message = "修改成功"; + } + else + { + HSSELog.HSSELogId = SQLHelper.GetNewID(typeof(Model.Manager_HSSELog)); + BLL.HSSELogService.AddHSSELog(HSSELog); + responeData.message = "保存成功"; + } + + } + catch (Exception ex) + { + responeData.code = 0; + responeData.message = ex.Message; + ErrLogInfo.WriteLog(string.Empty, ex); + } + + return responeData; + } + } +} \ No newline at end of file diff --git a/SGGL/WebAPI/WebAPI.csproj b/SGGL/WebAPI/WebAPI.csproj index c8a5f5f8..36935d17 100644 --- a/SGGL/WebAPI/WebAPI.csproj +++ b/SGGL/WebAPI/WebAPI.csproj @@ -181,6 +181,7 @@ +