diff --git a/SGGL/BLL/WebService/CNCECHSSEWebService.cs b/SGGL/BLL/WebService/CNCECHSSEWebService.cs index 51c64369..28f662f9 100644 --- a/SGGL/BLL/WebService/CNCECHSSEWebService.cs +++ b/SGGL/BLL/WebService/CNCECHSSEWebService.cs @@ -3274,6 +3274,7 @@ RectifyName = item.RectifyName, SupRectifyId = item.SupRectifyId, IsEndLever = item.IsEndLever, + RectifyType = "0",//安全 IsBuild = true }; newLists.Add(newList); diff --git a/SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs b/SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs index f84d9943..6c631021 100644 --- a/SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs +++ b/SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs @@ -3112,7 +3112,7 @@ namespace BLL var result = (from x in Funs.DB.Bo_Sheng_Train join p in Funs.DB.Base_Project on x.ProjectId equals p.ProjectId into pGroup from p in pGroup.DefaultIfEmpty() - where BeUnderConstructionList.Contains(p.ProjectId) && (x.TrainType == "入场(厂)培训" || x.TrainType == "入厂(场)级培训") + where BeUnderConstructionList.Contains(p.ProjectId) && (x.TrainType.Contains("入场") || x.TrainType.Contains("入厂")) && (x.DeleteTag == "False" || x.DeleteTag == null) && x.TrainStartDate > Const.DtmarkTime select new Model.EduTrainOutput() { diff --git a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs index b27a313f..4be6d4c5 100644 --- a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs +++ b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs @@ -758,7 +758,7 @@ namespace BLL var result = (from x in Funs.DB.Bo_Sheng_Train join p in Funs.DB.Base_Project on x.ProjectId equals p.ProjectId into pGroup from p in pGroup.DefaultIfEmpty() - where x.ProjectId == projectid && (x.TrainType == "入场(厂)培训" || x.TrainType == "入厂(场)级培训") + where x.ProjectId == projectid && (x.TrainType.Contains("入场") || x.TrainType.Contains("入厂")) && (x.DeleteTag == "False" || x.DeleteTag == null) && x.TrainStartDate > Const.DtmarkTime select x.PersonCount ?? 0).ToList().Sum(); return result; diff --git a/SGGL/FineUIPro.Web/HSSE/Technique/Rectify.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Technique/Rectify.aspx.cs index c14ad3de..d4a3e583 100644 --- a/SGGL/FineUIPro.Web/HSSE/Technique/Rectify.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Technique/Rectify.aspx.cs @@ -557,5 +557,24 @@ namespace FineUIPro.Web.HSSE.Technique } } #endregion + + + /// + /// 从集团获取 + /// + /// + /// + protected void btnGet_Click(object sender, EventArgs e) + { + var returnValue = CNCECHSSEWebService.getTechnique_RectifyList(); + if (returnValue.code == 1) + { + ShowNotify(returnValue.message, MessageBoxIcon.Success); + } + else + { + Alert.ShowInTop(returnValue.message, MessageBoxIcon.Success); + } + } } } \ No newline at end of file diff --git a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user index e7222c67..aeecd72c 100644 --- a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -86,22 +86,22 @@ 10/28/2024 14:02:50 - 07/02/2025 14:39:26 + 07/09/2025 15:26:57 - 07/02/2025 14:39:26 + 07/09/2025 15:26:57 12/06/2024 20:13:58 - 07/02/2025 14:39:06 + 07/09/2025 15:26:37 12/26/2024 09:46:52 - 07/02/2025 14:39:06 + 07/09/2025 15:26:37 12/18/2020 05:32:28 @@ -389,13 +389,13 @@ 02/09/2013 00:42:28 - 07/02/2025 14:39:09 + 07/09/2025 15:26:40 - 07/02/2025 14:39:09 + 07/09/2025 15:26:40 - 07/02/2025 14:39:09 + 07/09/2025 15:26:40 01/23/2014 21:57:34 @@ -479,7 +479,7 @@ 10/28/2024 14:02:50 - 07/02/2025 14:39:10 + 07/09/2025 15:26:42 10/28/2024 14:02:50