From b3fba6dc0176618161a74aff9fb2ac72d1590426 Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Tue, 1 Apr 2025 18:01:08 +0800 Subject: [PATCH] 1 --- SGGL/BLL/Common/Const.cs | 260 +++++++++--------- SGGL/BLL/PZHGL/GJSX/GJSXMonitorService.cs | 1 + .../ProjectData/ProjectSetSave.aspx.cs | 34 ++- .../Transfer/PunchlistFrom.aspx.cs | 2 +- .../PublishProfiles/FolderProfile.pubxml.user | 18 +- SGGL/WebAPI/WebAPI.csproj.user | 2 +- 6 files changed, 168 insertions(+), 149 deletions(-) diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 74516b32..ef2e5a0a 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -297,136 +297,6 @@ namespace BLL public const string PostType_5 = "5"; #endregion - #region 内置岗位 - /// - /// HSE工程师岗位Id - /// - public static string WorkPost_HSSEEngineer = "D1115B78-C9E1-43A4-8AB1-FF099CAF7BA4"; - /// - /// 项目安全总监岗位Id - /// - public static string WorkPost_ProjectHSSEDirector = "5e6e259e-ea0a-4a63-8f52-df4a19a6c9fa"; - /// - /// HSE经理岗位Id - /// - public static string WorkPost_SafetyManager = "eac153fd-4cf3-4f5f-984d-022a636d47aa"; - - /// - /// HSE副经理岗位Id - /// - public static string WorkPost_SafetyManagerFu = "46AA7960-1D35-4D5B-8C8F-AA4C874D63C8"; - - /// - /// 无损检测工岗位Id - /// - public static string WorkPost_Checker = "595999E9-75A8-4064-9BD1-9EE02F236297"; - - /// - /// 木工岗位Id - /// - public static string WorkPost_Carpentry = "4ACC633F-BD81-4CBB-9058-A4E4DFFE7881"; - - /// - /// 钢筋工岗位Id - /// - public static string WorkPost_SteelWorker = "E735CF61-096B-4134-B6D4-766B4B8EF790"; - - /// - /// 瓦工岗位Id - /// - public static string WorkPost_Bricklayer = "5E07B570-2E2C-470E-8379-7FEAECF8F62A"; - - /// - /// 混凝土工岗位Id - /// - public static string WorkPost_ConcreteWorker = "14f1fa16-965e-427d-a342-edbb3230ae3c"; - - /// - /// 钳工岗位Id - /// - public static string WorkPost_Fitter1 = "c7431c69-fb64-4960-a9da-2c7b8d380097"; - - /// - /// 钳工岗位Id - /// - public static string WorkPost_Fitter2 = "F49B8430-AC71-40B2-86A3-6825C73F59E5"; - - /// - /// 焊工岗位Id - /// - public static string WorkPost_Welder = "97afac2d-7ffb-49de-bf15-4b49ef24df63"; - - /// - /// 焊工岗位Id - /// - public static string WorkPost_Welder1 = "16c736b6-7ee1-4069-8b57-1a658e6a615f"; - - /// - /// 焊工岗位Id - /// - public static string WorkPost_Welder2 = "36644e8c-0593-4ca7-880f-6a55510c51a1"; - - /// - /// 焊工岗位Id - /// - public static string WorkPost_Welder3 = "5383f797-da4a-4547-b2aa-905a99c1bcfa"; - - /// - /// 焊工岗位Id - /// - public static string WorkPost_Welder4 = "97afac2d-7ffb-49de-bf15-4b49ef24df63"; - - /// - /// 焊工岗位Id - /// - public static string WorkPost_Welder5 = "F8CD2EB0-1D46-422B-A21C-331669B2CF6C"; - - /// - /// 铆工岗位Id - /// - public static string WorkPost_Riveter = "338A8CB9-FB41-4E09-A2BD-ADD27BDBE9DE"; - - /// - /// 管工岗位Id - /// - public static string WorkPost_Foreman = "edc167d9-e2ed-4ed9-8c4d-9c179ff0286f"; - - /// - /// 电工岗位Id - /// - public static string WorkPost_Electrician1 = "29999836-fcdd-43f5-ab6c-77c5e0d6ce0d"; - - /// - /// 电工岗位Id - /// - public static string WorkPost_Electrician2 = "5CBA1BD0-B66B-4362-8CF3-CEA9D3F425DB"; - - /// - /// 电工岗位Id - /// - public static string WorkPost_Electrician3 = "bb71b5f6-d6c6-49d8-83aa-577c6f0808a0"; - - /// - /// 仪表工岗位Id - /// - public static string WorkPost_Instrumentalist = "EFBA9A9A-FF98-47B4-949E-951A8F4E42E5"; - - /// - /// 防腐保温工岗位Id - /// - public static string WorkPost_AnticorrosionWorker = "010CBFD3-51B9-4C48-A6F8-15326D810AA5"; - - /// - /// 普工岗位Id - /// - public static string WorkPost_PGWorker = "D30865B9-A966-441D-84AC-289BCC5A9E4D"; - - /// - /// 其他岗位Id - /// - public static string WorkPost_Other = "71D6437A-6EE4-434A-A68C-BBB2B00FB6C6"; - #endregion - #region 系统环境设置常量 /// /// 月报上报时间 @@ -649,6 +519,136 @@ namespace BLL public const string CarEngineer = "89F8AA0B-77ED-4B17-B697-EFF7259C790B"; #endregion + #region 内置岗位 + /// + /// HSE工程师岗位Id + /// + public static string WorkPost_HSSEEngineer = "D1115B78-C9E1-43A4-8AB1-FF099CAF7BA4"; + /// + /// 项目安全总监岗位Id + /// + public static string WorkPost_ProjectHSSEDirector = "5e6e259e-ea0a-4a63-8f52-df4a19a6c9fa"; + /// + /// HSE经理岗位Id + /// + public static string WorkPost_SafetyManager = "eac153fd-4cf3-4f5f-984d-022a636d47aa"; + + /// + /// HSE副经理岗位Id + /// + public static string WorkPost_SafetyManagerFu = "46AA7960-1D35-4D5B-8C8F-AA4C874D63C8"; + + /// + /// 无损检测工岗位Id + /// + public static string WorkPost_Checker = "595999E9-75A8-4064-9BD1-9EE02F236297"; + + /// + /// 木工岗位Id + /// + public static string WorkPost_Carpentry = "4ACC633F-BD81-4CBB-9058-A4E4DFFE7881"; + + /// + /// 钢筋工岗位Id + /// + public static string WorkPost_SteelWorker = "E735CF61-096B-4134-B6D4-766B4B8EF790"; + + /// + /// 瓦工岗位Id + /// + public static string WorkPost_Bricklayer = "5E07B570-2E2C-470E-8379-7FEAECF8F62A"; + + /// + /// 混凝土工岗位Id + /// + public static string WorkPost_ConcreteWorker = "14f1fa16-965e-427d-a342-edbb3230ae3c"; + + /// + /// 钳工岗位Id + /// + public static string WorkPost_Fitter1 = "c7431c69-fb64-4960-a9da-2c7b8d380097"; + + /// + /// 钳工岗位Id + /// + public static string WorkPost_Fitter2 = "F49B8430-AC71-40B2-86A3-6825C73F59E5"; + + /// + /// 焊工岗位Id + /// + public static string WorkPost_Welder = "97afac2d-7ffb-49de-bf15-4b49ef24df63"; + + /// + /// 焊工岗位Id + /// + public static string WorkPost_Welder1 = "16c736b6-7ee1-4069-8b57-1a658e6a615f"; + + /// + /// 焊工岗位Id + /// + public static string WorkPost_Welder2 = "36644e8c-0593-4ca7-880f-6a55510c51a1"; + + /// + /// 焊工岗位Id + /// + public static string WorkPost_Welder3 = "5383f797-da4a-4547-b2aa-905a99c1bcfa"; + + /// + /// 焊工岗位Id + /// + public static string WorkPost_Welder4 = "97afac2d-7ffb-49de-bf15-4b49ef24df63"; + + /// + /// 焊工岗位Id + /// + public static string WorkPost_Welder5 = "F8CD2EB0-1D46-422B-A21C-331669B2CF6C"; + + /// + /// 铆工岗位Id + /// + public static string WorkPost_Riveter = "338A8CB9-FB41-4E09-A2BD-ADD27BDBE9DE"; + + /// + /// 管工岗位Id + /// + public static string WorkPost_Foreman = "edc167d9-e2ed-4ed9-8c4d-9c179ff0286f"; + + /// + /// 电工岗位Id + /// + public static string WorkPost_Electrician1 = "29999836-fcdd-43f5-ab6c-77c5e0d6ce0d"; + + /// + /// 电工岗位Id + /// + public static string WorkPost_Electrician2 = "5CBA1BD0-B66B-4362-8CF3-CEA9D3F425DB"; + + /// + /// 电工岗位Id + /// + public static string WorkPost_Electrician3 = "bb71b5f6-d6c6-49d8-83aa-577c6f0808a0"; + + /// + /// 仪表工岗位Id + /// + public static string WorkPost_Instrumentalist = "EFBA9A9A-FF98-47B4-949E-951A8F4E42E5"; + + /// + /// 防腐保温工岗位Id + /// + public static string WorkPost_AnticorrosionWorker = "010CBFD3-51B9-4C48-A6F8-15326D810AA5"; + + /// + /// 普工岗位Id + /// + public static string WorkPost_PGWorker = "D30865B9-A966-441D-84AC-289BCC5A9E4D"; + + /// + /// 其他岗位Id + /// + public static string WorkPost_Other = "71D6437A-6EE4-434A-A68C-BBB2B00FB6C6"; + #endregion + #region 报表流程定义 /// /// 编制中 diff --git a/SGGL/BLL/PZHGL/GJSX/GJSXMonitorService.cs b/SGGL/BLL/PZHGL/GJSX/GJSXMonitorService.cs index a3f2afd5..737633b6 100644 --- a/SGGL/BLL/PZHGL/GJSX/GJSXMonitorService.cs +++ b/SGGL/BLL/PZHGL/GJSX/GJSXMonitorService.cs @@ -104,6 +104,7 @@ namespace BLL mail.Subject = $"关键事项超期预警提醒——{projectName}"; //mail.To.Add(user.Email); mail.To.Add("1784803958@qq.com"); + mail.To.Add("fuwei@cwcec.com"); mail.IsBodyHtml = true;//确保邮件正文被当作HTML解析 StringBuilder tbodyStr = new StringBuilder(); diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs index 2059a9b4..c8c47a83 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs @@ -37,13 +37,11 @@ namespace FineUIPro.Web.ProjectData { string curruserId = this.CurrUser.UserId; if (curruserId == Const.sysglyId || curruserId == Const.hfnbdId || curruserId == Const.fuweiId || curruserId == Const.shenyinhangId || curruserId == Const.zhanghuijuanId) - {//只有管理员、JT、付伟、申银行、张慧敏的账号可以新增和维护项目数据 - btnSave.Hidden = false; + {//只有管理员、JT、付伟、申银行、张慧娟的账号可以新增和维护项目数据 this.btnSave.Hidden = false; } else { - btnSave.Hidden = true; this.btnSave.Hidden = true; } @@ -485,7 +483,8 @@ namespace FineUIPro.Web.ProjectData } #endregion - #region 设置项目、施工、安全经理 + #region 设置项目OBS + /// /// 设置项目、施工、安全经理 /// @@ -500,6 +499,8 @@ namespace FineUIPro.Web.ProjectData var project = BLL.ProjectService.GetProjectByProjectId(projectId); if (project != null) { + #region 项目经理 + string OldProjectManager = string.Empty; ////项目经理 var m = Funs.DB.Project_ProjectUser.FirstOrDefault(x => x.ProjectId == projectId && x.RoleId.Contains(BLL.Const.ProjectManager)); if (m != null) @@ -537,7 +538,11 @@ namespace FineUIPro.Web.ProjectData BLL.ProjectUserService.AddProjectUser(newProjectUser); } } - ////施工经理 + + #endregion + + #region 施工经理 + string OldConstructionManager = string.Empty; var c = Funs.DB.Project_ProjectUser.FirstOrDefault(x => x.ProjectId == projectId && x.RoleId.Contains(BLL.Const.ConstructionManager)); if (c != null) @@ -575,7 +580,11 @@ namespace FineUIPro.Web.ProjectData BLL.ProjectUserService.AddProjectUser(newProjectUser); } } - ///安全经理 + + #endregion + + #region 安全经理 + string OldHSSEManager = string.Empty; var h = Funs.DB.Project_ProjectUser.FirstOrDefault(x => x.ProjectId == projectId && x.RoleId.Contains(BLL.Const.HSSEManager)); if (h != null) @@ -614,7 +623,10 @@ namespace FineUIPro.Web.ProjectData } } - ///质量经理 + #endregion + + #region 质量经理 + string OldQAManager = string.Empty; var qa = Funs.DB.Project_ProjectUser.FirstOrDefault(x => x.ProjectId == projectId && x.RoleId.Contains(BLL.Const.QAManager)); if (qa != null) @@ -653,7 +665,10 @@ namespace FineUIPro.Web.ProjectData } } - ///开车经理 + #endregion + + #region 开车经理 + string OldDriveManager = string.Empty; var Drive = Funs.DB.Project_ProjectUser.FirstOrDefault(x => x.ProjectId == projectId && x.RoleId.Contains(BLL.Const.DriveManager)); if (Drive != null) @@ -691,6 +706,9 @@ namespace FineUIPro.Web.ProjectData BLL.ProjectUserService.AddProjectUser(newProjectUser); } } + + #endregion + } } #endregion diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs index f7a8015a..d0964fce 100644 --- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs @@ -537,7 +537,7 @@ namespace FineUIPro.Web.Transfer } try { - newUrl = uploadfilepath.Replace("导出模板", "导出数据").Replace(".xlsx", DateTime.Now.ToString("yyyyMMddHHmmss") + ".xlsx"); + newUrl = uploadfilepath.Replace("DataOut", "DataOut\\PunchlistFrom").Replace("导出模板", "导出数据").Replace(".xlsx", DateTime.Now.ToString("yyyyMMddHHmmss") + ".xlsx"); File.Copy(uploadfilepath, newUrl); NPOI.SS.UserModel.IWorkbook workbook; using (FileStream stream = new FileStream(newUrl, FileMode.Open, FileAccess.Read)) diff --git a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user index 4de4f6e0..1340ca84 100644 --- a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -6,7 +6,7 @@ <_PublishTargetUrl>E:\诺必达合肥\发布\五环WebApi - True|2025-04-01T01:52:56.3095742Z||;True|2025-03-13T16:44:25.3220313+08:00||;True|2025-03-13T15:31:10.3223071+08:00||;True|2025-03-13T10:58:17.1401575+08:00||;True|2025-01-23T23:10:37.9664637+08:00||;True|2024-09-24T09:51:10.8028974+08:00||;True|2024-09-20T17:30:59.6144803+08:00||;True|2024-09-20T15:28:40.2547949+08:00||;True|2024-09-19T16:30:51.3047517+08:00||;True|2024-09-19T15:53:23.2431713+08:00||;True|2024-09-19T15:48:55.0571748+08:00||;True|2024-09-19T15:06:29.5748482+08:00||;True|2024-09-19T14:55:42.1477578+08:00||;True|2024-09-19T10:07:53.8666329+08:00||;True|2024-09-03T16:26:17.4985546+08:00||;True|2024-07-17T10:29:15.9472548+08:00||; + True|2025-04-01T02:53:08.9403414Z||;True|2025-04-01T10:52:08.7646389+08:00||;True|2025-04-01T09:52:56.3095742+08:00||;True|2025-03-13T16:44:25.3220313+08:00||;True|2025-03-13T15:31:10.3223071+08:00||;True|2025-03-13T10:58:17.1401575+08:00||;True|2025-01-23T23:10:37.9664637+08:00||;True|2024-09-24T09:51:10.8028974+08:00||;True|2024-09-20T17:30:59.6144803+08:00||;True|2024-09-20T15:28:40.2547949+08:00||;True|2024-09-19T16:30:51.3047517+08:00||;True|2024-09-19T15:53:23.2431713+08:00||;True|2024-09-19T15:48:55.0571748+08:00||;True|2024-09-19T15:06:29.5748482+08:00||;True|2024-09-19T14:55:42.1477578+08:00||;True|2024-09-19T10:07:53.8666329+08:00||;True|2024-09-03T16:26:17.4985546+08:00||;True|2024-07-17T10:29:15.9472548+08:00||; @@ -86,22 +86,22 @@ 10/28/2024 14:02:50 - 04/01/2025 09:52:53 + 04/01/2025 10:53:07 - 04/01/2025 09:52:53 + 04/01/2025 10:53:07 12/06/2024 20:13:58 - 04/01/2025 09:52:32 + 04/01/2025 10:52:56 12/26/2024 09:46:52 - 04/01/2025 09:52:32 + 04/01/2025 10:52:56 12/18/2020 05:32:28 @@ -389,13 +389,13 @@ 02/09/2013 00:42:28 - 04/01/2025 09:52:35 + 04/01/2025 10:52:57 - 04/01/2025 09:52:35 + 04/01/2025 10:52:57 - 04/01/2025 09:52:35 + 04/01/2025 10:52:57 01/23/2014 21:57:34 @@ -479,7 +479,7 @@ 10/28/2024 14:02:50 - 04/01/2025 09:52:37 + 04/01/2025 10:52:58 10/28/2024 14:02:50 diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user index 285eec39..556827c1 100644 --- a/SGGL/WebAPI/WebAPI.csproj.user +++ b/SGGL/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU true