From ec40ed835872365f05280fed2072ecd5364c507f Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Fri, 24 Apr 2026 16:45:07 +0800 Subject: [PATCH] 1 --- SGGL/BLL/LoginService.cs | 2 +- SGGL/BLL/PZHGL/ProjectData/ProjectPageDataService.cs | 2 +- SGGL/BLL/ProjectData/ProjectService.cs | 2 -- SGGL/BLL/ProjectData/ProjectUserService.cs | 2 +- SGGL/BLL/ZHGL/DataSync/CQMSDataService.cs | 2 +- SGGL/BLL/ZHGL/DataSync/HJGLData_HJGLService.cs | 2 +- .../ProjectDataSync/Project_HJGLData_DefectService.cs | 6 +++++- .../ProjectDataSync/Project_HSSEData_HSSEService.cs | 4 +++- 8 files changed, 13 insertions(+), 9 deletions(-) diff --git a/SGGL/BLL/LoginService.cs b/SGGL/BLL/LoginService.cs index 74302811..d74d11b5 100644 --- a/SGGL/BLL/LoginService.cs +++ b/SGGL/BLL/LoginService.cs @@ -10,7 +10,7 @@ namespace BLL public static class LoginService { - public static SGGLDB db = Funs.DB; + /// /// 用户登录成功方法 diff --git a/SGGL/BLL/PZHGL/ProjectData/ProjectPageDataService.cs b/SGGL/BLL/PZHGL/ProjectData/ProjectPageDataService.cs index 387a8ebd..acd0655f 100644 --- a/SGGL/BLL/PZHGL/ProjectData/ProjectPageDataService.cs +++ b/SGGL/BLL/PZHGL/ProjectData/ProjectPageDataService.cs @@ -7,7 +7,7 @@ public static class ProjectPageDataService { - public static SGGLDB db = Funs.DB; + /// ///鑾峰彇绉诲姩绔椤 diff --git a/SGGL/BLL/ProjectData/ProjectService.cs b/SGGL/BLL/ProjectData/ProjectService.cs index 0f786e21..0c66a4a4 100644 --- a/SGGL/BLL/ProjectData/ProjectService.cs +++ b/SGGL/BLL/ProjectData/ProjectService.cs @@ -9,8 +9,6 @@ public static class ProjectService { - public static SGGLDB db = Funs.DB; - /// ///鑾峰彇椤圭洰淇℃伅 /// diff --git a/SGGL/BLL/ProjectData/ProjectUserService.cs b/SGGL/BLL/ProjectData/ProjectUserService.cs index e68489a5..43c779ad 100644 --- a/SGGL/BLL/ProjectData/ProjectUserService.cs +++ b/SGGL/BLL/ProjectData/ProjectUserService.cs @@ -7,7 +7,7 @@ public static class ProjectUserService { - //public static SGGLDB db = Funs.DB; + // /// ///鑾峰彇椤圭洰鐢ㄦ埛淇℃伅 diff --git a/SGGL/BLL/ZHGL/DataSync/CQMSDataService.cs b/SGGL/BLL/ZHGL/DataSync/CQMSDataService.cs index 46fc1ce3..38be1cf9 100644 --- a/SGGL/BLL/ZHGL/DataSync/CQMSDataService.cs +++ b/SGGL/BLL/ZHGL/DataSync/CQMSDataService.cs @@ -11,7 +11,7 @@ namespace BLL { public static class CQMSDataService { - //public static SGGLDB db = Funs.DB; + // //public static List BeUnderConstructionList = ProjectService.GetProjectWorkList().Where(x => (x.ProjectAttribute == "GONGCHENG" || x.ProjectAttribute == null)).Select(x => x.ProjectId).ToList(); public static List BeUnderConstructionList = BaseDataService.BeUnderConstructionList; diff --git a/SGGL/BLL/ZHGL/DataSync/HJGLData_HJGLService.cs b/SGGL/BLL/ZHGL/DataSync/HJGLData_HJGLService.cs index 53a4253f..68bbefd9 100644 --- a/SGGL/BLL/ZHGL/DataSync/HJGLData_HJGLService.cs +++ b/SGGL/BLL/ZHGL/DataSync/HJGLData_HJGLService.cs @@ -14,7 +14,7 @@ namespace BLL { public static class HJGLData_HJGLService { - //public static SGGLDB db = Funs.DB; + // public static List BeUnderConstructionList = ProjectService.GetProjectWorkList().Where(x => (x.ProjectAttribute == "GONGCHENG" || x.ProjectAttribute == null)).Select(x => x.ProjectId).ToList(); #region 鑾峰彇鍒楄〃 diff --git a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_DefectService.cs b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_DefectService.cs index bd4e7ba4..a766aeae 100644 --- a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_DefectService.cs +++ b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_DefectService.cs @@ -9,7 +9,7 @@ namespace BLL { public static class Project_HJGLData_DefectService { - public static SGGLDB db = Funs.DB; + #region 鑾峰彇鍒楄〃 @@ -21,6 +21,7 @@ namespace BLL public static List GetProject_HJGLData_DefectByModle(Project_HJGLData_Defect table) { + var db = Funs.DB; var q = from x in db.Project_HJGLData_Defect where (string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) && @@ -64,6 +65,7 @@ namespace BLL public static Project_HJGLData_Defect GetProject_HJGLData_DefectById(string Id) { + var db = Funs.DB; return db.Project_HJGLData_Defect.FirstOrDefault(x => x.Id == Id); } @@ -76,6 +78,7 @@ namespace BLL public static List GetProject_HJGLData_DefectByDate(DateTime? reportDate, string projectid) { + var db = Funs.DB; var q = from x in db.Project_HJGLData_Defect where x.ReportDate.Value.Date.CompareTo(reportDate.Value.Date) == 0 && x.ProjectId == projectid select x; @@ -308,6 +311,7 @@ namespace BLL /// public static void StatisticalData(string projectid) { + var db = Funs.DB; var thisUnitId = string.Empty; var thisUnit = CommonService.GetIsThisUnit(); if (thisUnit != null) thisUnitId = thisUnit.UnitId; diff --git a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs index a4bee192..8a8bcf59 100644 --- a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs +++ b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs @@ -101,7 +101,7 @@ namespace BLL DangerousProject } - public static SGGLDB db = Funs.DB; + /// /// 鏂板瀹炰綋 @@ -245,6 +245,7 @@ namespace BLL /// public static Project_HSSEData_HSSE GetProject_HSSEData_HSSEById(string Id) { + var db = Funs.DB; return db.Project_HSSEData_HSSE.FirstOrDefault(x => x.Id == Id); } @@ -1784,6 +1785,7 @@ namespace BLL public static List GetProject_HSSEData_HSSEByModle(Project_HSSEData_HSSE table) { + var db = Funs.DB; var q = from x in db.Project_HSSEData_HSSE where (string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) &&