diff --git a/SGGL/BLL/BaseInfo/AccidentTypeService.cs b/SGGL/BLL/BaseInfo/AccidentTypeService.cs index 631793d1..90b5860a 100644 --- a/SGGL/BLL/BaseInfo/AccidentTypeService.cs +++ b/SGGL/BLL/BaseInfo/AccidentTypeService.cs @@ -8,7 +8,7 @@ namespace BLL /// public static class AccidentTypeService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取事故类型 diff --git a/SGGL/BLL/BaseInfo/BaseFactoryService.cs b/SGGL/BLL/BaseInfo/BaseFactoryService.cs index eaf7fe17..42df8e71 100644 --- a/SGGL/BLL/BaseInfo/BaseFactoryService.cs +++ b/SGGL/BLL/BaseInfo/BaseFactoryService.cs @@ -11,7 +11,7 @@ namespace BLL public static class Base_FactoryService { - public static Model.SGGLDB db = Funs.DB; + #region 获取列表 @@ -25,6 +25,7 @@ namespace BLL } public static List GetBase_FactoryByModle(Model.Base_Factory table) { + Model.SGGLDB db = Funs.DB; var q = from x in db.Base_Factory where (string.IsNullOrEmpty(table.FactoryId) || x.FactoryId.Contains(table.FactoryId)) && @@ -39,9 +40,8 @@ namespace BLL } public static List GetBase_FactoryList() { - var q = (from x in db.Base_Factory orderby x.FactoryCode select x).ToList(); - - + Model.SGGLDB db = Funs.DB; + var q = (from x in db.Base_Factory orderby x.FactoryCode select x).ToList(); return q; } /// 获取分页列表 @@ -74,10 +74,12 @@ namespace BLL public static Model.Base_Factory GetBase_FactoryById(string FactoryId) { + Model.SGGLDB db = Funs.DB; return db.Base_Factory.FirstOrDefault(x => x.FactoryId == FactoryId); } public static string GetBase_FactoryNameById(object FactoryId) { + Model.SGGLDB db = Funs.DB; string name = string.Empty; if (FactoryId!=null) { @@ -92,11 +94,12 @@ namespace BLL } public static Model.Base_Factory GetBase_FactoryByCode(string FactoryCode) { + Model.SGGLDB db = Funs.DB; return db.Base_Factory.FirstOrDefault(x => x.FactoryCode == FactoryCode); } public static void AddBase_Factory(Model.Base_Factory newtable) { - + Model.SGGLDB db = Funs.DB; Model.Base_Factory table = new Model.Base_Factory { FactoryId = newtable.FactoryId, @@ -112,7 +115,7 @@ namespace BLL public static void AddBulkBase_Factory(List newtables) { - + Model.SGGLDB db = Funs.DB; db.Base_Factory.InsertAllOnSubmit(newtables); db.SubmitChanges(); } @@ -120,7 +123,7 @@ namespace BLL public static void UpdateBase_Factory(Model.Base_Factory newtable) { - + Model.SGGLDB db = Funs.DB; Model.Base_Factory table = db.Base_Factory.FirstOrDefault(x => x.FactoryId == newtable.FactoryId); if (table != null) { @@ -136,7 +139,7 @@ namespace BLL } public static void DeleteBase_FactoryById(string FactoryId) { - + Model.SGGLDB db = Funs.DB; Model.Base_Factory table = db.Base_Factory.FirstOrDefault(x => x.FactoryId == FactoryId); if (table != null) { @@ -148,6 +151,7 @@ namespace BLL public static void DeleteALLBase_Factory() { + Model.SGGLDB db = Funs.DB; if (db.Base_Factory != null) { db.Base_Factory.DeleteAllOnSubmit(db.Base_Factory); diff --git a/SGGL/BLL/BaseInfo/CNProfessionalService.cs b/SGGL/BLL/BaseInfo/CNProfessionalService.cs index ed46a47b..3d9e6c77 100644 --- a/SGGL/BLL/BaseInfo/CNProfessionalService.cs +++ b/SGGL/BLL/BaseInfo/CNProfessionalService.cs @@ -10,7 +10,7 @@ namespace BLL { public class CNProfessionalService { - public static Model.SGGLDB db = Funs.DB; + /// /// 获取实体集合 diff --git a/SGGL/BLL/BaseInfo/CertificateService.cs b/SGGL/BLL/BaseInfo/CertificateService.cs index b0b0c6c9..0c007bbe 100644 --- a/SGGL/BLL/BaseInfo/CertificateService.cs +++ b/SGGL/BLL/BaseInfo/CertificateService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class CertificateService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取特岗证书 diff --git a/SGGL/BLL/BaseInfo/CostTypeService.cs b/SGGL/BLL/BaseInfo/CostTypeService.cs index bb6d8dd2..0025cd6f 100644 --- a/SGGL/BLL/BaseInfo/CostTypeService.cs +++ b/SGGL/BLL/BaseInfo/CostTypeService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class CostTypeService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取费用类型 diff --git a/SGGL/BLL/BaseInfo/DesignProfessionalService.cs b/SGGL/BLL/BaseInfo/DesignProfessionalService.cs index 5f050ecb..d48f6830 100644 --- a/SGGL/BLL/BaseInfo/DesignProfessionalService.cs +++ b/SGGL/BLL/BaseInfo/DesignProfessionalService.cs @@ -10,7 +10,7 @@ namespace BLL { public class DesignProfessionalService { - public static Model.SGGLDB db = Funs.DB; + /// /// 获取实体集合 diff --git a/SGGL/BLL/BaseInfo/DocTypeService.cs b/SGGL/BLL/BaseInfo/DocTypeService.cs index 2362c4e0..bdc41575 100644 --- a/SGGL/BLL/BaseInfo/DocTypeService.cs +++ b/SGGL/BLL/BaseInfo/DocTypeService.cs @@ -1,15 +1,10 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace BLL { public static class DocTypeService { - public static Model.SGGLDB db = Funs.DB; - /// /// 根据主键获取信息 /// diff --git a/SGGL/BLL/BaseInfo/EmergencyTypeService.cs b/SGGL/BLL/BaseInfo/EmergencyTypeService.cs index 00bdc4bd..23e62e50 100644 --- a/SGGL/BLL/BaseInfo/EmergencyTypeService.cs +++ b/SGGL/BLL/BaseInfo/EmergencyTypeService.cs @@ -7,7 +7,7 @@ namespace BLL { public static class EmergencyTypeService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取信息 diff --git a/SGGL/BLL/BaseInfo/GJSXTypeService.cs b/SGGL/BLL/BaseInfo/GJSXTypeService.cs index 3c9edfea..3ee85a86 100644 --- a/SGGL/BLL/BaseInfo/GJSXTypeService.cs +++ b/SGGL/BLL/BaseInfo/GJSXTypeService.cs @@ -5,7 +5,7 @@ namespace BLL { public static class GJSXTypeService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取信息 diff --git a/SGGL/BLL/BaseInfo/HSSEStandardListTypeService.cs b/SGGL/BLL/BaseInfo/HSSEStandardListTypeService.cs index 919e1f57..92a635b2 100644 --- a/SGGL/BLL/BaseInfo/HSSEStandardListTypeService.cs +++ b/SGGL/BLL/BaseInfo/HSSEStandardListTypeService.cs @@ -14,7 +14,7 @@ namespace BLL { public class HSSEStandardListTypeService { - public static Model.SGGLDB db = Funs.DB; + /// /// 获取标准规范类别信息 diff --git a/SGGL/BLL/BaseInfo/InspectionAreaService.cs b/SGGL/BLL/BaseInfo/InspectionAreaService.cs index 15337cc9..ec5af5ee 100644 --- a/SGGL/BLL/BaseInfo/InspectionAreaService.cs +++ b/SGGL/BLL/BaseInfo/InspectionAreaService.cs @@ -12,7 +12,7 @@ namespace BLL /// public static class InspectionAreaService { - public static Model.SGGLDB db = Funs.DB; + /// /// 记录数 @@ -26,7 +26,7 @@ namespace BLL /// /// 定义变量 /// - public static IQueryable qq = from x in db.Base_InspectionArea orderby x.InspectionAreaCode select x; + public static IQueryable qq = from x in Funs.DB.Base_InspectionArea orderby x.InspectionAreaCode select x; /// /// 获取分页列表 diff --git a/SGGL/BLL/BaseInfo/LawsRegulationsTypeService.cs b/SGGL/BLL/BaseInfo/LawsRegulationsTypeService.cs index 7a453454..41dd6206 100644 --- a/SGGL/BLL/BaseInfo/LawsRegulationsTypeService.cs +++ b/SGGL/BLL/BaseInfo/LawsRegulationsTypeService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class LawsRegulationsTypeService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据id获取法律法规类型信息 diff --git a/SGGL/BLL/BaseInfo/LicenseTypeService.cs b/SGGL/BLL/BaseInfo/LicenseTypeService.cs index dfd8d894..682e4280 100644 --- a/SGGL/BLL/BaseInfo/LicenseTypeService.cs +++ b/SGGL/BLL/BaseInfo/LicenseTypeService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class LicenseTypeService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取许可证类型 diff --git a/SGGL/BLL/BaseInfo/ManageRuleTypeService.cs b/SGGL/BLL/BaseInfo/ManageRuleTypeService.cs index 4d0d4646..63471c95 100644 --- a/SGGL/BLL/BaseInfo/ManageRuleTypeService.cs +++ b/SGGL/BLL/BaseInfo/ManageRuleTypeService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class ManageRuleTypeService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取管理规定分类 diff --git a/SGGL/BLL/BaseInfo/PersonManageService.cs b/SGGL/BLL/BaseInfo/PersonManageService.cs index d89acfe8..decb261c 100644 --- a/SGGL/BLL/BaseInfo/PersonManageService.cs +++ b/SGGL/BLL/BaseInfo/PersonManageService.cs @@ -11,7 +11,7 @@ namespace BLL { public class PersonManageService { - public static Model.SGGLDB db = Funs.DB; + /// /// 记录数 @@ -26,7 +26,7 @@ namespace BLL /// /// 定义变量 /// - public static IQueryable qq = from x in db.BS_Welder orderby x.WED_Unit, x.WED_Code select x; + public static IQueryable qq = from x in Funs.DB.BS_Welder orderby x.WED_Unit, x.WED_Code select x; /// /// 获取分页列表 @@ -38,6 +38,7 @@ namespace BLL /// public static IEnumerable getListData(string project, string drpUnitS, string isOnGuard, string txtCodeS, string txtNameS, string txtWorkCodeS, string txtClassS, int startRowIndex, int maximumRows) { + Model.SGGLDB db = Funs.DB; IQueryable q = qq; if (!string.IsNullOrEmpty(project)) { diff --git a/SGGL/BLL/BaseInfo/PictureTypeService.cs b/SGGL/BLL/BaseInfo/PictureTypeService.cs index 3e57ddbe..cb6e6ab4 100644 --- a/SGGL/BLL/BaseInfo/PictureTypeService.cs +++ b/SGGL/BLL/BaseInfo/PictureTypeService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class PictureTypeService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取项目图片分类 diff --git a/SGGL/BLL/BaseInfo/PositionService.cs b/SGGL/BLL/BaseInfo/PositionService.cs index 582f7f78..1410458d 100644 --- a/SGGL/BLL/BaseInfo/PositionService.cs +++ b/SGGL/BLL/BaseInfo/PositionService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class PositionService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取主键 diff --git a/SGGL/BLL/BaseInfo/PostService.cs b/SGGL/BLL/BaseInfo/PostService.cs index 3ac7c552..604449bb 100644 --- a/SGGL/BLL/BaseInfo/PostService.cs +++ b/SGGL/BLL/BaseInfo/PostService.cs @@ -12,7 +12,7 @@ namespace BLL /// public static class PostService { - public static Model.SGGLDB db = Funs.DB; + /// /// 记录数 @@ -32,7 +32,7 @@ namespace BLL /// public static IEnumerable GetListData(string postName, int startRowIndex, int maximumRows) { - IQueryable q = from x in db.Base_Post orderby x.PostName select x; + IQueryable q = from x in Funs.DB.Base_Post orderby x.PostName select x; if (!string.IsNullOrEmpty(postName)) { q = q.Where(e => e.PostName.Contains(postName)); diff --git a/SGGL/BLL/BaseInfo/PostTitleService.cs b/SGGL/BLL/BaseInfo/PostTitleService.cs index fd663c64..f63a7428 100644 --- a/SGGL/BLL/BaseInfo/PostTitleService.cs +++ b/SGGL/BLL/BaseInfo/PostTitleService.cs @@ -7,7 +7,7 @@ namespace BLL { public static class PostTitleService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取信息 diff --git a/SGGL/BLL/BaseInfo/PracticeCertificateService.cs b/SGGL/BLL/BaseInfo/PracticeCertificateService.cs index 19006b15..f8e5d841 100644 --- a/SGGL/BLL/BaseInfo/PracticeCertificateService.cs +++ b/SGGL/BLL/BaseInfo/PracticeCertificateService.cs @@ -8,7 +8,7 @@ namespace BLL { public static class PracticeCertificateService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取执业资格证书 diff --git a/SGGL/BLL/BaseInfo/ProjectTypeService.cs b/SGGL/BLL/BaseInfo/ProjectTypeService.cs index 4518a24b..d91d1f2a 100644 --- a/SGGL/BLL/BaseInfo/ProjectTypeService.cs +++ b/SGGL/BLL/BaseInfo/ProjectTypeService.cs @@ -11,7 +11,7 @@ namespace BLL public static class ProjectTypeService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取信息 diff --git a/SGGL/BLL/BaseInfo/QualityQuestionTypeService.cs b/SGGL/BLL/BaseInfo/QualityQuestionTypeService.cs index 7c09189b..e908d779 100644 --- a/SGGL/BLL/BaseInfo/QualityQuestionTypeService.cs +++ b/SGGL/BLL/BaseInfo/QualityQuestionTypeService.cs @@ -10,7 +10,7 @@ namespace BLL { public class QualityQuestionTypeService { - public static Model.SGGLDB db = Funs.DB; + /// /// 获取实体集合 diff --git a/SGGL/BLL/BaseInfo/QuestionTypeService.cs b/SGGL/BLL/BaseInfo/QuestionTypeService.cs index d12e525e..b4aceb74 100644 --- a/SGGL/BLL/BaseInfo/QuestionTypeService.cs +++ b/SGGL/BLL/BaseInfo/QuestionTypeService.cs @@ -9,7 +9,7 @@ namespace BLL public static class QuestionTypeService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取信息 diff --git a/SGGL/BLL/BaseInfo/RiskLevelService.cs b/SGGL/BLL/BaseInfo/RiskLevelService.cs index 289cfc25..f0bcf0da 100644 --- a/SGGL/BLL/BaseInfo/RiskLevelService.cs +++ b/SGGL/BLL/BaseInfo/RiskLevelService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class RiskLevelService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取许可证类型 diff --git a/SGGL/BLL/BaseInfo/RulesRegulationsTypeService.cs b/SGGL/BLL/BaseInfo/RulesRegulationsTypeService.cs index 45340d5d..57c189f9 100644 --- a/SGGL/BLL/BaseInfo/RulesRegulationsTypeService.cs +++ b/SGGL/BLL/BaseInfo/RulesRegulationsTypeService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class RulesRegulationsTypeService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取规章制度类别 diff --git a/SGGL/BLL/BaseInfo/SafetyMeasuresService.cs b/SGGL/BLL/BaseInfo/SafetyMeasuresService.cs index 72c9da35..ee6a6a59 100644 --- a/SGGL/BLL/BaseInfo/SafetyMeasuresService.cs +++ b/SGGL/BLL/BaseInfo/SafetyMeasuresService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class SafetyMeasuresService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取安全措施 @@ -45,6 +45,7 @@ namespace BLL /// public static void AddSafetyMeasures(Model.Base_SafetyMeasures SafetyMeasures) { + Model.SGGLDB db = Funs.DB; Model.Base_SafetyMeasures newSafetyMeasures = new Model.Base_SafetyMeasures { SafetyMeasuresId = SafetyMeasures.SafetyMeasuresId, diff --git a/SGGL/BLL/BaseInfo/SolutionTempleteTypeService.cs b/SGGL/BLL/BaseInfo/SolutionTempleteTypeService.cs index 32085c5a..32d7c2ac 100644 --- a/SGGL/BLL/BaseInfo/SolutionTempleteTypeService.cs +++ b/SGGL/BLL/BaseInfo/SolutionTempleteTypeService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class SolutionTempleteTypeService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取施工方案模板类型 @@ -28,6 +28,7 @@ namespace BLL /// public static void AddSolutionTempleteType(Model.Base_SolutionTempleteType solutionTempleteType) { + Model.SGGLDB db = Funs.DB; Model.Base_SolutionTempleteType newSolutionTempleteType = new Model.Base_SolutionTempleteType { SolutionTempleteTypeCode = solutionTempleteType.SolutionTempleteTypeCode, @@ -45,6 +46,7 @@ namespace BLL /// public static void UpdateSolutionTempleteType(Model.Base_SolutionTempleteType solutionTempleteType) { + Model.SGGLDB db = Funs.DB; Model.Base_SolutionTempleteType newSolutionTempleteType = db.Base_SolutionTempleteType.FirstOrDefault(e => e.SolutionTempleteTypeCode == solutionTempleteType.SolutionTempleteTypeCode); if (newSolutionTempleteType != null) { @@ -61,6 +63,7 @@ namespace BLL /// public static void DeleteSolutionTempleteTypeById(string solutionTempleteTypeCode) { + Model.SGGLDB db = Funs.DB; var solutionTemplate = db.Base_SolutionTempleteType.FirstOrDefault(e => e.SolutionTempleteTypeCode == solutionTempleteTypeCode); if (solutionTemplate != null) { @@ -75,6 +78,7 @@ namespace BLL /// public static List GetSolutionTempleteType() { + Model.SGGLDB db = Funs.DB; return (from x in db.Base_SolutionTempleteType orderby x.SortIndex select x).ToList(); } /// diff --git a/SGGL/BLL/BaseInfo/SpecialEquipmentService.cs b/SGGL/BLL/BaseInfo/SpecialEquipmentService.cs index 91351bc1..f64b8ca2 100644 --- a/SGGL/BLL/BaseInfo/SpecialEquipmentService.cs +++ b/SGGL/BLL/BaseInfo/SpecialEquipmentService.cs @@ -9,7 +9,7 @@ namespace BLL /// public static class SpecialEquipmentService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取机具设备 diff --git a/SGGL/BLL/BaseInfo/SpecialSchemeTypeService.cs b/SGGL/BLL/BaseInfo/SpecialSchemeTypeService.cs index 3c40f54c..968d1bc6 100644 --- a/SGGL/BLL/BaseInfo/SpecialSchemeTypeService.cs +++ b/SGGL/BLL/BaseInfo/SpecialSchemeTypeService.cs @@ -7,7 +7,7 @@ namespace BLL { public static class SpecialSchemeTypeService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取信息 diff --git a/SGGL/BLL/BaseInfo/SteelService.cs b/SGGL/BLL/BaseInfo/SteelService.cs index c9bfdfda..7aafbe3b 100644 --- a/SGGL/BLL/BaseInfo/SteelService.cs +++ b/SGGL/BLL/BaseInfo/SteelService.cs @@ -9,7 +9,7 @@ namespace BLL { public static class SteelService { - public static Model.SGGLDB db = Funs.DB; + /// /// 记录数 @@ -23,7 +23,7 @@ namespace BLL /// /// 定义变量 /// - private static IQueryable qq = from x in db.BS_Steel orderby x.STE_Code select x; + private static IQueryable qq = from x in Funs.DB.BS_Steel orderby x.STE_Code select x; /// /// 获取材质列表 diff --git a/SGGL/BLL/BaseInfo/TrainLevelService.cs b/SGGL/BLL/BaseInfo/TrainLevelService.cs index fbaf5b6b..93a19f6f 100644 --- a/SGGL/BLL/BaseInfo/TrainLevelService.cs +++ b/SGGL/BLL/BaseInfo/TrainLevelService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class TrainLevelService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取主键 diff --git a/SGGL/BLL/BaseInfo/TrainTypeService.cs b/SGGL/BLL/BaseInfo/TrainTypeService.cs index a7b72b8b..93d352ab 100644 --- a/SGGL/BLL/BaseInfo/TrainTypeService.cs +++ b/SGGL/BLL/BaseInfo/TrainTypeService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class TrainTypeService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取培训类型 diff --git a/SGGL/BLL/BaseInfo/TransferMajorService.cs b/SGGL/BLL/BaseInfo/TransferMajorService.cs index 2099310b..8397239e 100644 --- a/SGGL/BLL/BaseInfo/TransferMajorService.cs +++ b/SGGL/BLL/BaseInfo/TransferMajorService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class TransferMajorService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取移交专业 diff --git a/SGGL/BLL/BaseInfo/UnitTypeService.cs b/SGGL/BLL/BaseInfo/UnitTypeService.cs index 677efc4a..8a4cdb4e 100644 --- a/SGGL/BLL/BaseInfo/UnitTypeService.cs +++ b/SGGL/BLL/BaseInfo/UnitTypeService.cs @@ -8,7 +8,7 @@ namespace BLL public static class UnitTypeService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取信息 diff --git a/SGGL/BLL/BaseInfo/WorkStageService.cs b/SGGL/BLL/BaseInfo/WorkStageService.cs index cce824db..8acdb1c6 100644 --- a/SGGL/BLL/BaseInfo/WorkStageService.cs +++ b/SGGL/BLL/BaseInfo/WorkStageService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class WorkStageService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取工作阶段 @@ -38,7 +38,7 @@ namespace BLL /// public static List GetWorkStageList() { - return (from x in db.Base_WorkStage orderby x.WorkStageCode select x).ToList(); + return (from x in Funs.DB.Base_WorkStage orderby x.WorkStageCode select x).ToList(); } /// @@ -47,6 +47,7 @@ namespace BLL /// public static void AddWorkStage(Model.Base_WorkStage workStage) { + Model.SGGLDB db = Funs.DB; Model.Base_WorkStage newWorkStage = new Model.Base_WorkStage { WorkStageId = workStage.WorkStageId, @@ -64,6 +65,7 @@ namespace BLL /// public static void UpdateWorkStage(Model.Base_WorkStage workStage) { + Model.SGGLDB db = Funs.DB; Model.Base_WorkStage newWorkStage = db.Base_WorkStage.FirstOrDefault(e => e.WorkStageId == workStage.WorkStageId); if (newWorkStage != null) { @@ -80,6 +82,7 @@ namespace BLL /// public static void DeleteWorkStageById(string workStageId) { + Model.SGGLDB db = Funs.DB; Model.Base_WorkStage workStage = db.Base_WorkStage.FirstOrDefault(e => e.WorkStageId == workStageId); if (workStage != null) { diff --git a/SGGL/BLL/BoSheng/BOSHENGService.cs b/SGGL/BLL/BoSheng/BOSHENGService.cs index c782cfe5..5913b952 100644 --- a/SGGL/BLL/BoSheng/BOSHENGService.cs +++ b/SGGL/BLL/BoSheng/BOSHENGService.cs @@ -8,7 +8,7 @@ namespace BLL { public static class BOSHENGService { - public static Model.SGGLDB db = Funs.DB; + #region 获取单位列表 /// @@ -23,7 +23,7 @@ namespace BLL /// /// 定义变量 /// - private static IQueryable getUnits = from x in db.Bo_Sheng_Unit + private static IQueryable getUnits = from x in Funs.DB.Bo_Sheng_Unit where (x.DeleteTag == "False" || x.DeleteTag == null) select x; @@ -91,7 +91,7 @@ namespace BLL /// /// 定义变量 /// - private static IQueryable getPersons = from x in db.Bo_Sheng_Person + private static IQueryable getPersons = from x in Funs.DB.Bo_Sheng_Person where (x.DeleteTag == "False" || x.DeleteTag == null) select x; @@ -201,7 +201,7 @@ namespace BLL /// /// 定义变量 /// - private static IQueryable getTrains = from x in db.Bo_Sheng_Train + private static IQueryable getTrains = from x in Funs.DB.Bo_Sheng_Train where (x.DeleteTag == "False" || x.DeleteTag == null) select x; @@ -283,7 +283,7 @@ namespace BLL /// /// 定义变量 /// - private static IQueryable getTrainPersons = from x in db.Bo_Sheng_TrainPerson + private static IQueryable getTrainPersons = from x in Funs.DB.Bo_Sheng_TrainPerson where (x.DeleteTag == "False" || x.DeleteTag == null) select x; @@ -371,7 +371,7 @@ namespace BLL /// /// 定义变量 /// - private static IQueryable getExams = from x in db.Bo_Sheng_Exam + private static IQueryable getExams = from x in Funs.DB.Bo_Sheng_Exam where (x.DeleteTag == "False" || x.DeleteTag == null) select x; @@ -441,7 +441,7 @@ namespace BLL /// /// 定义变量 /// - private static IQueryable getPersonTrainRecords = from x in db.Bo_Sheng_PersonTrainRecord + private static IQueryable getPersonTrainRecords = from x in Funs.DB.Bo_Sheng_PersonTrainRecord where (x.DeleteTag == "False" || x.DeleteTag == null) select x; diff --git a/SGGL/BLL/CQMS/Check/CheckControlApproveService.cs b/SGGL/BLL/CQMS/Check/CheckControlApproveService.cs index 11ff07a6..c1111f89 100644 --- a/SGGL/BLL/CQMS/Check/CheckControlApproveService.cs +++ b/SGGL/BLL/CQMS/Check/CheckControlApproveService.cs @@ -10,7 +10,7 @@ namespace BLL { public class CheckControlApproveService { - public static Model.SGGLDB db = Funs.DB; + /// /// 获取质量巡检模板列表 /// @@ -19,6 +19,7 @@ namespace BLL /// public static DataTable getListData(string CheckControlCode) { + Model.SGGLDB db = Funs.DB; var res = from x in db.Check_CheckControlApprove where x.CheckControlCode == CheckControlCode && x.ApproveDate != null && x.ApproveType != "S" orderby x.ApproveDate @@ -80,6 +81,7 @@ namespace BLL /// public static Model.Check_CheckControlApprove GetSee(string CheckControlCode, string userId) { + Model.SGGLDB db = Funs.DB; return db.Check_CheckControlApprove.FirstOrDefault(x => x.CheckControlCode == CheckControlCode && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null); } public static void See(string CheckControlCode, string userId) @@ -101,6 +103,7 @@ namespace BLL /// 一个质量巡检审批实体 public static Model.Check_CheckControlApprove GetCheckControlApproveByCheckControlId(string CheckControlCode) { + Model.SGGLDB db = Funs.DB; return db.Check_CheckControlApprove.FirstOrDefault(x => x.CheckControlCode == CheckControlCode && x.ApproveType != "S" && x.ApproveDate == null); } /// @@ -166,6 +169,7 @@ namespace BLL /// public static Model.Check_CheckControlApprove GetAudit1(string CheckControlCode) { + Model.SGGLDB db = Funs.DB; return db.Check_CheckControlApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.CheckControlCode == CheckControlCode && x.ApproveType == BLL.Const.CheckControl_Audit1); } @@ -176,6 +180,7 @@ namespace BLL /// public static Model.Check_CheckControlApprove GetAudit2(string CheckControlCode) { + Model.SGGLDB db = Funs.DB; return db.Check_CheckControlApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.CheckControlCode == CheckControlCode && x.ApproveType == BLL.Const.CheckControl_Audit2); } @@ -186,6 +191,7 @@ namespace BLL /// public static Model.Check_CheckControlApprove GetAudit3(string CheckControlCode) { + Model.SGGLDB db = Funs.DB; return db.Check_CheckControlApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.CheckControlCode == CheckControlCode && x.ApproveType == BLL.Const.CheckControl_Audit3); } @@ -196,6 +202,7 @@ namespace BLL /// public static Model.Check_CheckControlApprove GetAudit4(string CheckControlCode) { + Model.SGGLDB db = Funs.DB; return db.Check_CheckControlApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.CheckControlCode == CheckControlCode && x.ApproveType == BLL.Const.CheckControl_Audit4); } @@ -206,11 +213,13 @@ namespace BLL /// public static Model.Check_CheckControlApprove GetAudit5(string CheckControlCode) { + Model.SGGLDB db = Funs.DB; return db.Check_CheckControlApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.CheckControlCode == CheckControlCode && x.ApproveType == BLL.Const.CheckControl_Audit5); } public static Model.Check_CheckControlApprove GetComplie(string CheckControlCode) { + Model.SGGLDB db = Funs.DB; return db.Check_CheckControlApprove.FirstOrDefault(x => x.CheckControlCode == CheckControlCode && x.ApproveType == BLL.Const.CheckControl_Compile); } public static List GetListDataByCodeForApi(string code) diff --git a/SGGL/BLL/CQMS/Check/CheckControlService.cs b/SGGL/BLL/CQMS/Check/CheckControlService.cs index d27a69b2..f3d3ea28 100644 --- a/SGGL/BLL/CQMS/Check/CheckControlService.cs +++ b/SGGL/BLL/CQMS/Check/CheckControlService.cs @@ -12,7 +12,7 @@ namespace BLL { public class CheckControlService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据质量检查与控制Id删除一个质量检查与控制信息 /// diff --git a/SGGL/BLL/CQMS/Check/CheckEquipmentApproveService.cs b/SGGL/BLL/CQMS/Check/CheckEquipmentApproveService.cs index 32a5fd3a..68e2c7ad 100644 --- a/SGGL/BLL/CQMS/Check/CheckEquipmentApproveService.cs +++ b/SGGL/BLL/CQMS/Check/CheckEquipmentApproveService.cs @@ -9,7 +9,7 @@ namespace BLL { public class CheckEquipmentApproveService { - public static Model.SGGLDB db = Funs.DB; + /// /// 获取设计变更模板列表 @@ -19,6 +19,7 @@ namespace BLL /// public static IEnumerable getListData(string CheckEquipmentId) { + Model.SGGLDB db = Funs.DB; return from x in db.Check_CheckEquipmentApprove where x.CheckEquipmentId == CheckEquipmentId && x.ApproveDate != null orderby x.ApproveDate @@ -41,7 +42,7 @@ namespace BLL /// 一个设计变更审批实体 public static Model.Check_CheckEquipmentApprove GetCheckEquipmentApproveByCheckEquipmentId(string CheckEquipmentId) { - return db.Check_CheckEquipmentApprove.FirstOrDefault(x => x.CheckEquipmentId == CheckEquipmentId && x.ApproveDate == null); + return Funs.DB.Check_CheckEquipmentApprove.FirstOrDefault(x => x.CheckEquipmentId == CheckEquipmentId && x.ApproveDate == null); } /// @@ -51,17 +52,17 @@ namespace BLL /// 一个设计变更审批实体 public static Model.Check_CheckEquipmentApprove GetCheckEquipmentApproveByApproveId(string approveId) { - return db.Check_CheckEquipmentApprove.FirstOrDefault(x => x.CheckEquipmentApproveId == approveId); + return Funs.DB.Check_CheckEquipmentApprove.FirstOrDefault(x => x.CheckEquipmentApproveId == approveId); } public static Model.Check_CheckEquipmentApprove GetComplie(string CheckEquipmentId) { - return db.Check_CheckEquipmentApprove.FirstOrDefault(x => x.CheckEquipmentId == CheckEquipmentId && x.ApproveType == BLL.Const.CheckEquipment_Compile); + return Funs.DB.Check_CheckEquipmentApprove.FirstOrDefault(x => x.CheckEquipmentId == CheckEquipmentId && x.ApproveType == BLL.Const.CheckEquipment_Compile); } public static Model.Check_CheckEquipmentApprove GetApprove(string CheckEquipmentId) { - return db.Check_CheckEquipmentApprove.FirstOrDefault(x => x.CheckEquipmentId == CheckEquipmentId && x.ApproveType == BLL.Const.CheckEquipment_Approve); + return Funs.DB.Check_CheckEquipmentApprove.FirstOrDefault(x => x.CheckEquipmentId == CheckEquipmentId && x.ApproveType == BLL.Const.CheckEquipment_Approve); } /// @@ -71,7 +72,7 @@ namespace BLL /// 设计变更审批集合 public static List GetCheckEquipmentApprovesByCheckEquipmentId(string CheckEquipmentId) { - return (from x in db.Check_CheckEquipmentApprove where x.CheckEquipmentId == CheckEquipmentId select x).ToList(); + return (from x in Funs.DB.Check_CheckEquipmentApprove where x.CheckEquipmentId == CheckEquipmentId select x).ToList(); } /// @@ -190,6 +191,7 @@ namespace BLL } public static List getListDataByEid(string CheckEquipmentId) { + Model.SGGLDB db = Funs.DB; var q = from x in db.Check_CheckEquipmentApprove where x.CheckEquipmentId == CheckEquipmentId && x.ApproveDate != null && x.ApproveType != "S" orderby x.ApproveDate diff --git a/SGGL/BLL/CQMS/Check/CheckEquipmentService.cs b/SGGL/BLL/CQMS/Check/CheckEquipmentService.cs index 36e9fe45..7c53b642 100644 --- a/SGGL/BLL/CQMS/Check/CheckEquipmentService.cs +++ b/SGGL/BLL/CQMS/Check/CheckEquipmentService.cs @@ -10,7 +10,7 @@ namespace BLL { public class CheckEquipmentService { - public static Model.SGGLDB db = Funs.DB; + /// /// 记录数 @@ -24,7 +24,7 @@ namespace BLL /// /// 定义变量 /// - private static IQueryable qq = from x in db.Check_CheckEquipment orderby x.CompileDate descending select x; + private static IQueryable qq = from x in Funs.DB.Check_CheckEquipment orderby x.CompileDate descending select x; /// /// 获取分页列表 @@ -34,6 +34,7 @@ namespace BLL /// public static IEnumerable getListData(string projectId, string userId, string roleId, int startRowIndex, int maximumRows) { + Model.SGGLDB db = Funs.DB; IQueryable q = qq; if (!string.IsNullOrEmpty(projectId)) { diff --git a/SGGL/BLL/CQMS/Check/CheckMonthService.cs b/SGGL/BLL/CQMS/Check/CheckMonthService.cs index a4efdc3f..589c057c 100644 --- a/SGGL/BLL/CQMS/Check/CheckMonthService.cs +++ b/SGGL/BLL/CQMS/Check/CheckMonthService.cs @@ -9,7 +9,7 @@ namespace BLL { public class CheckMonthService { - public static Model.SGGLDB db = Funs.DB; + /// /// 记录数 @@ -23,7 +23,7 @@ namespace BLL /// /// 定义变量 /// - public static IQueryable qq = from x in db.Check_CheckMonth orderby x.Months descending select x; + public static IQueryable qq = from x in Funs.DB.Check_CheckMonth orderby x.Months descending select x; /// /// 获取分页列表 @@ -35,6 +35,7 @@ namespace BLL /// public static IEnumerable GetListData(string projectId, int startRowIndex, int maximumRows) { + Model.SGGLDB db = Funs.DB; IQueryable q = qq; if (!string.IsNullOrEmpty(projectId)) { diff --git a/SGGL/BLL/CQMS/Check/DesignApproveService.cs b/SGGL/BLL/CQMS/Check/DesignApproveService.cs index fa1ceb79..a1deb003 100644 --- a/SGGL/BLL/CQMS/Check/DesignApproveService.cs +++ b/SGGL/BLL/CQMS/Check/DesignApproveService.cs @@ -9,7 +9,7 @@ namespace BLL { public class DesignApproveService { - public static Model.SGGLDB db = Funs.DB; + /// /// 获取设计变更模板列表 @@ -19,6 +19,7 @@ namespace BLL /// public static IEnumerable getListData(string DesignId) { + Model.SGGLDB db = Funs.DB; return from x in db.Check_DesignApprove where x.DesignId == DesignId && x.ApproveDate != null orderby x.ApproveDate @@ -41,7 +42,7 @@ namespace BLL /// 一个设计变更审批实体 public static Model.Check_DesignApprove GetDesignApproveByDesignId(string DesignId) { - return db.Check_DesignApprove.FirstOrDefault(x => x.DesignId == DesignId && x.ApproveDate == null); + return Funs.DB.Check_DesignApprove.FirstOrDefault(x => x.DesignId == DesignId && x.ApproveDate == null); } /// @@ -51,22 +52,22 @@ namespace BLL /// 一个设计变更审批实体 public static Model.Check_DesignApprove GetDesignApproveByApproveId(string approveId) { - return db.Check_DesignApprove.FirstOrDefault(x => x.DesignApproveId == approveId); + return Funs.DB.Check_DesignApprove.FirstOrDefault(x => x.DesignApproveId == approveId); } public static Model.Check_DesignApprove GetComplie(string DesignId) { - return db.Check_DesignApprove.FirstOrDefault(x => x.DesignId == DesignId && x.ApproveType == BLL.Const.Design_Compile); + return Funs.DB.Check_DesignApprove.FirstOrDefault(x => x.DesignId == DesignId && x.ApproveType == BLL.Const.Design_Compile); } public static Model.Check_DesignApprove GetAuditMan(string DesignId, string state) { - return db.Check_DesignApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.DesignId == DesignId && x.ApproveType == state); + return Funs.DB.Check_DesignApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.DesignId == DesignId && x.ApproveType == state); } public static Model.Check_DesignApprove GetAudit2(string DesignId) { - return db.Check_DesignApprove.FirstOrDefault(x => x.DesignId == DesignId && x.ApproveType == BLL.Const.Design_Audit2); + return Funs.DB.Check_DesignApprove.FirstOrDefault(x => x.DesignId == DesignId && x.ApproveType == BLL.Const.Design_Audit2); } /// @@ -76,7 +77,7 @@ namespace BLL /// 设计变更审批集合 public static List GetDesignApprovesByDesignId(string DesignId) { - return (from x in db.Check_DesignApprove where x.DesignId == DesignId select x).ToList(); + return (from x in Funs.DB.Check_DesignApprove where x.DesignId == DesignId select x).ToList(); } /// diff --git a/SGGL/BLL/CQMS/Check/DesignService.cs b/SGGL/BLL/CQMS/Check/DesignService.cs index 79ecb8be..a14ea9a0 100644 --- a/SGGL/BLL/CQMS/Check/DesignService.cs +++ b/SGGL/BLL/CQMS/Check/DesignService.cs @@ -11,7 +11,7 @@ namespace BLL { public class DesignService { - public static Model.SGGLDB db = Funs.DB; + /// /// 记录数 @@ -25,7 +25,7 @@ namespace BLL /// /// 定义变量 /// - private static IQueryable qq = from x in db.Check_Design orderby x.DesignDate descending select x; + private static IQueryable qq = from x in Funs.DB.Check_Design orderby x.DesignDate descending select x; public static string CovBool(bool? b) diff --git a/SGGL/BLL/CQMS/Check/FileCabinetService.cs b/SGGL/BLL/CQMS/Check/FileCabinetService.cs index 3367e4f0..e1e074da 100644 --- a/SGGL/BLL/CQMS/Check/FileCabinetService.cs +++ b/SGGL/BLL/CQMS/Check/FileCabinetService.cs @@ -9,13 +9,15 @@ namespace BLL { public class FileCabinetService { - public static Model.SGGLDB db = Funs.DB; + /// /// 增加信息 /// /// 实体 public static void AddFileCabinet(Model.Project_FileCabinet addFileCabinet) { + Model.SGGLDB db = Funs.DB; + Model.Project_FileCabinet newFileCabinet = new Model.Project_FileCabinet { FileCabinetId = addFileCabinet.FileCabinetId, @@ -59,7 +61,7 @@ namespace BLL /// public static Model.Project_FileCabinet getInfo(string fileCabinetId) { - return db.Project_FileCabinet.FirstOrDefault(e => e.FileCabinetId == fileCabinetId); + return Funs.DB.Project_FileCabinet.FirstOrDefault(e => e.FileCabinetId == fileCabinetId); } /// /// 获取重要文件 @@ -108,7 +110,8 @@ namespace BLL /// 实体 public static void UpdateFileCabinet(Model.Project_FileCabinet updateFileCabinet) { - Model.Project_FileCabinet getFileCabinet = db.Project_FileCabinet.FirstOrDefault(e => e.FileCabinetId == updateFileCabinet.FileCabinetId); + Model.SGGLDB db = Funs.DB; + Model.Project_FileCabinet getFileCabinet = Funs.DB.Project_FileCabinet.FirstOrDefault(e => e.FileCabinetId == updateFileCabinet.FileCabinetId); if (getFileCabinet != null) { getFileCabinet.FileCode = updateFileCabinet.FileCode; diff --git a/SGGL/BLL/CQMS/Check/JointCheckApproveService.cs b/SGGL/BLL/CQMS/Check/JointCheckApproveService.cs index 2df2b724..5d256b6d 100644 --- a/SGGL/BLL/CQMS/Check/JointCheckApproveService.cs +++ b/SGGL/BLL/CQMS/Check/JointCheckApproveService.cs @@ -9,7 +9,7 @@ namespace BLL { public class JointCheckApproveService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据质量共检编号删除对应的所有质量共检审批信息 /// @@ -29,6 +29,7 @@ namespace BLL /// public static IEnumerable getListData(string JointCheckId) { + Model.SGGLDB db = Funs.DB; var approves = (from x in Funs.DB.Check_JointCheckApprove where x.JointCheckId == JointCheckId && x.ApproveDate != null && x.ApproveType != "S" orderby x.ApproveDate select x).ToList(); var approves2 = (from x in Funs.DB.Check_JointCheckApprove where x.JointCheckId == JointCheckId && x.ApproveDate != null && x.ApproveType != "S" orderby x.ApproveDate select x).ToList(); string approveType = string.Empty; @@ -73,6 +74,7 @@ namespace BLL /// public static IEnumerable listData(string JointCheckId) { + Model.SGGLDB db = Funs.DB; var approves = (from x in Funs.DB.Check_JointCheckApprove where x.JointCheckId == JointCheckId && x.ApproveDate != null && x.ApproveType != "S" orderby x.ApproveDate select x).ToList(); var approves2 = (from x in Funs.DB.Check_JointCheckApprove where x.JointCheckId == JointCheckId && x.ApproveDate != null && x.ApproveType != "S" orderby x.ApproveDate select x).ToList(); string approveType = string.Empty; @@ -178,6 +180,7 @@ namespace BLL } public static Model.Check_JointCheckApprove GetSee(string JointCheckId, string userId) { + Model.SGGLDB db = Funs.DB; return db.Check_JointCheckApprove.FirstOrDefault(x => x.JointCheckId == JointCheckId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null); } public static void See(string JointCheckId, string userId) @@ -229,6 +232,7 @@ namespace BLL /// public static Model.Check_JointCheckApprove GetAudit1(string JointCheckId, string jointCheckDetailId) { + Model.SGGLDB db = Funs.DB; return db.Check_JointCheckApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.JointCheckId == JointCheckId && x.ApproveType == BLL.Const.JointCheck_Audit1 && x.JointCheckDetailId == jointCheckDetailId); } @@ -239,6 +243,7 @@ namespace BLL /// public static Model.Check_JointCheckApprove GetAudit2(string JointCheckId, string jointCheckDetailId) { + Model.SGGLDB db = Funs.DB; return db.Check_JointCheckApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.JointCheckId == JointCheckId && x.ApproveType == BLL.Const.JointCheck_Audit2 && x.JointCheckDetailId == jointCheckDetailId); } @@ -249,6 +254,7 @@ namespace BLL /// public static Model.Check_JointCheckApprove GetAudit3(string JointCheckId, string jointCheckDetailId) { + Model.SGGLDB db = Funs.DB; return db.Check_JointCheckApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.JointCheckId == JointCheckId && x.ApproveType == BLL.Const.JointCheck_Audit3 && x.JointCheckDetailId == jointCheckDetailId); } @@ -259,6 +265,7 @@ namespace BLL /// public static Model.Check_JointCheckApprove GetAudit4(string JointCheckId, string jointCheckDetailId) { + Model.SGGLDB db = Funs.DB; return db.Check_JointCheckApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.JointCheckId == JointCheckId && x.ApproveType == BLL.Const.JointCheck_Audit4 && x.JointCheckDetailId == jointCheckDetailId); } public static List getListDataByJcidForApi(string JointCheckId, string JointCheckDetailId) diff --git a/SGGL/BLL/CQMS/Check/MonthSpotCheckDetailService.cs b/SGGL/BLL/CQMS/Check/MonthSpotCheckDetailService.cs index d4cfe13e..ab4117c2 100644 --- a/SGGL/BLL/CQMS/Check/MonthSpotCheckDetailService.cs +++ b/SGGL/BLL/CQMS/Check/MonthSpotCheckDetailService.cs @@ -8,7 +8,7 @@ namespace BLL { public class MonthSpotCheckDetailService { - public static Model.SGGLDB db = Funs.DB; + /// /// 获取月报质量验收情况模板列表 @@ -18,6 +18,7 @@ namespace BLL /// public static IEnumerable getListData(string CheckMonthId) { + Model.SGGLDB db = Funs.DB; return from x in db.Check_MonthSpotCheckDetail where x.CheckMonthId == CheckMonthId select new diff --git a/SGGL/BLL/CQMS/Check/SpecialEquipmentDetailService.cs b/SGGL/BLL/CQMS/Check/SpecialEquipmentDetailService.cs index 228559ca..b6e4233b 100644 --- a/SGGL/BLL/CQMS/Check/SpecialEquipmentDetailService.cs +++ b/SGGL/BLL/CQMS/Check/SpecialEquipmentDetailService.cs @@ -9,7 +9,7 @@ namespace BLL { public class SpecialEquipmentDetailService { - public static Model.SGGLDB db = Funs.DB; + /// /// 获取月报特种设备信息模板列表 @@ -19,6 +19,7 @@ namespace BLL /// public static IEnumerable getListData(string CheckMonthId) { + Model.SGGLDB db = Funs.DB; return from x in db.Check_SpecialEquipmentDetail where x.CheckMonthId == CheckMonthId select new diff --git a/SGGL/BLL/CQMS/Check/SpotCheckApproveService.cs b/SGGL/BLL/CQMS/Check/SpotCheckApproveService.cs index 4c503810..3865e4c6 100644 --- a/SGGL/BLL/CQMS/Check/SpotCheckApproveService.cs +++ b/SGGL/BLL/CQMS/Check/SpotCheckApproveService.cs @@ -8,7 +8,7 @@ namespace BLL { public class SpotCheckApproveService { - public static Model.SGGLDB db = Funs.DB; + public static Model.Check_SpotCheckApprove GetSpotApproveBySpotCheckDetailId(string spotCheckDetailId) { @@ -35,6 +35,7 @@ namespace BLL /// public static IEnumerable getListData(string SpotCheckCode) { + Model.SGGLDB db = Funs.DB; return from x in db.Check_SpotCheckApprove where x.SpotCheckCode == SpotCheckCode && x.ApproveDate != null && x.ApproveType != "S" && x.Sign == "1" orderby x.ApproveDate @@ -58,6 +59,7 @@ namespace BLL /// public static IEnumerable getList(string SpotCheckCode) { + Model.SGGLDB db = Funs.DB; return from x in db.Check_SpotCheckApprove where x.SpotCheckCode == SpotCheckCode && x.ApproveDate != null && x.ApproveType != "S" && x.Sign == "2" orderby x.ApproveDate @@ -80,6 +82,7 @@ namespace BLL /// 一个实体验收审批实体 public static Model.Check_SpotCheckApprove GetSpotCheckApproveBySpotCheckCode(string SpotCheckCode) { + Model.SGGLDB db = Funs.DB; return db.Check_SpotCheckApprove.FirstOrDefault(x => x.SpotCheckCode == SpotCheckCode && x.ApproveDate == null && x.Sign == "1" && x.ApproveType != "S"); } @@ -90,11 +93,13 @@ namespace BLL /// 一个实体验收审批实体 public static Model.Check_SpotCheckApprove GetSpotCheckApproveByApproveId(string approveId) { + Model.SGGLDB db = Funs.DB; return db.Check_SpotCheckApprove.FirstOrDefault(x => x.SpotCheckApproveId == approveId); } public static Model.Check_SpotCheckApprove GetComplie(string SpotCheckCode) { + Model.SGGLDB db = Funs.DB; return db.Check_SpotCheckApprove.FirstOrDefault(x => x.SpotCheckCode == SpotCheckCode && x.ApproveType == BLL.Const.SpotCheck_Compile); } public static Model.Check_SpotCheckApprove GetComplieForApi(string SpotCheckCode) @@ -107,6 +112,7 @@ namespace BLL public static Model.Check_SpotCheckApprove GetSee(string SpotCheckCode, string userId) { + Model.SGGLDB db = Funs.DB; return db.Check_SpotCheckApprove.FirstOrDefault(x => x.SpotCheckCode == SpotCheckCode && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null); } public static void See(string SpotCheckCode, string userId) @@ -123,11 +129,13 @@ namespace BLL } public static Model.Check_SpotCheckApprove GetAudit2(string SpotCheckCode) { + Model.SGGLDB db = Funs.DB; return db.Check_SpotCheckApprove.FirstOrDefault(x => x.SpotCheckCode == SpotCheckCode && x.ApproveType == BLL.Const.SpotCheck_Audit2); } public static Model.Check_SpotCheckApprove GetReCompile(string SpotCheckCode) { + Model.SGGLDB db = Funs.DB; return db.Check_SpotCheckApprove.FirstOrDefault(x => x.SpotCheckCode == SpotCheckCode && x.ApproveType == BLL.Const.SpotCheck_ReCompile); } @@ -138,6 +146,7 @@ namespace BLL /// 实体验收审批集合 public static List GetSpotCheckApprovesBySpotCheckCode(string SpotCheckCode) { + Model.SGGLDB db = Funs.DB; return (from x in db.Check_SpotCheckApprove where x.SpotCheckCode == SpotCheckCode select x).ToList(); } @@ -226,6 +235,7 @@ namespace BLL } public static List getListDataBySpotCheckCodeForApi(string SpotCheckCode) { + Model.SGGLDB db = Funs.DB; var q = from x in db.Check_SpotCheckApprove where x.SpotCheckCode == SpotCheckCode && x.ApproveDate != null && x.ApproveType != "S" && x.Sign == "1" orderby x.ApproveDate diff --git a/SGGL/BLL/CQMS/Check/SpotCheckDetailService.cs b/SGGL/BLL/CQMS/Check/SpotCheckDetailService.cs index 9f9b1b73..c614ff91 100644 --- a/SGGL/BLL/CQMS/Check/SpotCheckDetailService.cs +++ b/SGGL/BLL/CQMS/Check/SpotCheckDetailService.cs @@ -9,7 +9,7 @@ namespace BLL { public class SpotCheckDetailService { - public static Model.SGGLDB db = Funs.DB; + /// /// 获取实体验收记录明细 @@ -19,6 +19,7 @@ namespace BLL /// public static IEnumerable getListData(string SpotCheckCode) { + Model.SGGLDB db = Funs.DB; return from x in db.Check_SpotCheckDetail where x.SpotCheckCode == SpotCheckCode select new diff --git a/SGGL/BLL/CQMS/Check/SpotCheckService.cs b/SGGL/BLL/CQMS/Check/SpotCheckService.cs index 49603412..24e2ad61 100644 --- a/SGGL/BLL/CQMS/Check/SpotCheckService.cs +++ b/SGGL/BLL/CQMS/Check/SpotCheckService.cs @@ -11,7 +11,7 @@ namespace BLL { public class SpotCheckService { - public static Model.SGGLDB db = Funs.DB; + /// /// 添加实体验收记录 diff --git a/SGGL/BLL/CQMS/Check/TechnicalContactListApproveService.cs b/SGGL/BLL/CQMS/Check/TechnicalContactListApproveService.cs index a2e77051..c5315686 100644 --- a/SGGL/BLL/CQMS/Check/TechnicalContactListApproveService.cs +++ b/SGGL/BLL/CQMS/Check/TechnicalContactListApproveService.cs @@ -9,9 +9,10 @@ namespace BLL { public class TechnicalContactListApproveService { - public static Model.SGGLDB db = Funs.DB; + public static Model.Check_TechnicalContactListApprove GetSee(string TechnicalContactListId, string userId) { + Model.SGGLDB db = Funs.DB; return db.Check_TechnicalContactListApprove.FirstOrDefault(x => x.TechnicalContactListId == TechnicalContactListId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null); } public static void See(string TechnicalContactListId, string userId) @@ -58,6 +59,7 @@ namespace BLL /// public static Model.Check_TechnicalContactListApprove GetApprove(string TechnicalContactListId) { + Model.SGGLDB db = Funs.DB; return db.Check_TechnicalContactListApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.TechnicalContactListId == TechnicalContactListId && x.ApproveType == BLL.Const.TechnicalContactList_Audit1); } @@ -127,6 +129,7 @@ namespace BLL /// 一个工程联络单审批实体 public static Model.Check_TechnicalContactListApprove GetTechnicalContactListApproveByTechnicalContactListId(string TechnicalContactListId) { + Model.SGGLDB db = Funs.DB; return db.Check_TechnicalContactListApprove.FirstOrDefault(x => x.TechnicalContactListId == TechnicalContactListId && x.ApproveDate == null && x.ApproveType != "S"); } /// @@ -136,6 +139,7 @@ namespace BLL /// 一个工程联络单审批实体 public static Model.Check_TechnicalContactListApprove GetTechnicalContactListApproveByApproveId(string approveId) { + Model.SGGLDB db = Funs.DB; return db.Check_TechnicalContactListApprove.FirstOrDefault(x => x.TechnicalContactListApproveId == approveId); } public static Model.Check_TechnicalContactListApprove GetTechnicalContactListApproveByApproveIdForApi(string approveId) @@ -147,6 +151,7 @@ namespace BLL } public static Model.Check_TechnicalContactListApprove GetComplie(string TechnicalContactListId) { + Model.SGGLDB db = Funs.DB; return db.Check_TechnicalContactListApprove.FirstOrDefault(x => x.TechnicalContactListId == TechnicalContactListId && x.ApproveType == BLL.Const.TechnicalContactList_Compile); } @@ -157,6 +162,7 @@ namespace BLL /// public static Model.Check_TechnicalContactListApprove GetApprove2(string TechnicalContactListId) { + Model.SGGLDB db = Funs.DB; return db.Check_TechnicalContactListApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.TechnicalContactListId == TechnicalContactListId && x.ApproveType == BLL.Const.TechnicalContactList_Audit3); } @@ -167,6 +173,7 @@ namespace BLL /// public static Model.Check_TechnicalContactListApprove GetApprove3(string TechnicalContactListId) { + Model.SGGLDB db = Funs.DB; return db.Check_TechnicalContactListApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.TechnicalContactListId == TechnicalContactListId && (x.ApproveType == BLL.Const.TechnicalContactList_Audit2 || x.ApproveType == BLL.Const.TechnicalContactList_Audit2H)); } @@ -177,6 +184,7 @@ namespace BLL /// public static Model.Check_TechnicalContactListApprove GetApprove5(string TechnicalContactListId) { + Model.SGGLDB db = Funs.DB; return db.Check_TechnicalContactListApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.TechnicalContactListId == TechnicalContactListId && (x.ApproveType == BLL.Const.TechnicalContactList_Audit4 || x.ApproveType == BLL.Const.TechnicalContactList_Audit4R)); } @@ -187,6 +195,7 @@ namespace BLL /// public static Model.Check_TechnicalContactListApprove GetApprove4(string TechnicalContactListId) { + Model.SGGLDB db = Funs.DB; return db.Check_TechnicalContactListApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.TechnicalContactListId == TechnicalContactListId && x.ApproveType == BLL.Const.TechnicalContactList_Audit6); } public static List GetListDataByIdForApi(string TechnicalContactListId) diff --git a/SGGL/BLL/CQMS/Check/TechnicalContactListService.cs b/SGGL/BLL/CQMS/Check/TechnicalContactListService.cs index 84ff8f5b..ac72a144 100644 --- a/SGGL/BLL/CQMS/Check/TechnicalContactListService.cs +++ b/SGGL/BLL/CQMS/Check/TechnicalContactListService.cs @@ -11,7 +11,7 @@ namespace BLL { public class TechnicalContactListService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据工程联络单信息Id删除一个工程联络单信息信息 @@ -402,7 +402,7 @@ namespace BLL /// /// 定义变量 /// - private static IQueryable qq = from x in db.Check_TechnicalContactList orderby x.CompileDate descending select x; + private static IQueryable qq = from x in Funs.DB.Check_TechnicalContactList orderby x.CompileDate descending select x; /// /// 获取分页列表 diff --git a/SGGL/BLL/CQMS/Comprehensive/DataDistributionService.cs b/SGGL/BLL/CQMS/Comprehensive/DataDistributionService.cs index fcd5ab7f..34e89606 100644 --- a/SGGL/BLL/CQMS/Comprehensive/DataDistributionService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/DataDistributionService.cs @@ -12,7 +12,7 @@ namespace BLL /// public static class DataDistributionService { - public static Model.SGGLDB db = Funs.DB; + /// /// 记录数 @@ -35,6 +35,7 @@ namespace BLL /// public static IEnumerable GetListData(string projectId, string startDate, string endDate, string fileCode, string fileName, string cNProfessionalId, int startRowIndex, int maximumRows) { + Model.SGGLDB db = Funs.DB; IQueryable q = from x in db.Comprehensive_DataDistribution where x.ProjectId == projectId orderby x.SendDate descending diff --git a/SGGL/BLL/CQMS/Comprehensive/DataReceivingService.cs b/SGGL/BLL/CQMS/Comprehensive/DataReceivingService.cs index 9686737e..f63bbdac 100644 --- a/SGGL/BLL/CQMS/Comprehensive/DataReceivingService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/DataReceivingService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class DataReceivingService { - public static Model.SGGLDB db = Funs.DB; + /// /// 记录数 @@ -34,7 +34,7 @@ namespace BLL /// public static IEnumerable GetListData(string projectId, string startDate, string endDate, string fileCode, string fileName, int startRowIndex, int maximumRows) { - IQueryable q = from x in db.Comprehensive_DataReceiving + IQueryable q = from x in Funs.DB.Comprehensive_DataReceiving where x.ProjectId == projectId orderby x.DataReceivingDate descending select x; diff --git a/SGGL/BLL/CQMS/Comprehensive/DesignChangeOrderService.cs b/SGGL/BLL/CQMS/Comprehensive/DesignChangeOrderService.cs index 8003bf0f..9e68b25f 100644 --- a/SGGL/BLL/CQMS/Comprehensive/DesignChangeOrderService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/DesignChangeOrderService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class DesignChangeOrderService { - public static Model.SGGLDB db = Funs.DB; + /// /// 记录数 @@ -34,6 +34,7 @@ namespace BLL /// public static IEnumerable GetListData(string projectId, string cNProfessionalId, string contents, string startDate, string endDate, int startRowIndex, int maximumRows) { + Model.SGGLDB db = Funs.DB; IQueryable q = from x in db.Comprehensive_DesignChangeOrder where x.ProjectId == projectId orderby x.ChangeOrderCode descending @@ -88,6 +89,7 @@ namespace BLL } public static IEnumerable GetListDataForDataType(string installtionId,string projectId, string cNProfessionalId, string contents, string startDate, string endDate, int startRowIndex, int maximumRows) { + Model.SGGLDB db = Funs.DB; IQueryable q = from x in db.Comprehensive_DesignChangeOrder where x.ProjectId == projectId orderby x.ChangeOrderCode descending diff --git a/SGGL/BLL/CQMS/Comprehensive/DesignDetailsService.cs b/SGGL/BLL/CQMS/Comprehensive/DesignDetailsService.cs index 11cac15c..e2c095e5 100644 --- a/SGGL/BLL/CQMS/Comprehensive/DesignDetailsService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/DesignDetailsService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class DesignDetailsService { - public static Model.SGGLDB db = Funs.DB; + /// /// 记录数 @@ -32,6 +32,7 @@ namespace BLL /// public static IEnumerable GetListData(string projectId, string cNProfessionalId, int startRowIndex, int maximumRows) { + Model.SGGLDB db = Funs.DB; IQueryable q = from x in db.Comprehensive_DesignDetails where x.ProjectId == projectId orderby x.DetailsDate descending @@ -62,6 +63,7 @@ namespace BLL public static IEnumerable GetListDataForDataType(string UnitWorkId, string projectId, string cNProfessionalId, int startRowIndex, int maximumRows) { + Model.SGGLDB db = Funs.DB; IQueryable q = from x in db.Comprehensive_DesignDetails where x.ProjectId == projectId orderby x.DetailsDate descending diff --git a/SGGL/BLL/CQMS/Comprehensive/DesignDrawingsService.cs b/SGGL/BLL/CQMS/Comprehensive/DesignDrawingsService.cs index c8fc3da6..3218203a 100644 --- a/SGGL/BLL/CQMS/Comprehensive/DesignDrawingsService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/DesignDrawingsService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class DesignDrawingsService { - public static Model.SGGLDB db = Funs.DB; + /// /// 记录数 @@ -31,6 +31,7 @@ namespace BLL /// public static IEnumerable GetListData(string projectId, string cnProfessionalId, string startDate, string endDate, string sendstartDate, string sendendDate, int startRowIndex, int maximumRows) { + Model.SGGLDB db = Funs.DB; IQueryable q = from x in db.Comprehensive_DesignDrawings where x.ProjectId == projectId orderby x.RemarkCode diff --git a/SGGL/BLL/CQMS/Comprehensive/GeneralPlanApprovalItemService.cs b/SGGL/BLL/CQMS/Comprehensive/GeneralPlanApprovalItemService.cs index 1c3d3032..d683ff2c 100644 --- a/SGGL/BLL/CQMS/Comprehensive/GeneralPlanApprovalItemService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/GeneralPlanApprovalItemService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class GeneralPlanApprovalItemService { - public static Model.SGGLDB db = Funs.DB; + /// /// 记录数 @@ -31,6 +31,7 @@ namespace BLL /// public static IEnumerable GetListData(string generalPlanApprovalId, int startRowIndex, int maximumRows) { + Model.SGGLDB db = Funs.DB; IQueryable q = from x in db.Comprehensive_GeneralPlanApprovalItem where x.GeneralPlanApprovalId == generalPlanApprovalId orderby x.SubmitDate descending diff --git a/SGGL/BLL/CQMS/Comprehensive/GeneralPlanApprovalService.cs b/SGGL/BLL/CQMS/Comprehensive/GeneralPlanApprovalService.cs index 9c01f2d8..99a0ddf3 100644 --- a/SGGL/BLL/CQMS/Comprehensive/GeneralPlanApprovalService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/GeneralPlanApprovalService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class GeneralPlanApprovalService { - public static Model.SGGLDB db = Funs.DB; + /// /// 记录数 @@ -33,6 +33,7 @@ namespace BLL /// public static IEnumerable GetListData(string projectId, string unitId, string cNProfessionalId,string UnitWorkId, int startRowIndex, int maximumRows) { + Model.SGGLDB db = Funs.DB; IQueryable q = from x in db.Comprehensive_GeneralPlanApproval where x.ProjectId == projectId orderby x.ApprovalDate descending diff --git a/SGGL/BLL/CQMS/Comprehensive/InspectionEquipmentService.cs b/SGGL/BLL/CQMS/Comprehensive/InspectionEquipmentService.cs index f431bd4a..daa8c853 100644 --- a/SGGL/BLL/CQMS/Comprehensive/InspectionEquipmentService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/InspectionEquipmentService.cs @@ -12,7 +12,7 @@ namespace BLL /// public class InspectionEquipmentService { - public static Model.SGGLDB db = Funs.DB; + /// /// 记录数 @@ -36,6 +36,7 @@ namespace BLL /// public static IEnumerable GetListData(string projectId, string unitId, string inspectionName, string startDate, string endDate, int startRowIndex, int maximumRows) { + Model.SGGLDB db = Funs.DB; IQueryable q = from x in db.Comprehensive_InspectionEquipment where x.ProjectId == projectId orderby x.RemarkCode diff --git a/SGGL/BLL/CQMS/Comprehensive/InspectionMachineService.cs b/SGGL/BLL/CQMS/Comprehensive/InspectionMachineService.cs index a5bfa9f8..0dc94fc2 100644 --- a/SGGL/BLL/CQMS/Comprehensive/InspectionMachineService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/InspectionMachineService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class InspectionMachineService { - public static Model.SGGLDB db = Funs.DB; + /// /// 记录数 @@ -32,6 +32,7 @@ namespace BLL /// public static IEnumerable GetListData(string projectId, string unitId, string cnProfessionalId, string inspectionType, int startRowIndex, int maximumRows) { + Model.SGGLDB db = Funs.DB; IQueryable q = from x in db.Comprehensive_InspectionMachine where x.ProjectId == projectId orderby x.InspectionMachineCode descending diff --git a/SGGL/BLL/CQMS/Comprehensive/InspectionPersonService.cs b/SGGL/BLL/CQMS/Comprehensive/InspectionPersonService.cs index c31f907b..867a14a4 100644 --- a/SGGL/BLL/CQMS/Comprehensive/InspectionPersonService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/InspectionPersonService.cs @@ -12,7 +12,7 @@ namespace BLL /// public static class InspectionPersonService { - public static Model.SGGLDB db = Funs.DB; + /// /// 记录数 diff --git a/SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalItemService.cs b/SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalItemService.cs index 97e775a8..2f40a355 100644 --- a/SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalItemService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalItemService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class MajorPlanApprovalItemService { - public static Model.SGGLDB db = Funs.DB; + /// /// 记录数 @@ -31,6 +31,7 @@ namespace BLL /// public static IEnumerable GetListData(string majorPlanApprovalId, int startRowIndex, int maximumRows) { + Model.SGGLDB db = Funs.DB; IQueryable q = from x in db.Comprehensive_MajorPlanApprovalItem where x.MajorPlanApprovalId == majorPlanApprovalId orderby x.SubmitDate descending diff --git a/SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalService.cs b/SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalService.cs index 3c7dee69..f1634d06 100644 --- a/SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class MajorPlanApprovalService { - public static Model.SGGLDB db = Funs.DB; + /// /// 记录数 @@ -33,6 +33,7 @@ namespace BLL /// public static IEnumerable GetListData(string projectId, string unitId, string cNProfessionalId, string UnitWorkId, int startRowIndex, int maximumRows) { + Model.SGGLDB db = Funs.DB; IQueryable q = from x in db.Comprehensive_MajorPlanApproval where x.ProjectId == projectId orderby x.ApprovalDate descending diff --git a/SGGL/BLL/CQMS/Comprehensive/NCRManagementService.cs b/SGGL/BLL/CQMS/Comprehensive/NCRManagementService.cs index ac597017..1530098f 100644 --- a/SGGL/BLL/CQMS/Comprehensive/NCRManagementService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/NCRManagementService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class NCRManagementService { - public static Model.SGGLDB db = Funs.DB; + /// /// 记录数 @@ -30,6 +30,7 @@ namespace BLL /// public static IEnumerable GetListData(string projectId, string sendUnit, string cnProfessionalId, string startDate, string endDate, int startRowIndex, int maximumRows) { + Model.SGGLDB db = Funs.DB; IQueryable q = from x in db.Comprehensive_NCRManagement where x.ProjectId == projectId orderby x.IssuedDate descending diff --git a/SGGL/BLL/CQMS/Comprehensive/PressurePipeService.cs b/SGGL/BLL/CQMS/Comprehensive/PressurePipeService.cs index 62991c6f..0ac2f3ac 100644 --- a/SGGL/BLL/CQMS/Comprehensive/PressurePipeService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/PressurePipeService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class PressurePipeService { - public static Model.SGGLDB db = Funs.DB; + /// /// 记录数 @@ -34,6 +34,7 @@ namespace BLL /// public static IEnumerable GetListData(string projectId, string unitId, int startRowIndex, int maximumRows) { + Model.SGGLDB db = Funs.DB; IQueryable q = from x in db.Comprehensive_PressurePipe where x.Projctid == projectId select x; diff --git a/SGGL/BLL/CQMS/Comprehensive/QualityAccidentService.cs b/SGGL/BLL/CQMS/Comprehensive/QualityAccidentService.cs index 10aba676..275cbd42 100644 --- a/SGGL/BLL/CQMS/Comprehensive/QualityAccidentService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/QualityAccidentService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class QualityAccidentService { - public static Model.SGGLDB db = Funs.DB; + /// /// 记录数 @@ -34,7 +34,7 @@ namespace BLL /// public static IEnumerable GetListData(string ProjectId, int startRowIndex, int maximumRows) { - IQueryable q = from x in db.Comprehensive_QualityAccident + IQueryable q = from x in Funs.DB.Comprehensive_QualityAccident where x.ProjectId == ProjectId select x; count = q.Count(); diff --git a/SGGL/BLL/CQMS/Comprehensive/SiteVisaManagementService.cs b/SGGL/BLL/CQMS/Comprehensive/SiteVisaManagementService.cs index 7b0e8685..1f396424 100644 --- a/SGGL/BLL/CQMS/Comprehensive/SiteVisaManagementService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/SiteVisaManagementService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class SiteVisaManagementService { - public static Model.SGGLDB db = Funs.DB; + /// /// 记录数 @@ -35,6 +35,7 @@ namespace BLL /// public static IEnumerable GetListData(string projectId, string unitId, string cNProfessionalId, string startDate, string endDate, int startRowIndex, int maximumRows) { + Model.SGGLDB db = Funs.DB; IQueryable q = from x in db.Comprehensive_SiteVisaManagement where x.ProjectId == projectId orderby x.VisaDate descending diff --git a/SGGL/BLL/CQMS/Comprehensive/SpecialEquipmentService.cs b/SGGL/BLL/CQMS/Comprehensive/SpecialEquipmentService.cs index 462e8d7c..8a360cfb 100644 --- a/SGGL/BLL/CQMS/Comprehensive/SpecialEquipmentService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/SpecialEquipmentService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class SpecialEquipmentServices { - public static Model.SGGLDB db = Funs.DB; + /// /// 记录数 @@ -34,6 +34,7 @@ namespace BLL /// public static IEnumerable GetListData(string projectId, string unitId, string equipmentId,int startRowIndex, int maximumRows) { + Model.SGGLDB db = Funs.DB; IQueryable q = from x in db.View_Comprehensive_SpecialEquipment where x.ProjectId == projectId orderby x.UnitName descending diff --git a/SGGL/BLL/CQMS/DataBase/DataTypeProjectService.cs b/SGGL/BLL/CQMS/DataBase/DataTypeProjectService.cs index ecaaf2f0..688829af 100644 --- a/SGGL/BLL/CQMS/DataBase/DataTypeProjectService.cs +++ b/SGGL/BLL/CQMS/DataBase/DataTypeProjectService.cs @@ -9,7 +9,7 @@ namespace BLL { public class DataTypeProjectService { - public static Model.SGGLDB db = Funs.DB; + /// /// 记录数 @@ -23,7 +23,7 @@ namespace BLL /// /// 定义变量 /// - private static IQueryable qq = from x in db.DataBase_DataTypeProject orderby x.SortIndex select x; + private static IQueryable qq = from x in Funs.DB.DataBase_DataTypeProject orderby x.SortIndex select x; /// /// 获取项目列表 diff --git a/SGGL/BLL/CQMS/ManageReport/ComprehensiveService.cs b/SGGL/BLL/CQMS/ManageReport/ComprehensiveService.cs index eb03d126..5d6c1d7c 100644 --- a/SGGL/BLL/CQMS/ManageReport/ComprehensiveService.cs +++ b/SGGL/BLL/CQMS/ManageReport/ComprehensiveService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class ComprehensiveService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取本周（月）报综合信息 diff --git a/SGGL/BLL/CQMS/ManageReport/ConstructionProblemsService.cs b/SGGL/BLL/CQMS/ManageReport/ConstructionProblemsService.cs index 9cd3201b..88555ad8 100644 --- a/SGGL/BLL/CQMS/ManageReport/ConstructionProblemsService.cs +++ b/SGGL/BLL/CQMS/ManageReport/ConstructionProblemsService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class ConstructionProblemsService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取施工过程问题 diff --git a/SGGL/BLL/CQMS/ManageReport/NextQualityControlService.cs b/SGGL/BLL/CQMS/ManageReport/NextQualityControlService.cs index cddf26dd..d452bf05 100644 --- a/SGGL/BLL/CQMS/ManageReport/NextQualityControlService.cs +++ b/SGGL/BLL/CQMS/ManageReport/NextQualityControlService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class NextQualityControlService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取下周质量控制点 diff --git a/SGGL/BLL/CQMS/ManageReport/RowMaterialProblemService.cs b/SGGL/BLL/CQMS/ManageReport/RowMaterialProblemService.cs index 008a42aa..3b9e5d88 100644 --- a/SGGL/BLL/CQMS/ManageReport/RowMaterialProblemService.cs +++ b/SGGL/BLL/CQMS/ManageReport/RowMaterialProblemService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class RowMaterialProblemService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取原材料问题 @@ -29,6 +29,7 @@ namespace BLL /// public static List GetRowMaterialProblemByReportId(string reportId) { + Model.SGGLDB db = Funs.DB; return (from x in db.Report_RowMaterialProblem where x.ReportId == reportId select x).ToList(); } diff --git a/SGGL/BLL/CQMS/ManageReport/ThisWeekOrMonthContentService.cs b/SGGL/BLL/CQMS/ManageReport/ThisWeekOrMonthContentService.cs index 23c15ecf..8f1dfb5d 100644 --- a/SGGL/BLL/CQMS/ManageReport/ThisWeekOrMonthContentService.cs +++ b/SGGL/BLL/CQMS/ManageReport/ThisWeekOrMonthContentService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class ThisWeekOrMonthContentService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取本周主要工作内容 diff --git a/SGGL/BLL/CQMS/ManageReport/WeekAndMonthReportService.cs b/SGGL/BLL/CQMS/ManageReport/WeekAndMonthReportService.cs index 4b3db3cb..8ce9b91e 100644 --- a/SGGL/BLL/CQMS/ManageReport/WeekAndMonthReportService.cs +++ b/SGGL/BLL/CQMS/ManageReport/WeekAndMonthReportService.cs @@ -8,7 +8,7 @@ namespace BLL { public static class WeekAndMonthReportService { - public static Model.SGGLDB db = Funs.DB; + /// /// 记录数 @@ -29,6 +29,7 @@ namespace BLL /// public static IEnumerable GetListData(string projectId, string reportType, int startRowIndex, int maximumRows) { + Model.SGGLDB db = Funs.DB; IQueryable q = from x in db.Report_WeekAndMonthReport where x.ProjectId == projectId && x.ReportType == reportType diff --git a/SGGL/BLL/CQMS/ProcessControl/HotProessManageService.cs b/SGGL/BLL/CQMS/ProcessControl/HotProessManageService.cs index 8607a076..4d97096d 100644 --- a/SGGL/BLL/CQMS/ProcessControl/HotProessManageService.cs +++ b/SGGL/BLL/CQMS/ProcessControl/HotProessManageService.cs @@ -9,7 +9,7 @@ namespace BLL public static class HotProessManageService { - public static Model.SGGLDB db = Funs.DB; + /// /// 记录数 @@ -33,7 +33,7 @@ namespace BLL /// public static IEnumerable GetListData(string projectId, string pipelineManageCode,string jointInfoCode, string hotProessReportCode, string hotHardManageCode, int startRowIndex, int maximumRows) { - IQueryable q = from x in db.ProcessControl_HotProessManage + IQueryable q = from x in Funs.DB.ProcessControl_HotProessManage where x.ProjectId == projectId orderby x.HotHardManageCode descending select x; diff --git a/SGGL/BLL/CQMS/ProcessControl/InspectionManagementDetailService.cs b/SGGL/BLL/CQMS/ProcessControl/InspectionManagementDetailService.cs index 36af93f1..379ee3bc 100644 --- a/SGGL/BLL/CQMS/ProcessControl/InspectionManagementDetailService.cs +++ b/SGGL/BLL/CQMS/ProcessControl/InspectionManagementDetailService.cs @@ -9,7 +9,7 @@ namespace BLL { public class InspectionManagementDetailService { - public static Model.SGGLDB db = Funs.DB; + /// /// 获取共检记录明细 @@ -19,7 +19,7 @@ namespace BLL /// public static IEnumerable getListData(string InspectionId) { - return from x in db.ProcessControl_InspectionManagementDetail + return from x in Funs.DB.ProcessControl_InspectionManagementDetail where x.InspectionId == InspectionId select new { diff --git a/SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs b/SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs index 03328bbe..c5654a8b 100644 --- a/SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs +++ b/SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs @@ -12,7 +12,7 @@ namespace BLL /// public static class InspectionManagementService { - public static Model.SGGLDB db = Funs.DB; + /// /// 记录数 @@ -36,6 +36,7 @@ namespace BLL /// public static IEnumerable GetListData(string projectId, string UnitWorkId, string cNProfessionalId, string startDate, string endDate, int startRowIndex, int maximumRows) { + Model.SGGLDB db = Funs.DB; IQueryable q = from x in db.ProcessControl_InspectionManagement where x.ProjectId == projectId && x.FileType == null orderby x.InspectionDate descending @@ -80,6 +81,7 @@ namespace BLL } public static IEnumerable GetListDataForDataType(string controlPointType, string projectId, string UnitWorkId, string cNProfessionalId, string startDate, string endDate, int startRowIndex, int maximumRows) { + Model.SGGLDB db = Funs.DB; IQueryable q = from x in db.ProcessControl_InspectionManagement where x.ProjectId == projectId && x.FileType == null orderby x.InspectionDate descending diff --git a/SGGL/BLL/CQMS/ProcessControl/NondestructiveTestService.cs b/SGGL/BLL/CQMS/ProcessControl/NondestructiveTestService.cs index 7dd6edb0..e7571201 100644 --- a/SGGL/BLL/CQMS/ProcessControl/NondestructiveTestService.cs +++ b/SGGL/BLL/CQMS/ProcessControl/NondestructiveTestService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class NondestructiveTestService { - public static Model.SGGLDB db = Funs.DB; + /// /// 记录数 diff --git a/SGGL/BLL/CQMS/ProcessControl/TestPackageManagementService.cs b/SGGL/BLL/CQMS/ProcessControl/TestPackageManagementService.cs index 09036457..9c3e35b4 100644 --- a/SGGL/BLL/CQMS/ProcessControl/TestPackageManagementService.cs +++ b/SGGL/BLL/CQMS/ProcessControl/TestPackageManagementService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class TestPackageManagementService { - public static Model.SGGLDB db = Funs.DB; + /// /// 记录数 @@ -33,6 +33,7 @@ namespace BLL /// public static IEnumerable GetListData(string projectId, string UnitWorkId, string completedState, int startRowIndex, int maximumRows) { + Model.SGGLDB db = Funs.DB; IQueryable q = from x in db.ProcessControl_TestPackageManagement where x.ProjectId == projectId orderby x.TestPackageManagementCode descending diff --git a/SGGL/BLL/CQMS/Unqualified/WorkContactApproveService.cs b/SGGL/BLL/CQMS/Unqualified/WorkContactApproveService.cs index d124de3e..29d6bd45 100644 --- a/SGGL/BLL/CQMS/Unqualified/WorkContactApproveService.cs +++ b/SGGL/BLL/CQMS/Unqualified/WorkContactApproveService.cs @@ -9,7 +9,7 @@ namespace BLL { public class WorkContactApproveService { - public static Model.SGGLDB db = Funs.DB; + /// /// 获取分页列表 @@ -17,6 +17,7 @@ namespace BLL /// public static IEnumerable getListData(string workContactId) { + Model.SGGLDB db = Funs.DB; return from x in db.Unqualified_WorkContactApprove where x.WorkContactId == workContactId && x.ApproveDate != null && x.ApproveType != "S" orderby x.ApproveDate @@ -92,7 +93,7 @@ namespace BLL } public static Model.Unqualified_WorkContactApprove GetSee(string WorkContactId, string userId) { - return db.Unqualified_WorkContactApprove.FirstOrDefault(x => x.WorkContactId == WorkContactId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null); + return Funs.DB.Unqualified_WorkContactApprove.FirstOrDefault(x => x.WorkContactId == WorkContactId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null); } public static void See(string WorkContactId, string userId) { @@ -113,7 +114,7 @@ namespace BLL /// 一个工作联系单审批实体 public static Model.Unqualified_WorkContactApprove GetWorkContactApproveByWorkContactId(string noticeId) { - return db.Unqualified_WorkContactApprove.FirstOrDefault(x => x.WorkContactId == noticeId && x.ApproveDate == null && x.ApproveType != "S"); + return Funs.DB.Unqualified_WorkContactApprove.FirstOrDefault(x => x.WorkContactId == noticeId && x.ApproveDate == null && x.ApproveType != "S"); } /// /// 修改工作联系单审批信息 @@ -140,7 +141,7 @@ namespace BLL /// public static Model.Unqualified_WorkContactApprove GetAudit1(string workContactId) { - return db.Unqualified_WorkContactApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.WorkContactId == workContactId && x.ApproveType == BLL.Const.WorkContact_Audit1); + return Funs.DB.Unqualified_WorkContactApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.WorkContactId == workContactId && x.ApproveType == BLL.Const.WorkContact_Audit1); } /// @@ -150,7 +151,7 @@ namespace BLL /// public static Model.Unqualified_WorkContactApprove GetAudit2(string workContactId) { - return db.Unqualified_WorkContactApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.WorkContactId == workContactId && (x.ApproveType == BLL.Const.WorkContact_Audit2 || x.ApproveType == BLL.Const.WorkContact_Audit2R)); + return Funs.DB.Unqualified_WorkContactApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.WorkContactId == workContactId && (x.ApproveType == BLL.Const.WorkContact_Audit2 || x.ApproveType == BLL.Const.WorkContact_Audit2R)); } /// @@ -160,7 +161,7 @@ namespace BLL /// public static Model.Unqualified_WorkContactApprove GetAudit3(string workContactId) { - return db.Unqualified_WorkContactApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.WorkContactId == workContactId && x.ApproveType == BLL.Const.WorkContact_Audit3); + return Funs.DB.Unqualified_WorkContactApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.WorkContactId == workContactId && x.ApproveType == BLL.Const.WorkContact_Audit3); } /// @@ -170,12 +171,12 @@ namespace BLL /// public static Model.Unqualified_WorkContactApprove GetAudit4(string workContactId) { - return db.Unqualified_WorkContactApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.WorkContactId == workContactId && (x.ApproveType == BLL.Const.WorkContact_Audit4 || x.ApproveType == BLL.Const.WorkContact_Audit1R)); + return Funs.DB.Unqualified_WorkContactApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.WorkContactId == workContactId && (x.ApproveType == BLL.Const.WorkContact_Audit4 || x.ApproveType == BLL.Const.WorkContact_Audit1R)); } public static Model.Unqualified_WorkContactApprove GetComplie(string workContactId) { - return db.Unqualified_WorkContactApprove.FirstOrDefault(x => x.WorkContactId == workContactId && x.ApproveType == BLL.Const.WorkContact_Compile); + return Funs.DB.Unqualified_WorkContactApprove.FirstOrDefault(x => x.WorkContactId == workContactId && x.ApproveType == BLL.Const.WorkContact_Compile); } public static Model.Unqualified_WorkContactApprove GetWorkContactApproveById(string WorkContactApproveId) { diff --git a/SGGL/BLL/CQMS/WBS/BreakdownProjectService.cs b/SGGL/BLL/CQMS/WBS/BreakdownProjectService.cs index 3f902edf..98e72f0e 100644 --- a/SGGL/BLL/CQMS/WBS/BreakdownProjectService.cs +++ b/SGGL/BLL/CQMS/WBS/BreakdownProjectService.cs @@ -9,7 +9,7 @@ namespace BLL { public class BreakdownProjectService { - public static Model.SGGLDB db = Funs.DB; + /// /// 记录数 @@ -41,7 +41,7 @@ namespace BLL /// /// 定义变量 /// - private static IQueryable qq = from x in db.WBS_BreakdownProject orderby x.SortIndex select x; + private static IQueryable qq = from x in Funs.DB.WBS_BreakdownProject orderby x.SortIndex select x; /// /// 获取项目列表 @@ -108,7 +108,7 @@ namespace BLL /// /// 定义变量 /// - private static IQueryable qq2 = from x in db.View_WBS select x; + private static IQueryable qq2 = from x in Funs.DB.View_WBS select x; /// /// 获取项目已选择的WBS列表 @@ -164,7 +164,7 @@ namespace BLL /// /// 定义变量 /// - private static IQueryable qq3 = from x in db.View_WBS_BreakdownProject orderby x.SortIndex select x; + private static IQueryable qq3 = from x in Funs.DB.View_WBS_BreakdownProject orderby x.SortIndex select x; /// /// 获取项目列表 diff --git a/SGGL/BLL/CQMS/WBS/BreakdownService.cs b/SGGL/BLL/CQMS/WBS/BreakdownService.cs index f858d9cc..54befe05 100644 --- a/SGGL/BLL/CQMS/WBS/BreakdownService.cs +++ b/SGGL/BLL/CQMS/WBS/BreakdownService.cs @@ -9,7 +9,7 @@ namespace BLL { public class BreakdownService { - public static Model.SGGLDB db = Funs.DB; + /// /// 记录数 @@ -23,7 +23,7 @@ namespace BLL /// /// 定义变量 /// - private static IQueryable qq = from x in db.WBS_Breakdown orderby x.SortIndex select x; + private static IQueryable qq = from x in Funs.DB.WBS_Breakdown orderby x.SortIndex select x; /// /// 获取项目列表 diff --git a/SGGL/BLL/CQMS/WBS/DivisionProjectService.cs b/SGGL/BLL/CQMS/WBS/DivisionProjectService.cs index d41674a0..29b48349 100644 --- a/SGGL/BLL/CQMS/WBS/DivisionProjectService.cs +++ b/SGGL/BLL/CQMS/WBS/DivisionProjectService.cs @@ -9,7 +9,7 @@ namespace BLL { public class DivisionProjectService { - public static Model.SGGLDB db = Funs.DB; + /// /// 记录数 @@ -20,11 +20,6 @@ namespace BLL set; } - /// - /// 定义变量 - /// - private static IQueryable qq = from x in db.WBS_DivisionProject orderby x.SortIndex select x; - /// /// 获取项目列表 /// @@ -35,7 +30,8 @@ namespace BLL /// public static IEnumerable getListData(int startRowIndex, int maximumRows) { - IQueryable q = qq; + IQueryable q = from x in Funs.DB.WBS_DivisionProject orderby x.SortIndex select x; + count = q.Count(); if (count == 0) { @@ -205,9 +201,9 @@ namespace BLL /// /// /// - public static Model.WBS_DivisionProject GetDivisionProjectByName(string CNProfessionalId, string unitWorkId,string superDivisionId, string divisionName) + public static Model.WBS_DivisionProject GetDivisionProjectByName(string CNProfessionalId, string unitWorkId, string superDivisionId, string divisionName) { - var q = Funs.DB.WBS_DivisionProject.FirstOrDefault(x => x.CNProfessionalId == CNProfessionalId && x.UnitWorkId == unitWorkId && x.SuperDivisionId==superDivisionId && x.DivisionName == divisionName); + var q = Funs.DB.WBS_DivisionProject.FirstOrDefault(x => x.CNProfessionalId == CNProfessionalId && x.UnitWorkId == unitWorkId && x.SuperDivisionId == superDivisionId && x.DivisionName == divisionName); return q; } } diff --git a/SGGL/BLL/CQMS/WBS/DivisionService.cs b/SGGL/BLL/CQMS/WBS/DivisionService.cs index 1918d60e..90a41829 100644 --- a/SGGL/BLL/CQMS/WBS/DivisionService.cs +++ b/SGGL/BLL/CQMS/WBS/DivisionService.cs @@ -9,7 +9,7 @@ namespace BLL { public class DivisionService { - public static Model.SGGLDB db = Funs.DB; + /// /// 记录数 @@ -23,7 +23,7 @@ namespace BLL /// /// 定义变量 /// - private static IQueryable qq = from x in db.WBS_Division orderby x.SortIndex select x; + private static IQueryable qq = from x in Funs.DB.WBS_Division orderby x.SortIndex select x; /// /// 获取项目列表 diff --git a/SGGL/BLL/Common/AttachFileService.cs b/SGGL/BLL/Common/AttachFileService.cs index 898bc3e8..a9d4db08 100644 --- a/SGGL/BLL/Common/AttachFileService.cs +++ b/SGGL/BLL/Common/AttachFileService.cs @@ -12,7 +12,7 @@ namespace BLL { public static class AttachFileService { - public static Model.SGGLDB db = Funs.DB; + /// /// 添加附件存储信息 @@ -20,6 +20,7 @@ namespace BLL /// public static void AddAttachFile(Model.AttachFile attachFile) { + Model.SGGLDB db = Funs.DB; string newKeyID = SQLHelper.GetNewID(typeof(Model.AttachFile)); Model.AttachFile newAttachFile = new Model.AttachFile(); newAttachFile.AttachFileId = newKeyID; @@ -38,6 +39,7 @@ namespace BLL /// public static void updateAttachFile(Model.AttachFile attachFile) { + Model.SGGLDB db = Funs.DB; Model.AttachFile newAttachFile = db.AttachFile.FirstOrDefault(x => x.AttachFileId == attachFile.AttachFileId); newAttachFile.ToKeyId = attachFile.ToKeyId; newAttachFile.AttachSource = attachFile.AttachSource; @@ -53,6 +55,7 @@ namespace BLL /// public static void DeleteAttachFile(string rootPath, string toKeyId, string menuId) { + Model.SGGLDB db = Funs.DB; Model.AttachFile att = db.AttachFile.FirstOrDefault(e => e.ToKeyId == toKeyId && e.MenuId == menuId); if (att != null) { diff --git a/SGGL/BLL/Common/ProjectDataFlowSetService.cs b/SGGL/BLL/Common/ProjectDataFlowSetService.cs index e234b549..eb991e81 100644 --- a/SGGL/BLL/Common/ProjectDataFlowSetService.cs +++ b/SGGL/BLL/Common/ProjectDataFlowSetService.cs @@ -9,7 +9,7 @@ /// public static class ProjectDataFlowSetService { - public static Model.SGGLDB db = Funs.DB; + /// /// 记录数 /// @@ -27,6 +27,7 @@ /// public static IEnumerable getListData(string dataId, int startRowIndex, int maximumRows) { + Model.SGGLDB db = Funs.DB; IQueryable q = from x in db.View_ProjectData_FlowOperate where x.DataId == dataId && x.IsClosed == true orderby x.SortIndex descending @@ -168,6 +169,7 @@ /// public static void CloseFlowOperate(string menuId, string dataId, string opinion) { + Model.SGGLDB db = Funs.DB; var updateUnFlowOperate = db.ProjectData_FlowOperate.FirstOrDefault(x => x.MenuId == menuId && x.DataId == dataId && (x.IsClosed == false || !x.IsClosed.HasValue)); if (updateUnFlowOperate != null) { @@ -311,6 +313,7 @@ /// 主表主键Id public static bool IsExitOperate(string menuId, string dataId) { + Model.SGGLDB db = Funs.DB; return (from x in db.ProjectData_FlowOperate where x.MenuId == menuId && x.DataId == dataId select x).Count() > 0; diff --git a/SGGL/BLL/Common/WeatherService.cs b/SGGL/BLL/Common/WeatherService.cs index 12378b0b..26b8fe40 100644 --- a/SGGL/BLL/Common/WeatherService.cs +++ b/SGGL/BLL/Common/WeatherService.cs @@ -11,7 +11,7 @@ namespace BLL /// public class WeatherService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取事故类型 diff --git a/SGGL/BLL/DigData/HSEDataCollectService.cs b/SGGL/BLL/DigData/HSEDataCollectService.cs index 98277c45..7a6e7f64 100644 --- a/SGGL/BLL/DigData/HSEDataCollectService.cs +++ b/SGGL/BLL/DigData/HSEDataCollectService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class HSEDataCollectService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取项目HSE数据汇总 @@ -90,6 +90,7 @@ namespace BLL /// public static void ProjectHSEDataCollectSubmission(Model.Base_Project project) { + Model.SGGLDB db = Funs.DB; if (project.ProjectState == Const.ProjectState_3) { #region 项目关闭 diff --git a/SGGL/BLL/DocManage/DocManageApproveService.cs b/SGGL/BLL/DocManage/DocManageApproveService.cs index 7bab829b..72c0f7ad 100644 --- a/SGGL/BLL/DocManage/DocManageApproveService.cs +++ b/SGGL/BLL/DocManage/DocManageApproveService.cs @@ -10,7 +10,7 @@ namespace BLL { public class DocManageApproveService { - public static Model.SGGLDB db = Funs.DB; + /// /// 获取工程联络单模板列表 @@ -45,6 +45,7 @@ namespace BLL /// 一个文档审批实体 public static Model.Doc_DocManageApprove GetDocManageApproveByApproveId(string approveId) { + Model.SGGLDB db = Funs.DB; return db.Doc_DocManageApprove.FirstOrDefault(x => x.DocManageApproveId == approveId); } @@ -55,6 +56,7 @@ namespace BLL /// 一个文档审批实体 public static Model.Doc_DocManageApprove GetDocManageApproveByDocId(string DocId) { + Model.SGGLDB db = Funs.DB; return db.Doc_DocManageApprove.FirstOrDefault(x => x.DocId == DocId && x.ApproveDate == null && x.Type == null); } /// @@ -64,6 +66,7 @@ namespace BLL /// public static Model.Doc_DocManageApprove GetNoticeDocManageApproveByDocId(string DocId, string userId) { + Model.SGGLDB db = Funs.DB; return db.Doc_DocManageApprove.FirstOrDefault(x => x.DocId == DocId && x.ApproveDate == null && x.Type == "s" && x.ApproveMan == userId); } /// diff --git a/SGGL/BLL/DoorServer/DoorServerService.cs b/SGGL/BLL/DoorServer/DoorServerService.cs index 88fa4768..ea3ddf3a 100644 --- a/SGGL/BLL/DoorServer/DoorServerService.cs +++ b/SGGL/BLL/DoorServer/DoorServerService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class DoorServerService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取事故类型 diff --git a/SGGL/BLL/DoorServer/InOutService.cs b/SGGL/BLL/DoorServer/InOutService.cs index 5d07f734..18fc7804 100644 --- a/SGGL/BLL/DoorServer/InOutService.cs +++ b/SGGL/BLL/DoorServer/InOutService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class InOutService { - public static Model.SGGLDB db = Funs.DB; + /// /// 记录数 /// @@ -24,10 +24,10 @@ namespace BLL /// /// 定义变量 /// - private static IQueryable qq = from x in db.T_d_facerecord + private static IQueryable qq = from x in Funs.DB.T_d_facerecord orderby x.DateTimeRecord descending select x; - private static IQueryable qq1 = from x in db.T_d_validcardevent + private static IQueryable qq1 = from x in Funs.DB.T_d_validcardevent orderby x.RecordDateTime descending select x; @@ -39,6 +39,7 @@ namespace BLL /// public static IEnumerable getListData(string projectId, string type, string unitId, string name, string startDate, string endDate, int PageIndex, int PageSize) { + Model.SGGLDB db = Funs.DB; if (type == "1") { IQueryable q1 = qq1.Where(x => x.ProjectId == projectId); diff --git a/SGGL/BLL/HJGL/FL/FLDataService.cs b/SGGL/BLL/HJGL/FL/FLDataService.cs index 6f1e0dd4..9ec6f175 100644 --- a/SGGL/BLL/HJGL/FL/FLDataService.cs +++ b/SGGL/BLL/HJGL/FL/FLDataService.cs @@ -8,7 +8,7 @@ namespace BLL { public static class FLDataService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取资料发放登记 diff --git a/SGGL/BLL/HJGL/TestPackage/TestPackageApproveService.cs b/SGGL/BLL/HJGL/TestPackage/TestPackageApproveService.cs index 6cbf3848..b1a6e1a9 100644 --- a/SGGL/BLL/HJGL/TestPackage/TestPackageApproveService.cs +++ b/SGGL/BLL/HJGL/TestPackage/TestPackageApproveService.cs @@ -10,10 +10,10 @@ namespace BLL { public class TestPackageApproveService { - public static Model.SGGLDB db = Funs.DB; + public static Model.PTP_TestPackageApprove GetTestPackageApproveById(string PTP_ID) { - return db.PTP_TestPackageApprove.FirstOrDefault(x => x.PTP_ID == PTP_ID && x.ApproveDate == null); + return Funs.DB.PTP_TestPackageApprove.FirstOrDefault(x => x.PTP_ID == PTP_ID && x.ApproveDate == null); } /// /// 修改尾项检查审批信息 diff --git a/SGGL/BLL/HSSE/Accident/AccidentHandleService.cs b/SGGL/BLL/HSSE/Accident/AccidentHandleService.cs index b1f73c7d..1bceafd7 100644 --- a/SGGL/BLL/HSSE/Accident/AccidentHandleService.cs +++ b/SGGL/BLL/HSSE/Accident/AccidentHandleService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class AccidentHandleService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取HSSE事故（含未遂）处理 diff --git a/SGGL/BLL/HSSE/Accident/AccidentPersonRecordService.cs b/SGGL/BLL/HSSE/Accident/AccidentPersonRecordService.cs index df9c7386..483093d6 100644 --- a/SGGL/BLL/HSSE/Accident/AccidentPersonRecordService.cs +++ b/SGGL/BLL/HSSE/Accident/AccidentPersonRecordService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class AccidentPersonRecordService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取HSSE事故（对人员）记录 diff --git a/SGGL/BLL/HSSE/Accident/AccidentReportOtherService.cs b/SGGL/BLL/HSSE/Accident/AccidentReportOtherService.cs index 06925d76..95b0fc36 100644 --- a/SGGL/BLL/HSSE/Accident/AccidentReportOtherService.cs +++ b/SGGL/BLL/HSSE/Accident/AccidentReportOtherService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class AccidentReportOtherService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取事故调查处理报告 diff --git a/SGGL/BLL/HSSE/Accident/AccidentReportService.cs b/SGGL/BLL/HSSE/Accident/AccidentReportService.cs index febdddd9..1419f8e6 100644 --- a/SGGL/BLL/HSSE/Accident/AccidentReportService.cs +++ b/SGGL/BLL/HSSE/Accident/AccidentReportService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class AccidentReportService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取事故调查报告 diff --git a/SGGL/BLL/HSSE/Accident/NoFourLetoffService.cs b/SGGL/BLL/HSSE/Accident/NoFourLetoffService.cs index bdf22dde..f8806bea 100644 --- a/SGGL/BLL/HSSE/Accident/NoFourLetoffService.cs +++ b/SGGL/BLL/HSSE/Accident/NoFourLetoffService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class NoFourLetoffService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取四不放过 diff --git a/SGGL/BLL/HSSE/Check/Check_CheckColligationDetailService.cs b/SGGL/BLL/HSSE/Check/Check_CheckColligationDetailService.cs index e0f64aa2..49856b41 100644 --- a/SGGL/BLL/HSSE/Check/Check_CheckColligationDetailService.cs +++ b/SGGL/BLL/HSSE/Check/Check_CheckColligationDetailService.cs @@ -10,7 +10,7 @@ namespace BLL /// public class Check_CheckColligationDetailService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据综合检查id获取所有相关明细信息 diff --git a/SGGL/BLL/HSSE/Check/Check_CheckDayDetailService.cs b/SGGL/BLL/HSSE/Check/Check_CheckDayDetailService.cs index 22cc51e9..690e54c2 100644 --- a/SGGL/BLL/HSSE/Check/Check_CheckDayDetailService.cs +++ b/SGGL/BLL/HSSE/Check/Check_CheckDayDetailService.cs @@ -10,7 +10,7 @@ namespace BLL /// public class Check_CheckDayDetailService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据日常巡检id获取所有相关明细信息 diff --git a/SGGL/BLL/HSSE/Check/Check_CheckSpecialDetailService.cs b/SGGL/BLL/HSSE/Check/Check_CheckSpecialDetailService.cs index 3e2bdae8..32a5cf31 100644 --- a/SGGL/BLL/HSSE/Check/Check_CheckSpecialDetailService.cs +++ b/SGGL/BLL/HSSE/Check/Check_CheckSpecialDetailService.cs @@ -10,7 +10,7 @@ namespace BLL /// public class Check_CheckSpecialDetailService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据专项检查id获取所有相关明细信息 diff --git a/SGGL/BLL/HSSE/Check/Check_ProjectLeaderCheckService.cs b/SGGL/BLL/HSSE/Check/Check_ProjectLeaderCheckService.cs index 50df3951..9528c317 100644 --- a/SGGL/BLL/HSSE/Check/Check_ProjectLeaderCheckService.cs +++ b/SGGL/BLL/HSSE/Check/Check_ProjectLeaderCheckService.cs @@ -12,7 +12,7 @@ namespace BLL /// public static class Check_ProjectLeaderCheckService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取领导带班检查 @@ -37,7 +37,7 @@ namespace BLL /// /// 定义变量 /// - private static IQueryable getDataLists = from x in db.Check_ProjectLeaderCheck + private static IQueryable getDataLists = from x in Funs.DB.Check_ProjectLeaderCheck select x; /// @@ -48,6 +48,7 @@ namespace BLL /// public static IEnumerable getListData(string projectId, string startTime, string endTime, Grid Grid1) { + Model.SGGLDB db = Funs.DB; IQueryable getDataList = getDataLists; if (!string.IsNullOrEmpty(projectId)) { diff --git a/SGGL/BLL/HSSE/Check/IncentiveNoticeService.cs b/SGGL/BLL/HSSE/Check/IncentiveNoticeService.cs index f1ccfada..c2ee3e19 100644 --- a/SGGL/BLL/HSSE/Check/IncentiveNoticeService.cs +++ b/SGGL/BLL/HSSE/Check/IncentiveNoticeService.cs @@ -9,7 +9,7 @@ namespace BLL /// public static class IncentiveNoticeService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取奖励通知单 diff --git a/SGGL/BLL/HSSE/Check/PunishNoticeService.cs b/SGGL/BLL/HSSE/Check/PunishNoticeService.cs index 96216e23..fa2e620f 100644 --- a/SGGL/BLL/HSSE/Check/PunishNoticeService.cs +++ b/SGGL/BLL/HSSE/Check/PunishNoticeService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class PunishNoticeService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取处罚通知单 diff --git a/SGGL/BLL/HSSE/Check/ViolationPersonService.cs b/SGGL/BLL/HSSE/Check/ViolationPersonService.cs index 815f17eb..41962012 100644 --- a/SGGL/BLL/HSSE/Check/ViolationPersonService.cs +++ b/SGGL/BLL/HSSE/Check/ViolationPersonService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class ViolationPersonService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取违规人员记录 diff --git a/SGGL/BLL/HSSE/CostGoods/CostManageItemService.cs b/SGGL/BLL/HSSE/CostGoods/CostManageItemService.cs index c8c1fe12..98830a1b 100644 --- a/SGGL/BLL/HSSE/CostGoods/CostManageItemService.cs +++ b/SGGL/BLL/HSSE/CostGoods/CostManageItemService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class CostManageItemService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键删除费用管理明细 diff --git a/SGGL/BLL/HSSE/CostGoods/CostManageService.cs b/SGGL/BLL/HSSE/CostGoods/CostManageService.cs index 8a88bb55..9b0754ee 100644 --- a/SGGL/BLL/HSSE/CostGoods/CostManageService.cs +++ b/SGGL/BLL/HSSE/CostGoods/CostManageService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class CostManageService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取安全费用管理 diff --git a/SGGL/BLL/HSSE/CostGoods/CostSmallDetailItemService.cs b/SGGL/BLL/HSSE/CostGoods/CostSmallDetailItemService.cs index 580c619f..32de289d 100644 --- a/SGGL/BLL/HSSE/CostGoods/CostSmallDetailItemService.cs +++ b/SGGL/BLL/HSSE/CostGoods/CostSmallDetailItemService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class CostSmallDetailItemService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取安全费用投入登记明细 diff --git a/SGGL/BLL/HSSE/CostGoods/CostSmallDetailService.cs b/SGGL/BLL/HSSE/CostGoods/CostSmallDetailService.cs index e42d4dee..aa69c768 100644 --- a/SGGL/BLL/HSSE/CostGoods/CostSmallDetailService.cs +++ b/SGGL/BLL/HSSE/CostGoods/CostSmallDetailService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class CostSmallDetailService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取安全费用投入登记 diff --git a/SGGL/BLL/HSSE/CostGoods/ExpenseService.cs b/SGGL/BLL/HSSE/CostGoods/ExpenseService.cs index bddd00a5..c939b7e3 100644 --- a/SGGL/BLL/HSSE/CostGoods/ExpenseService.cs +++ b/SGGL/BLL/HSSE/CostGoods/ExpenseService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class ExpenseService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取措施费用使用计划 diff --git a/SGGL/BLL/HSSE/EduTrain/AccidentCaseItemService.cs b/SGGL/BLL/HSSE/EduTrain/AccidentCaseItemService.cs index 19cc91ba..bf519859 100644 --- a/SGGL/BLL/HSSE/EduTrain/AccidentCaseItemService.cs +++ b/SGGL/BLL/HSSE/EduTrain/AccidentCaseItemService.cs @@ -8,7 +8,7 @@ namespace BLL { public class AccidentCaseItemService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据常见事故案例明细Id获取事故案例明细 diff --git a/SGGL/BLL/HSSE/EduTrain/AccidentCaseService.cs b/SGGL/BLL/HSSE/EduTrain/AccidentCaseService.cs index d125034b..7d16ddc6 100644 --- a/SGGL/BLL/HSSE/EduTrain/AccidentCaseService.cs +++ b/SGGL/BLL/HSSE/EduTrain/AccidentCaseService.cs @@ -7,7 +7,7 @@ namespace BLL { public class AccidentCaseService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取事故伤害及预防 diff --git a/SGGL/BLL/HSSE/EduTrain/CompanyTrainingItemService.cs b/SGGL/BLL/HSSE/EduTrain/CompanyTrainingItemService.cs index 7b841525..f53f556b 100644 --- a/SGGL/BLL/HSSE/EduTrain/CompanyTrainingItemService.cs +++ b/SGGL/BLL/HSSE/EduTrain/CompanyTrainingItemService.cs @@ -7,7 +7,7 @@ namespace BLL /// public class CompanyTrainingItemService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取公司培训明细信息 @@ -16,6 +16,7 @@ namespace BLL /// public static Model.Training_CompanyTrainingItem GetCompanyTrainingItemById(string companyTrainingItemId) { + Model.SGGLDB db = Funs.DB; return db.Training_CompanyTrainingItem.FirstOrDefault(e => e.CompanyTrainingItemId == companyTrainingItemId); } @@ -25,6 +26,7 @@ namespace BLL /// public static void AddCompanyTrainingItem(Model.Training_CompanyTrainingItem companyTrainingItem) { + Model.SGGLDB db = Funs.DB; Model.Training_CompanyTrainingItem newCompanyTrainingItem = new Model.Training_CompanyTrainingItem(); newCompanyTrainingItem.CompanyTrainingItemId = companyTrainingItem.CompanyTrainingItemId; newCompanyTrainingItem.CompanyTrainingId = companyTrainingItem.CompanyTrainingId; @@ -43,6 +45,7 @@ namespace BLL /// public static void UpdateCompanyTrainingItem(Model.Training_CompanyTrainingItem companyTrainingItem) { + Model.SGGLDB db = Funs.DB; Model.Training_CompanyTrainingItem newCompanyTrainingItem = db.Training_CompanyTrainingItem.FirstOrDefault(e => e.CompanyTrainingItemId == companyTrainingItem.CompanyTrainingItemId); if (newCompanyTrainingItem != null) { @@ -61,6 +64,7 @@ namespace BLL /// public static void DeleteCompanyTrainingItemById(string companyTrainItemId) { + Model.SGGLDB db = Funs.DB; Model.Training_CompanyTrainingItem companyTrainingItem = db.Training_CompanyTrainingItem.FirstOrDefault(e => e.CompanyTrainingItemId == companyTrainItemId); if (companyTrainingItem != null) { diff --git a/SGGL/BLL/HSSE/EduTrain/CompanyTrainingService.cs b/SGGL/BLL/HSSE/EduTrain/CompanyTrainingService.cs index 55c074bf..75d56334 100644 --- a/SGGL/BLL/HSSE/EduTrain/CompanyTrainingService.cs +++ b/SGGL/BLL/HSSE/EduTrain/CompanyTrainingService.cs @@ -8,7 +8,7 @@ namespace BLL /// public class CompanyTrainingService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取公司培训 @@ -17,6 +17,7 @@ namespace BLL /// public static Model.Training_CompanyTraining GetCompanyTrainingById(string companyTrainingId) { + Model.SGGLDB db = Funs.DB; return db.Training_CompanyTraining.FirstOrDefault(e => e.CompanyTrainingId == companyTrainingId); } @@ -26,6 +27,7 @@ namespace BLL /// public static void AddCompanyTraining(Model.Training_CompanyTraining companyTraining) { + Model.SGGLDB db = Funs.DB; Model.Training_CompanyTraining newCompanyTraining = new Model.Training_CompanyTraining(); newCompanyTraining.CompanyTrainingId = companyTraining.CompanyTrainingId; newCompanyTraining.CompanyTrainingCode = companyTraining.CompanyTrainingCode; @@ -42,6 +44,7 @@ namespace BLL /// public static void UpdateCompanyTraining(Model.Training_CompanyTraining companyTraining) { + Model.SGGLDB db = Funs.DB; Model.Training_CompanyTraining newCompanyTraining = db.Training_CompanyTraining.FirstOrDefault(e => e.CompanyTrainingId == companyTraining.CompanyTrainingId); if (newCompanyTraining != null) { diff --git a/SGGL/BLL/HSSE/EduTrain/EduTrain_TrainRecordDetailService.cs b/SGGL/BLL/HSSE/EduTrain/EduTrain_TrainRecordDetailService.cs index 0fec179f..7ec1d790 100644 --- a/SGGL/BLL/HSSE/EduTrain/EduTrain_TrainRecordDetailService.cs +++ b/SGGL/BLL/HSSE/EduTrain/EduTrain_TrainRecordDetailService.cs @@ -8,7 +8,7 @@ namespace BLL /// public static class EduTrain_TrainRecordDetailService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据教育培训主键获取所有的教育培训明细信息 diff --git a/SGGL/BLL/HSSE/EduTrain/EduTrain_TrainRecordService.cs b/SGGL/BLL/HSSE/EduTrain/EduTrain_TrainRecordService.cs index 3d02faf6..67e3d226 100644 --- a/SGGL/BLL/HSSE/EduTrain/EduTrain_TrainRecordService.cs +++ b/SGGL/BLL/HSSE/EduTrain/EduTrain_TrainRecordService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class EduTrain_TrainRecordService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据教育培训主键获取教育培训信息 diff --git a/SGGL/BLL/HSSE/EduTrain/EduTrain_TrainTestService.cs b/SGGL/BLL/HSSE/EduTrain/EduTrain_TrainTestService.cs index bd057046..e58fd1e3 100644 --- a/SGGL/BLL/HSSE/EduTrain/EduTrain_TrainTestService.cs +++ b/SGGL/BLL/HSSE/EduTrain/EduTrain_TrainTestService.cs @@ -8,7 +8,7 @@ namespace BLL /// public static class EduTrain_TrainTestService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据教育培训主键获取所有的教育培训明细信息 diff --git a/SGGL/BLL/HSSE/EduTrain/TestPlanService.cs b/SGGL/BLL/HSSE/EduTrain/TestPlanService.cs index dafd06de..c25153f7 100644 --- a/SGGL/BLL/HSSE/EduTrain/TestPlanService.cs +++ b/SGGL/BLL/HSSE/EduTrain/TestPlanService.cs @@ -8,7 +8,7 @@ namespace BLL /// public static class TestPlanService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取培训计划 @@ -26,6 +26,7 @@ namespace BLL /// public static void AddTestPlan(Model.Training_TestPlan testPlan) { + Model.SGGLDB db = Funs.DB; Model.Training_TestPlan newTestPlan = new Model.Training_TestPlan { TestPlanId = testPlan.TestPlanId, @@ -63,6 +64,7 @@ namespace BLL /// public static void UpdateTestPlan(Model.Training_TestPlan TestPlan) { + Model.SGGLDB db = Funs.DB; Model.Training_TestPlan newTestPlan = db.Training_TestPlan.FirstOrDefault(e => e.TestPlanId == TestPlan.TestPlanId); if (newTestPlan != null) { @@ -138,6 +140,7 @@ namespace BLL /// public static List GetTestPlanList() { + Model.SGGLDB db = Funs.DB; return (from x in db.Training_TestPlan orderby x.PlanCode select x).ToList(); } diff --git a/SGGL/BLL/HSSE/EduTrain/TestRecordItemService.cs b/SGGL/BLL/HSSE/EduTrain/TestRecordItemService.cs index 6e0f0e70..be02ff0a 100644 --- a/SGGL/BLL/HSSE/EduTrain/TestRecordItemService.cs +++ b/SGGL/BLL/HSSE/EduTrain/TestRecordItemService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class TestRecordItemService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据考试记录Id获取明细信息 @@ -28,6 +28,7 @@ namespace BLL /// public static void DeleteTestRecordItemmByTestRecordItemId(string testRecordItemId) { + Model.SGGLDB db = Funs.DB; var testRecordItem = db.Training_TestRecordItem.FirstOrDefault(x => x.TestRecordItemId == testRecordItemId); if (testRecordItem != null) { diff --git a/SGGL/BLL/HSSE/EduTrain/TestRecordService.cs b/SGGL/BLL/HSSE/EduTrain/TestRecordService.cs index 04411881..d233e2c0 100644 --- a/SGGL/BLL/HSSE/EduTrain/TestRecordService.cs +++ b/SGGL/BLL/HSSE/EduTrain/TestRecordService.cs @@ -8,7 +8,7 @@ namespace BLL /// public static class TestRecordService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取考试记录 diff --git a/SGGL/BLL/HSSE/EduTrain/TestTrainingItemService.cs b/SGGL/BLL/HSSE/EduTrain/TestTrainingItemService.cs index 53b2c24e..d01c68ec 100644 --- a/SGGL/BLL/HSSE/EduTrain/TestTrainingItemService.cs +++ b/SGGL/BLL/HSSE/EduTrain/TestTrainingItemService.cs @@ -8,7 +8,7 @@ namespace BLL { public static class TestTrainingItemService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取信息 diff --git a/SGGL/BLL/HSSE/EduTrain/TestTrainingService.cs b/SGGL/BLL/HSSE/EduTrain/TestTrainingService.cs index 0dd432ab..3bf84b43 100644 --- a/SGGL/BLL/HSSE/EduTrain/TestTrainingService.cs +++ b/SGGL/BLL/HSSE/EduTrain/TestTrainingService.cs @@ -7,7 +7,7 @@ namespace BLL { public static class TestTrainingService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取信息 @@ -92,6 +92,7 @@ namespace BLL /// public static List GetTestTrainingList() { + Model.SGGLDB db = Funs.DB; return (from x in db.Training_TestTraining orderby x.TrainingCode select x).ToList(); } @@ -101,7 +102,7 @@ namespace BLL /// public static List GetEndTestTrainingList() { - return (from x in db.Training_TestTraining + return (from x in Funs.DB.Training_TestTraining where x.IsEndLever == true orderby x.TrainingCode select x).ToList(); diff --git a/SGGL/BLL/HSSE/EduTrain/TrainTestDBItemService.cs b/SGGL/BLL/HSSE/EduTrain/TrainTestDBItemService.cs index a86ab6b9..25e03c74 100644 --- a/SGGL/BLL/HSSE/EduTrain/TrainTestDBItemService.cs +++ b/SGGL/BLL/HSSE/EduTrain/TrainTestDBItemService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class TrainTestDBItemService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键删除安全试题库明细信息 diff --git a/SGGL/BLL/HSSE/EduTrain/TrainTestDBService.cs b/SGGL/BLL/HSSE/EduTrain/TrainTestDBService.cs index 58785238..a93d6310 100644 --- a/SGGL/BLL/HSSE/EduTrain/TrainTestDBService.cs +++ b/SGGL/BLL/HSSE/EduTrain/TrainTestDBService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class TrainTestDBService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取安全试题库信息 diff --git a/SGGL/BLL/HSSE/EduTrain/TrainingItemService.cs b/SGGL/BLL/HSSE/EduTrain/TrainingItemService.cs index fe33b8b7..30bb5e8f 100644 --- a/SGGL/BLL/HSSE/EduTrain/TrainingItemService.cs +++ b/SGGL/BLL/HSSE/EduTrain/TrainingItemService.cs @@ -8,7 +8,7 @@ namespace BLL { public class TrainingItemService { - public static Model.SGGLDB db = Funs.DB; + /// /// diff --git a/SGGL/BLL/HSSE/EduTrain/TrainingPlanItemService.cs b/SGGL/BLL/HSSE/EduTrain/TrainingPlanItemService.cs index 36e60881..15aa8631 100644 --- a/SGGL/BLL/HSSE/EduTrain/TrainingPlanItemService.cs +++ b/SGGL/BLL/HSSE/EduTrain/TrainingPlanItemService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class TrainingPlanItemService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据培训计划明细表Id获取所有相关明细信息 @@ -19,6 +19,7 @@ namespace BLL /// public static List GetPlanItemByPlanId(string planId) { + Model.SGGLDB db = Funs.DB; return (from x in db.Training_PlanItem where x.PlanId == planId select x).ToList(); } @@ -28,6 +29,7 @@ namespace BLL /// public static void AddPlanItem(Model.Training_PlanItem planItem) { + Model.SGGLDB db = Funs.DB; Model.Training_PlanItem newPlanItem = new Model.Training_PlanItem { PlanItemId = planItem.PlanItemId, @@ -44,6 +46,7 @@ namespace BLL /// public static void DeletePlanItemById(string planItemId) { + Model.SGGLDB db = Funs.DB; var planItem = db.Training_PlanItem.FirstOrDefault(e => e.PlanItemId == planItemId); if (planItem != null) { diff --git a/SGGL/BLL/HSSE/EduTrain/TrainingPlanService.cs b/SGGL/BLL/HSSE/EduTrain/TrainingPlanService.cs index bcdc4c42..6691612e 100644 --- a/SGGL/BLL/HSSE/EduTrain/TrainingPlanService.cs +++ b/SGGL/BLL/HSSE/EduTrain/TrainingPlanService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class TrainingPlanService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取培训计划 @@ -28,6 +28,7 @@ namespace BLL /// public static void AddPlan(Model.Training_Plan plan) { + Model.SGGLDB db = Funs.DB; Model.Training_Plan newPlan = new Model.Training_Plan { PlanId = plan.PlanId, @@ -82,6 +83,7 @@ namespace BLL /// public static List GetPlanList() { + Model.SGGLDB db = Funs.DB; return (from x in db.Training_Plan orderby x.PlanCode select x).ToList(); } } diff --git a/SGGL/BLL/HSSE/EduTrain/TrainingService.cs b/SGGL/BLL/HSSE/EduTrain/TrainingService.cs index d0697a58..805236b3 100644 --- a/SGGL/BLL/HSSE/EduTrain/TrainingService.cs +++ b/SGGL/BLL/HSSE/EduTrain/TrainingService.cs @@ -5,7 +5,7 @@ namespace BLL { public class TrainingService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据上级Id查询所有教育培训主键列的值 diff --git a/SGGL/BLL/HSSE/EduTrain/TrainingTaskService.cs b/SGGL/BLL/HSSE/EduTrain/TrainingTaskService.cs index 9dcc16d7..57d8954a 100644 --- a/SGGL/BLL/HSSE/EduTrain/TrainingTaskService.cs +++ b/SGGL/BLL/HSSE/EduTrain/TrainingTaskService.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Net; using System.Text; namespace BLL @@ -10,7 +11,7 @@ namespace BLL /// public static class TrainingTaskService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取培训任务 @@ -19,7 +20,7 @@ namespace BLL /// public static Model.Training_Task GetTaskById(string taskId) { - return db.Training_Task.FirstOrDefault(e => e.TaskId == taskId); + return Funs.DB.Training_Task.FirstOrDefault(e => e.TaskId == taskId); } /// @@ -38,6 +39,7 @@ namespace BLL /// public static void AddTask(Model.Training_Task task) { + Model.SGGLDB db = Funs.DB; Model.Training_Task newTask = new Model.Training_Task { TaskId = task.TaskId, diff --git a/SGGL/BLL/HSSE/Emergency/DrillRecordListService.cs b/SGGL/BLL/HSSE/Emergency/DrillRecordListService.cs index e480d9dd..3fe7874a 100644 --- a/SGGL/BLL/HSSE/Emergency/DrillRecordListService.cs +++ b/SGGL/BLL/HSSE/Emergency/DrillRecordListService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class DrillRecordListService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取应急演练 diff --git a/SGGL/BLL/HSSE/Emergency/EmergencyListService.cs b/SGGL/BLL/HSSE/Emergency/EmergencyListService.cs index 99ced9e5..d80493ff 100644 --- a/SGGL/BLL/HSSE/Emergency/EmergencyListService.cs +++ b/SGGL/BLL/HSSE/Emergency/EmergencyListService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class EmergencyListService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取应急预案管理 diff --git a/SGGL/BLL/HSSE/Emergency/EmergencySupplyService.cs b/SGGL/BLL/HSSE/Emergency/EmergencySupplyService.cs index df400b5c..25cb3f2b 100644 --- a/SGGL/BLL/HSSE/Emergency/EmergencySupplyService.cs +++ b/SGGL/BLL/HSSE/Emergency/EmergencySupplyService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class EmergencySupplyService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取应急物资管理 diff --git a/SGGL/BLL/HSSE/Emergency/EmergencyTeamAndTrainService.cs b/SGGL/BLL/HSSE/Emergency/EmergencyTeamAndTrainService.cs index a04131aa..ff88036c 100644 --- a/SGGL/BLL/HSSE/Emergency/EmergencyTeamAndTrainService.cs +++ b/SGGL/BLL/HSSE/Emergency/EmergencyTeamAndTrainService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class EmergencyTeamAndTrainService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取应急队伍/培训 diff --git a/SGGL/BLL/HSSE/Environmental/EIAReportService.cs b/SGGL/BLL/HSSE/Environmental/EIAReportService.cs index e6d418ff..14968dfe 100644 --- a/SGGL/BLL/HSSE/Environmental/EIAReportService.cs +++ b/SGGL/BLL/HSSE/Environmental/EIAReportService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class EIAReportService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取环评报告 diff --git a/SGGL/BLL/HSSE/Environmental/EnvironmentalEmergencyPlanService.cs b/SGGL/BLL/HSSE/Environmental/EnvironmentalEmergencyPlanService.cs index bccd0b60..9d2c335d 100644 --- a/SGGL/BLL/HSSE/Environmental/EnvironmentalEmergencyPlanService.cs +++ b/SGGL/BLL/HSSE/Environmental/EnvironmentalEmergencyPlanService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class EnvironmentalEmergencyPlanService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取环境事件应急预案 diff --git a/SGGL/BLL/HSSE/Environmental/EnvironmentalMonitoringService.cs b/SGGL/BLL/HSSE/Environmental/EnvironmentalMonitoringService.cs index e41fc3c4..3445c75e 100644 --- a/SGGL/BLL/HSSE/Environmental/EnvironmentalMonitoringService.cs +++ b/SGGL/BLL/HSSE/Environmental/EnvironmentalMonitoringService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class EnvironmentalMonitoringService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取环境监测数据 diff --git a/SGGL/BLL/HSSE/Environmental/UnexpectedEnvironmentalService.cs b/SGGL/BLL/HSSE/Environmental/UnexpectedEnvironmentalService.cs index d623e8d1..ce27e797 100644 --- a/SGGL/BLL/HSSE/Environmental/UnexpectedEnvironmentalService.cs +++ b/SGGL/BLL/HSSE/Environmental/UnexpectedEnvironmentalService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class UnexpectedEnvironmentalService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取突发环境事件 diff --git a/SGGL/BLL/HSSE/HSSESystem/HSSEMainDutyService.cs b/SGGL/BLL/HSSE/HSSESystem/HSSEMainDutyService.cs index 9b83c2cb..7aa276de 100644 --- a/SGGL/BLL/HSSE/HSSESystem/HSSEMainDutyService.cs +++ b/SGGL/BLL/HSSE/HSSESystem/HSSEMainDutyService.cs @@ -8,7 +8,7 @@ namespace BLL /// public static class HSSEMainDutyService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取安全主体责任 diff --git a/SGGL/BLL/HSSE/HSSESystem/ServerSafetyInstitutionService.cs b/SGGL/BLL/HSSE/HSSESystem/ServerSafetyInstitutionService.cs index d9d36c2b..7827d924 100644 --- a/SGGL/BLL/HSSE/HSSESystem/ServerSafetyInstitutionService.cs +++ b/SGGL/BLL/HSSE/HSSESystem/ServerSafetyInstitutionService.cs @@ -7,7 +7,7 @@ namespace BLL /// public static class ServerSafetyInstitutionService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取安全制度 diff --git a/SGGL/BLL/HSSE/Hazard/Hazard_EnvironmentalRiskItemService.cs b/SGGL/BLL/HSSE/Hazard/Hazard_EnvironmentalRiskItemService.cs index 54cba9b5..250d0e60 100644 --- a/SGGL/BLL/HSSE/Hazard/Hazard_EnvironmentalRiskItemService.cs +++ b/SGGL/BLL/HSSE/Hazard/Hazard_EnvironmentalRiskItemService.cs @@ -5,7 +5,7 @@ namespace BLL { public static class Hazard_EnvironmentalRiskItemService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据危险源明细表id得到明细信息 @@ -136,6 +136,7 @@ namespace BLL /// public static List GetEnvironmentalRiskItemByEnvironmentalId(string environmentalId) { + Model.SGGLDB db = Funs.DB; return (from x in db.Hazard_EnvironmentalRiskItem where x.EnvironmentalId == environmentalId select x).ToList(); } } diff --git a/SGGL/BLL/HSSE/Hazard/Hazard_EnvironmentalRiskListService.cs b/SGGL/BLL/HSSE/Hazard/Hazard_EnvironmentalRiskListService.cs index 958970e4..85baab55 100644 --- a/SGGL/BLL/HSSE/Hazard/Hazard_EnvironmentalRiskListService.cs +++ b/SGGL/BLL/HSSE/Hazard/Hazard_EnvironmentalRiskListService.cs @@ -9,7 +9,7 @@ namespace BLL { public static class Hazard_EnvironmentalRiskListService { - public static Model.SGGLDB db = Funs.DB; + /// /// 要求主键获取危险清单信息 diff --git a/SGGL/BLL/HSSE/Hazard/Hazard_HazardListService.cs b/SGGL/BLL/HSSE/Hazard/Hazard_HazardListService.cs index ae2f1001..163a951b 100644 --- a/SGGL/BLL/HSSE/Hazard/Hazard_HazardListService.cs +++ b/SGGL/BLL/HSSE/Hazard/Hazard_HazardListService.cs @@ -9,7 +9,7 @@ namespace BLL { public static class Hazard_HazardListService { - public static Model.SGGLDB db = Funs.DB; + /// /// 要求主键获取危险清单信息 @@ -27,7 +27,7 @@ namespace BLL /// 危险清单的数量 public static int GetHazardListCountByVersionNoIsNull(string projectId) { - return (from x in db.Hazard_HazardList where x.VersionNo == null && x.ProjectId == projectId select x).Count(); + return (from x in Funs.DB.Hazard_HazardList where x.VersionNo == null && x.ProjectId == projectId select x).Count(); } /// diff --git a/SGGL/BLL/HSSE/Hazard/Hazard_HazardSelectedItemService.cs b/SGGL/BLL/HSSE/Hazard/Hazard_HazardSelectedItemService.cs index 93498529..3652e1ca 100644 --- a/SGGL/BLL/HSSE/Hazard/Hazard_HazardSelectedItemService.cs +++ b/SGGL/BLL/HSSE/Hazard/Hazard_HazardSelectedItemService.cs @@ -8,7 +8,7 @@ namespace BLL { public static class Hazard_HazardSelectedItemService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据危险源类别编号查询危险源类别 @@ -17,7 +17,7 @@ namespace BLL /// public static IEnumerable getHazardSelectedItemByHazardListTypeId(string hazardListTypeId, string hazardListId) { - return from x in db.Hazard_HazardSelectedItem + return from x in Funs.DB.Hazard_HazardSelectedItem where x.HazardListTypeId == hazardListTypeId && x.HazardListId == hazardListId select new { @@ -50,7 +50,7 @@ namespace BLL /// public static IEnumerable getHazardSelectedItemByHazardListTypeId(string hazardListTypeId, string hazardListId, string workStage) { - return from x in db.Hazard_HazardSelectedItem + return from x in Funs.DB.Hazard_HazardSelectedItem where x.HazardListTypeId == hazardListTypeId && x.HazardListId == hazardListId && x.WorkStage == workStage select new { @@ -82,7 +82,7 @@ namespace BLL /// 危险因素明细集合 public static List GetHazardSelectedItemByHazardListTypeIdAndHazardListId(string hazardListTypeId, string hazardListId) { - return (from x in db.Hazard_HazardSelectedItem where x.HazardListTypeId == hazardListTypeId && x.HazardListId == hazardListId select x).ToList(); + return (from x in Funs.DB.Hazard_HazardSelectedItem where x.HazardListTypeId == hazardListTypeId && x.HazardListId == hazardListId select x).ToList(); } /// @@ -91,7 +91,7 @@ namespace BLL /// 危险因素明细集合 public static List GetPromptTimeIsNotNullHazardSelectedItemByHazardListTypeIdAndHazardListId(string hazardListTypeId, string hazardListId) { - return (from x in db.Hazard_HazardSelectedItem where x.HazardListTypeId == hazardListTypeId && x.HazardListId == hazardListId && x.PromptTime != null select x).ToList(); + return (from x in Funs.DB.Hazard_HazardSelectedItem where x.HazardListTypeId == hazardListTypeId && x.HazardListId == hazardListId && x.PromptTime != null select x).ToList(); } /// @@ -101,7 +101,7 @@ namespace BLL /// 一个危险源辨识与评价清单审批实体 public static Model.Hazard_HazardSelectedItem GetHazardSelectedItemByHazardId(string hazardId, string hazardListId, string workStage) { - return db.Hazard_HazardSelectedItem.FirstOrDefault(x => x.HazardId == hazardId && x.HazardListId == hazardListId && x.WorkStage == workStage); + return Funs.DB.Hazard_HazardSelectedItem.FirstOrDefault(x => x.HazardId == hazardId && x.HazardListId == hazardListId && x.WorkStage == workStage); } /// @@ -111,7 +111,7 @@ namespace BLL /// 一个危险源辨识与评价清单审批实体 public static Model.Hazard_HazardSelectedItem GetHazardSelectedItemByHazardSelectedItemId(string hazardSelectedItemId) { - return db.Hazard_HazardSelectedItem.FirstOrDefault(x => x.HazardSelectedItemId == hazardSelectedItemId); + return Funs.DB.Hazard_HazardSelectedItem.FirstOrDefault(x => x.HazardSelectedItemId == hazardSelectedItemId); } /// @@ -121,7 +121,7 @@ namespace BLL /// 一个危险源辨识与评价清单审批实体 public static Model.Hazard_HazardSelectedItem GetHazardSelectedItemByHazardId(string hazardId) { - return db.Hazard_HazardSelectedItem.FirstOrDefault(x => x.HazardId == hazardId); + return Funs.DB.Hazard_HazardSelectedItem.FirstOrDefault(x => x.HazardId == hazardId); } /// @@ -154,6 +154,7 @@ namespace BLL /// public static List GetHazardSelectedItemBySortAndListIdAndWorkStage(string hazardListTypeId, string hazardListId, string workStage) { + Model.SGGLDB db = Funs.DB; return (from x in db.Hazard_HazardSelectedItem where x.HazardListTypeId == hazardListTypeId && x.HazardListId == hazardListId && x.WorkStage == workStage select x).ToList(); } diff --git a/SGGL/BLL/HSSE/Hazard/RiskEvaluationRecordService.cs b/SGGL/BLL/HSSE/Hazard/RiskEvaluationRecordService.cs index afd3ec62..cb249ec3 100644 --- a/SGGL/BLL/HSSE/Hazard/RiskEvaluationRecordService.cs +++ b/SGGL/BLL/HSSE/Hazard/RiskEvaluationRecordService.cs @@ -8,7 +8,7 @@ namespace BLL { public static class RiskEvaluationRecordService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取风险评价记录 diff --git a/SGGL/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs b/SGGL/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs index 553b2eb4..e31d966f 100644 --- a/SGGL/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs +++ b/SGGL/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs @@ -9,7 +9,7 @@ namespace BLL { public static class HSSE_Hazard_HazardRegisterService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据危险观察登记主键获取危险观察登记信息 diff --git a/SGGL/BLL/HSSE/InApproveManager/EquipmentInItemService.cs b/SGGL/BLL/HSSE/InApproveManager/EquipmentInItemService.cs index b1e164b9..3b0a76ee 100644 --- a/SGGL/BLL/HSSE/InApproveManager/EquipmentInItemService.cs +++ b/SGGL/BLL/HSSE/InApproveManager/EquipmentInItemService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class EquipmentInItemService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取特种设备机具入场报批明细信息 diff --git a/SGGL/BLL/HSSE/InApproveManager/EquipmentInService.cs b/SGGL/BLL/HSSE/InApproveManager/EquipmentInService.cs index 92b23913..6e1a572f 100644 --- a/SGGL/BLL/HSSE/InApproveManager/EquipmentInService.cs +++ b/SGGL/BLL/HSSE/InApproveManager/EquipmentInService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class EquipmentInService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取特种设备机具入场报批 diff --git a/SGGL/BLL/HSSE/InApproveManager/EquipmentOutItemService.cs b/SGGL/BLL/HSSE/InApproveManager/EquipmentOutItemService.cs index 3f33dc13..5d440b4b 100644 --- a/SGGL/BLL/HSSE/InApproveManager/EquipmentOutItemService.cs +++ b/SGGL/BLL/HSSE/InApproveManager/EquipmentOutItemService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class EquipmentOutItemService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取特种设备机具出场报批明细 diff --git a/SGGL/BLL/HSSE/InApproveManager/EquipmentOutService.cs b/SGGL/BLL/HSSE/InApproveManager/EquipmentOutService.cs index 97e21706..42227ca2 100644 --- a/SGGL/BLL/HSSE/InApproveManager/EquipmentOutService.cs +++ b/SGGL/BLL/HSSE/InApproveManager/EquipmentOutService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class EquipmentOutService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取特种设备机具出场报批 diff --git a/SGGL/BLL/HSSE/InApproveManager/EquipmentQualityInItemService.cs b/SGGL/BLL/HSSE/InApproveManager/EquipmentQualityInItemService.cs index f47b585d..188d567c 100644 --- a/SGGL/BLL/HSSE/InApproveManager/EquipmentQualityInItemService.cs +++ b/SGGL/BLL/HSSE/InApproveManager/EquipmentQualityInItemService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class EquipmentQualityInItemService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主表ID获取明细信息 diff --git a/SGGL/BLL/HSSE/InApproveManager/EquipmentQualityInService.cs b/SGGL/BLL/HSSE/InApproveManager/EquipmentQualityInService.cs index fc691660..e224fb97 100644 --- a/SGGL/BLL/HSSE/InApproveManager/EquipmentQualityInService.cs +++ b/SGGL/BLL/HSSE/InApproveManager/EquipmentQualityInService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class EquipmentQualityInService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取特种设备审批 diff --git a/SGGL/BLL/HSSE/InApproveManager/GeneralEquipmentInItemService.cs b/SGGL/BLL/HSSE/InApproveManager/GeneralEquipmentInItemService.cs index 6a8f7aca..c6f93d3a 100644 --- a/SGGL/BLL/HSSE/InApproveManager/GeneralEquipmentInItemService.cs +++ b/SGGL/BLL/HSSE/InApproveManager/GeneralEquipmentInItemService.cs @@ -8,7 +8,7 @@ namespace BLL /// public static class GeneralEquipmentInItemService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取一般设备机具入场报批明细信息 diff --git a/SGGL/BLL/HSSE/InApproveManager/GeneralEquipmentInService.cs b/SGGL/BLL/HSSE/InApproveManager/GeneralEquipmentInService.cs index fcae79a1..e031d064 100644 --- a/SGGL/BLL/HSSE/InApproveManager/GeneralEquipmentInService.cs +++ b/SGGL/BLL/HSSE/InApproveManager/GeneralEquipmentInService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class GeneralEquipmentInService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取一般设备机具入场报批 diff --git a/SGGL/BLL/HSSE/InApproveManager/GeneralEquipmentOutItemService.cs b/SGGL/BLL/HSSE/InApproveManager/GeneralEquipmentOutItemService.cs index 739eb42e..c7257bc5 100644 --- a/SGGL/BLL/HSSE/InApproveManager/GeneralEquipmentOutItemService.cs +++ b/SGGL/BLL/HSSE/InApproveManager/GeneralEquipmentOutItemService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class GeneralEquipmentOutItemService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取一般设备机具出场报批 diff --git a/SGGL/BLL/HSSE/InApproveManager/GeneralEquipmentOutService.cs b/SGGL/BLL/HSSE/InApproveManager/GeneralEquipmentOutService.cs index c2e49f1d..55812c30 100644 --- a/SGGL/BLL/HSSE/InApproveManager/GeneralEquipmentOutService.cs +++ b/SGGL/BLL/HSSE/InApproveManager/GeneralEquipmentOutService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class GeneralEquipmentOutService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取一般设备机具出场报批 diff --git a/SGGL/BLL/HSSE/InformationProject/ConstructionStandardIdentifyService.cs b/SGGL/BLL/HSSE/InformationProject/ConstructionStandardIdentifyService.cs index 81b69e0f..d4423e48 100644 --- a/SGGL/BLL/HSSE/InformationProject/ConstructionStandardIdentifyService.cs +++ b/SGGL/BLL/HSSE/InformationProject/ConstructionStandardIdentifyService.cs @@ -7,7 +7,7 @@ namespace BLL { public static class ConstructionStandardIdentifyService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据标准规范辨识主键获取一个标准规范辨识信息 diff --git a/SGGL/BLL/HSSE/InformationProject/ConstructionStandardSelectedItemService.cs b/SGGL/BLL/HSSE/InformationProject/ConstructionStandardSelectedItemService.cs index 48ea8a41..49f89e59 100644 --- a/SGGL/BLL/HSSE/InformationProject/ConstructionStandardSelectedItemService.cs +++ b/SGGL/BLL/HSSE/InformationProject/ConstructionStandardSelectedItemService.cs @@ -7,7 +7,7 @@ namespace BLL { public static class ConstructionStandardSelectedItemService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据标准规范辨识Id获取对应所有标准规范项信息 diff --git a/SGGL/BLL/HSSE/InformationProject/ProjectAccidentCauseReportItemService.cs b/SGGL/BLL/HSSE/InformationProject/ProjectAccidentCauseReportItemService.cs index 47d8fa1e..b44f5ab6 100644 --- a/SGGL/BLL/HSSE/InformationProject/ProjectAccidentCauseReportItemService.cs +++ b/SGGL/BLL/HSSE/InformationProject/ProjectAccidentCauseReportItemService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class ProjectAccidentCauseReportItemService { - public static Model.SGGLDB db = Funs.DB; + /// /// 职工伤亡事故原因分析报表明细表 diff --git a/SGGL/BLL/HSSE/InformationProject/ProjectAccidentCauseReportService.cs b/SGGL/BLL/HSSE/InformationProject/ProjectAccidentCauseReportService.cs index f4d0fdff..d4370da6 100644 --- a/SGGL/BLL/HSSE/InformationProject/ProjectAccidentCauseReportService.cs +++ b/SGGL/BLL/HSSE/InformationProject/ProjectAccidentCauseReportService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class ProjectAccidentCauseReportService { - public static Model.SGGLDB db = Funs.DB; + /// /// 职工伤亡事故原因分析报表 diff --git a/SGGL/BLL/HSSE/InformationProject/ProjectDrillConductedQuarterlyReportItemService.cs b/SGGL/BLL/HSSE/InformationProject/ProjectDrillConductedQuarterlyReportItemService.cs index fb4865e5..0ceb51e1 100644 --- a/SGGL/BLL/HSSE/InformationProject/ProjectDrillConductedQuarterlyReportItemService.cs +++ b/SGGL/BLL/HSSE/InformationProject/ProjectDrillConductedQuarterlyReportItemService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class ProjectDrillConductedQuarterlyReportItemService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取应急演练开展情况季报表明细信息 diff --git a/SGGL/BLL/HSSE/InformationProject/ProjectDrillConductedQuarterlyReportService.cs b/SGGL/BLL/HSSE/InformationProject/ProjectDrillConductedQuarterlyReportService.cs index 185b9b12..9198c809 100644 --- a/SGGL/BLL/HSSE/InformationProject/ProjectDrillConductedQuarterlyReportService.cs +++ b/SGGL/BLL/HSSE/InformationProject/ProjectDrillConductedQuarterlyReportService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class ProjectDrillConductedQuarterlyReportService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取应急演练开展情况季报表 diff --git a/SGGL/BLL/HSSE/InformationProject/ProjectDrillPlanHalfYearReportItemService.cs b/SGGL/BLL/HSSE/InformationProject/ProjectDrillPlanHalfYearReportItemService.cs index 7723cb20..53d84377 100644 --- a/SGGL/BLL/HSSE/InformationProject/ProjectDrillPlanHalfYearReportItemService.cs +++ b/SGGL/BLL/HSSE/InformationProject/ProjectDrillPlanHalfYearReportItemService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class ProjectDrillPlanHalfYearReportItemService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取应急演练工作计划半年报明细信息 diff --git a/SGGL/BLL/HSSE/InformationProject/ProjectDrillPlanHalfYearReportService.cs b/SGGL/BLL/HSSE/InformationProject/ProjectDrillPlanHalfYearReportService.cs index 7c14eca5..29aff7b1 100644 --- a/SGGL/BLL/HSSE/InformationProject/ProjectDrillPlanHalfYearReportService.cs +++ b/SGGL/BLL/HSSE/InformationProject/ProjectDrillPlanHalfYearReportService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class ProjectDrillPlanHalfYearReportService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取应急演练工作计划半年报 diff --git a/SGGL/BLL/HSSE/InformationProject/ProjectMillionsMonthlyReportService.cs b/SGGL/BLL/HSSE/InformationProject/ProjectMillionsMonthlyReportService.cs index d5e55152..6f826fe0 100644 --- a/SGGL/BLL/HSSE/InformationProject/ProjectMillionsMonthlyReportService.cs +++ b/SGGL/BLL/HSSE/InformationProject/ProjectMillionsMonthlyReportService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class ProjectMillionsMonthlyReportService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取企业安全数据统计月报 diff --git a/SGGL/BLL/HSSE/InformationProject/ProjectSafetyQuarterlyReportService.cs b/SGGL/BLL/HSSE/InformationProject/ProjectSafetyQuarterlyReportService.cs index f8c25e6a..84cb5e58 100644 --- a/SGGL/BLL/HSSE/InformationProject/ProjectSafetyQuarterlyReportService.cs +++ b/SGGL/BLL/HSSE/InformationProject/ProjectSafetyQuarterlyReportService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class ProjectSafetyQuarterlyReportService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取安全生产数据季报 diff --git a/SGGL/BLL/HSSE/Law/HSSEStandardsListService.cs b/SGGL/BLL/HSSE/Law/HSSEStandardsListService.cs index 73dedbbb..21785b43 100644 --- a/SGGL/BLL/HSSE/Law/HSSEStandardsListService.cs +++ b/SGGL/BLL/HSSE/Law/HSSEStandardsListService.cs @@ -5,7 +5,7 @@ namespace BLL { public class HSSEStandardsListService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据id查询标准规范信息 diff --git a/SGGL/BLL/HSSE/Law/LawRegulationListService.cs b/SGGL/BLL/HSSE/Law/LawRegulationListService.cs index 6c119ac4..a9b9627f 100644 --- a/SGGL/BLL/HSSE/Law/LawRegulationListService.cs +++ b/SGGL/BLL/HSSE/Law/LawRegulationListService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class LawRegulationListService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取法律法规 diff --git a/SGGL/BLL/HSSE/Law/ManageRuleService.cs b/SGGL/BLL/HSSE/Law/ManageRuleService.cs index f78cedaf..90bfee58 100644 --- a/SGGL/BLL/HSSE/Law/ManageRuleService.cs +++ b/SGGL/BLL/HSSE/Law/ManageRuleService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class ManageRuleService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取管理规定 diff --git a/SGGL/BLL/HSSE/Law/RulesRegulationsService.cs b/SGGL/BLL/HSSE/Law/RulesRegulationsService.cs index 5a2e3fd4..119b37b6 100644 --- a/SGGL/BLL/HSSE/Law/RulesRegulationsService.cs +++ b/SGGL/BLL/HSSE/Law/RulesRegulationsService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class RulesRegulationsService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取生产规章制度 diff --git a/SGGL/BLL/HSSE/License/HSETechnicalService.cs b/SGGL/BLL/HSSE/License/HSETechnicalService.cs index 7fe58749..e01126e0 100644 --- a/SGGL/BLL/HSSE/License/HSETechnicalService.cs +++ b/SGGL/BLL/HSSE/License/HSETechnicalService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class HSETechnicalService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取安全技术交底 diff --git a/SGGL/BLL/HSSE/License/LicenseManagerService.cs b/SGGL/BLL/HSSE/License/LicenseManagerService.cs index 468ed11b..fcb3e095 100644 --- a/SGGL/BLL/HSSE/License/LicenseManagerService.cs +++ b/SGGL/BLL/HSSE/License/LicenseManagerService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class LicenseManagerService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取安全许可证 diff --git a/SGGL/BLL/HSSE/License/LicensePublicService.cs b/SGGL/BLL/HSSE/License/LicensePublicService.cs index 369a2563..ce901c43 100644 --- a/SGGL/BLL/HSSE/License/LicensePublicService.cs +++ b/SGGL/BLL/HSSE/License/LicensePublicService.cs @@ -9,7 +9,7 @@ namespace BLL /// public static class LicensePublicService { - public static Model.SGGLDB db = Funs.DB; + /// /// 状态下拉框 /// diff --git a/SGGL/BLL/HSSE/Manager/CompletionReportService.cs b/SGGL/BLL/HSSE/Manager/CompletionReportService.cs index cc1c1f1c..d4e574da 100644 --- a/SGGL/BLL/HSSE/Manager/CompletionReportService.cs +++ b/SGGL/BLL/HSSE/Manager/CompletionReportService.cs @@ -7,7 +7,7 @@ namespace BLL /// public static class CompletionReportService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取完工报告 diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/AccidentSortCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/AccidentSortCService.cs index 099195d2..2d79a528 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/AccidentSortCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/AccidentSortCService.cs @@ -7,7 +7,7 @@ namespace BLL { public class AccidentSortCService { - public static Model.SGGLDB db = Funs.DB; + public static Model.Manager_AccidentSortC GetAccidentSortsByMonthReportIdAndAccidentType(string monthReportId, string accidentType) { @@ -89,6 +89,7 @@ namespace BLL /// 月报告主键 public static void DeleteAccidentSortsByMonthReportId(string monthReportId) { + Model.SGGLDB db = Funs.DB; var q = (from x in db.Manager_AccidentSortC where x.MonthReportId == monthReportId select x).ToList(); if (q.Count>0) { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/ActivityDesCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/ActivityDesCService.cs index 63a66236..e6e6e627 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/ActivityDesCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/ActivityDesCService.cs @@ -7,7 +7,7 @@ namespace BLL { public class ActivityDesCService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据月报Id获取相关所有活动情况说明信息 diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/CheckDetailSortCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/CheckDetailSortCService.cs index ed8d165c..7e562d0f 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/CheckDetailSortCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/CheckDetailSortCService.cs @@ -7,7 +7,7 @@ namespace BLL { public class CheckDetailSortCService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据月报告主键获取所有月报告HSE检查明细情况信息 @@ -53,6 +53,7 @@ namespace BLL /// 月报告主键 public static void DeleteCheckDetailSortsByMonthReportId(string monthReportId) { + Model.SGGLDB db = Funs.DB; var q = (from x in db.Manager_CheckDetailSortC where x.MonthReportId == monthReportId select x).ToList(); if (q.Count>0) { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/CheckSortCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/CheckSortCService.cs index 2c988a71..6cfbac3c 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/CheckSortCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/CheckSortCService.cs @@ -7,7 +7,7 @@ namespace BLL { public class CheckSortCService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据月报告主键获取所有月报告HSE检查情况信息 diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/DrillSortCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/DrillSortCService.cs index 4d5c454b..edb3a22f 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/DrillSortCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/DrillSortCService.cs @@ -7,7 +7,7 @@ namespace BLL { public class DrillSortCService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据月报告主键获取所有月报告应急演练信息 @@ -48,6 +48,7 @@ namespace BLL /// 月报告主键 public static void DeleteDrillSortsByMonthReportId(string monthReportId) { + Model.SGGLDB db = Funs.DB; var q = (from x in db.Manager_DrillSortC where x.MonthReportId == monthReportId select x).ToList(); if (q.Count > 0) { db.Manager_DrillSortC.DeleteAllOnSubmit(q); diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/EmergencySortCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/EmergencySortCService.cs index f62c24be..9de246f6 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/EmergencySortCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/EmergencySortCService.cs @@ -7,7 +7,7 @@ namespace BLL { public class EmergencySortCService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据月报告主键获取所有月报告应急预案信息 @@ -48,6 +48,7 @@ namespace BLL /// 月报告主键 public static void DeleteEmergencySortsByMonthReportId(string monthReportId) { + Model.SGGLDB db = Funs.DB; var q = (from x in db.Manager_EmergencySortC where x.MonthReportId == monthReportId select x).ToList(); if (q.Count > 0) { db.Manager_EmergencySortC.DeleteAllOnSubmit(q); diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/HazardSortCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/HazardSortCService.cs index c10a2a87..f2400241 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/HazardSortCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/HazardSortCService.cs @@ -7,7 +7,7 @@ namespace BLL { public class HazardSortCService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据月报告主键获取所有月报告危险源信息 @@ -48,6 +48,7 @@ namespace BLL /// 月报告主键 public static void DeleteHazardSortsByMonthReportId(string monthReportId) { + Model.SGGLDB db = Funs.DB; var q = (from x in db.Manager_HazardSortC where x.MonthReportId == monthReportId select x).ToList(); if (q.Count>0) { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/HseCostCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/HseCostCService.cs index 9f56e718..4df2753b 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/HseCostCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/HseCostCService.cs @@ -8,7 +8,7 @@ namespace BLL { public class HseCostCService { - public static Model.SGGLDB db = Funs.DB; + /// /// 获取分页列表 @@ -16,6 +16,7 @@ namespace BLL /// public static IEnumerable getListData(string monthReportId) { + Model.SGGLDB db = Funs.DB; return from x in db.Manager_HseCostC where x.MonthReportId == monthReportId orderby x.UnitId @@ -77,6 +78,7 @@ namespace BLL /// 月报告主键 public static void DeleteHseCostsByMonthReportId(string monthReportId) { + Model.SGGLDB db = Funs.DB; var q = (from x in db.Manager_HseCostC where x.MonthReportId == monthReportId select x).ToList(); if (q.Count>0) { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/IncentiveSortCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/IncentiveSortCService.cs index bd94ed87..09d967ef 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/IncentiveSortCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/IncentiveSortCService.cs @@ -7,7 +7,7 @@ namespace BLL { public class IncentiveSortCService { - public static Model.SGGLDB db = Funs.DB; + public static List GetIncentiveSortsByMonthReportIdAndBigType(string monthReportId, string bigType) { @@ -67,6 +67,7 @@ namespace BLL /// 月报告主键 public static void DeleteIncentiveSortsByMonthReportId(string monthReportId) { + Model.SGGLDB db = Funs.DB; var q = (from x in db.Manager_IncentiveSortC where x.MonthReportId == monthReportId select x).ToList(); if (q.Count > 0) { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/MeetingSortCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/MeetingSortCService.cs index a5830ff9..a7e1c852 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/MeetingSortCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/MeetingSortCService.cs @@ -7,7 +7,7 @@ namespace BLL { public class MeetingSortCService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据月报告主键获取所有月报告HSE会议情况信息 @@ -55,6 +55,7 @@ namespace BLL /// 月报告主键 public static void DeleteMeetingSortsByMonthReportId(string monthReportId) { + Model.SGGLDB db = Funs.DB; var q = (from x in db.Manager_MeetingSortC where x.MonthReportId == monthReportId select x).ToList(); if (q.Count>0) { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/OtherActiveSortCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/OtherActiveSortCService.cs index 7dc57534..58ba2e81 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/OtherActiveSortCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/OtherActiveSortCService.cs @@ -7,7 +7,7 @@ namespace BLL { public class OtherActiveSortCService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据月报告主键获取所有月报告其他HSE管理活动信息 @@ -47,6 +47,7 @@ namespace BLL /// 月报告主键 public static void DeleteOtherActiveSortsByMonthReportId(string monthReportId) { + Model.SGGLDB db = Funs.DB; var q = (from x in db.Manager_OtherActiveSortC where x.MonthReportId == monthReportId select x).ToList(); if (q.Count > 0) { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/OtherManagementCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/OtherManagementCService.cs index c660ef5f..29a13660 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/OtherManagementCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/OtherManagementCService.cs @@ -7,7 +7,7 @@ namespace BLL { public class OtherManagementCService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据月报Id获取HSE现场其他管理情况信息 diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/PersonSortCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/PersonSortCService.cs index edf74a54..9d327ef2 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/PersonSortCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/PersonSortCService.cs @@ -7,7 +7,7 @@ namespace BLL { public class PersonSortCService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据月报告主键获取所有月报告HSE人力投入信息 @@ -54,6 +54,7 @@ namespace BLL /// 月报告主键 public static void DeletePersonSortsByMonthReportId(string monthReportId) { + Model.SGGLDB db = Funs.DB; var q = (from x in db.Manager_PersonSortC where x.MonthReportId == monthReportId select x).ToList(); if (q.Count>0) { @@ -68,6 +69,7 @@ namespace BLL /// 月报告主键 public static void DeleteManager_HiddenDanger(string monthReportId) { + Model.SGGLDB db = Funs.DB; var q = (from x in db.Manager_HiddenDanger where x.MonthReportId == monthReportId select x).ToList(); if (q.Count>0) { @@ -82,6 +84,7 @@ namespace BLL /// public static void DeleteManager_ProjectAssignment(string monthReportId) { + Model.SGGLDB db = Funs.DB; var q = (from x in db.Manager_ProjectAssignment where x.MonthReportId == monthReportId select x).ToList(); if (q.Count > 0) { @@ -96,6 +99,7 @@ namespace BLL /// public static void DeleteManager_EmergencyPlan(string monthReportId) { + Model.SGGLDB db = Funs.DB; var q = (from x in db.Manager_EmergencyPlan where x.MonthReportId == monthReportId select x).ToList(); if (q.Count > 0) { @@ -110,6 +114,7 @@ namespace BLL /// public static void DeleteManager_DrillRecordList(string monthReportId) { + Model.SGGLDB db = Funs.DB; var q = (from x in db.Manager_DrillRecordList where x.MonthReportId == monthReportId select x).ToList(); if (q.Count > 0) { @@ -124,6 +129,7 @@ namespace BLL /// public static void DeleteManager_Attempted(string monthReportId) { + Model.SGGLDB db = Funs.DB; var q = (from x in db.Manager_Attempted where x.MonthReportId == monthReportId select x).ToList(); if (q.Count > 0) { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/PlanCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/PlanCService.cs index bc3b6290..c14cd17b 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/PlanCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/PlanCService.cs @@ -7,7 +7,7 @@ namespace BLL { public class PlanCService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据月报Id获取本月文件、方案修编情况说明 diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/PromotionalActiviteSortCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/PromotionalActiviteSortCService.cs index a16b7af1..59404786 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/PromotionalActiviteSortCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/PromotionalActiviteSortCService.cs @@ -7,7 +7,7 @@ namespace BLL { public class PromotionalActiviteSortCService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据月报告主键获取所有月报告HSE宣传活动信息 @@ -48,6 +48,7 @@ namespace BLL /// 月报告主键 public static void DeletePromotionalActiviteSortsByMonthReportId(string monthReportId) { + Model.SGGLDB db = Funs.DB; var q = (from x in db.Manager_PromotionalActiviteSortC where x.MonthReportId == monthReportId select x).ToList(); if (q.Count>0) { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/TrainActivitySortCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/TrainActivitySortCService.cs index 3215e055..4f9fd5b5 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/TrainActivitySortCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/TrainActivitySortCService.cs @@ -7,7 +7,7 @@ namespace BLL { public class TrainActivitySortCService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据月报告主键获取所有月报告HSE培训活动信息 @@ -47,6 +47,7 @@ namespace BLL /// 月报告主键 public static void DeleteTrainActivitySortsByMonthReportId(string monthReportId) { + Model.SGGLDB db = Funs.DB; var q = (from x in db.Manager_TrainActivitySortC where x.MonthReportId == monthReportId select x).ToList(); if (q.Count>0) { diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/TrainSortCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/TrainSortCService.cs index c027c866..11cbf7af 100644 --- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/TrainSortCService.cs +++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/TrainSortCService.cs @@ -7,7 +7,7 @@ namespace BLL { public class TrainSortCService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据月报告主键获取所有月报告HSE培训情况信息 diff --git a/SGGL/BLL/HSSE/Meeting/AttendMeetingService.cs b/SGGL/BLL/HSSE/Meeting/AttendMeetingService.cs index f2da0646..d461d59c 100644 --- a/SGGL/BLL/HSSE/Meeting/AttendMeetingService.cs +++ b/SGGL/BLL/HSSE/Meeting/AttendMeetingService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class AttendMeetingService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取其他会议记录 diff --git a/SGGL/BLL/HSSE/Meeting/ClassMeetingService.cs b/SGGL/BLL/HSSE/Meeting/ClassMeetingService.cs index 6e151d5c..0c7a672f 100644 --- a/SGGL/BLL/HSSE/Meeting/ClassMeetingService.cs +++ b/SGGL/BLL/HSSE/Meeting/ClassMeetingService.cs @@ -8,7 +8,7 @@ namespace BLL /// public static class ClassMeetingService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取班前会 diff --git a/SGGL/BLL/HSSE/Meeting/MonthMeetingService.cs b/SGGL/BLL/HSSE/Meeting/MonthMeetingService.cs index cc00b05c..85bfb42e 100644 --- a/SGGL/BLL/HSSE/Meeting/MonthMeetingService.cs +++ b/SGGL/BLL/HSSE/Meeting/MonthMeetingService.cs @@ -9,7 +9,7 @@ namespace BLL /// public static class MonthMeetingService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取安全月例会 diff --git a/SGGL/BLL/HSSE/Meeting/SafetyLeaderGroupMeetingService.cs b/SGGL/BLL/HSSE/Meeting/SafetyLeaderGroupMeetingService.cs index 3f6e11c7..071fabf9 100644 --- a/SGGL/BLL/HSSE/Meeting/SafetyLeaderGroupMeetingService.cs +++ b/SGGL/BLL/HSSE/Meeting/SafetyLeaderGroupMeetingService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class SafetyLeaderGroupMeetingService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取安全领导小组会议 diff --git a/SGGL/BLL/HSSE/Meeting/SpecialMeetingService.cs b/SGGL/BLL/HSSE/Meeting/SpecialMeetingService.cs index 898d0def..afe50cdc 100644 --- a/SGGL/BLL/HSSE/Meeting/SpecialMeetingService.cs +++ b/SGGL/BLL/HSSE/Meeting/SpecialMeetingService.cs @@ -9,7 +9,7 @@ namespace BLL /// public static class SpecialMeetingService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取专题例会 diff --git a/SGGL/BLL/HSSE/Meeting/WeekMeetingService.cs b/SGGL/BLL/HSSE/Meeting/WeekMeetingService.cs index 2846a92a..4c39cc60 100644 --- a/SGGL/BLL/HSSE/Meeting/WeekMeetingService.cs +++ b/SGGL/BLL/HSSE/Meeting/WeekMeetingService.cs @@ -9,7 +9,7 @@ namespace BLL /// public static class WeekMeetingService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取周例会 diff --git a/SGGL/BLL/HSSE/OccupationHealth/HazardDetectionService.cs b/SGGL/BLL/HSSE/OccupationHealth/HazardDetectionService.cs index 7293e7ec..d012208e 100644 --- a/SGGL/BLL/HSSE/OccupationHealth/HazardDetectionService.cs +++ b/SGGL/BLL/HSSE/OccupationHealth/HazardDetectionService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class HazardDetectionService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取危害检测 diff --git a/SGGL/BLL/HSSE/OccupationHealth/OccupationalDiseaseAccidentService.cs b/SGGL/BLL/HSSE/OccupationHealth/OccupationalDiseaseAccidentService.cs index 8f4caa74..7275ab8f 100644 --- a/SGGL/BLL/HSSE/OccupationHealth/OccupationalDiseaseAccidentService.cs +++ b/SGGL/BLL/HSSE/OccupationHealth/OccupationalDiseaseAccidentService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class OccupationalDiseaseAccidentService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取职业病事故 diff --git a/SGGL/BLL/HSSE/OccupationHealth/PhysicalExaminationService.cs b/SGGL/BLL/HSSE/OccupationHealth/PhysicalExaminationService.cs index 60d2dd19..67782ae4 100644 --- a/SGGL/BLL/HSSE/OccupationHealth/PhysicalExaminationService.cs +++ b/SGGL/BLL/HSSE/OccupationHealth/PhysicalExaminationService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class PhysicalExaminationService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取体检管理 diff --git a/SGGL/BLL/HSSE/QualityAudit/EquipmentPersonQualityService.cs b/SGGL/BLL/HSSE/QualityAudit/EquipmentPersonQualityService.cs index 3a2554a0..efd2db33 100644 --- a/SGGL/BLL/HSSE/QualityAudit/EquipmentPersonQualityService.cs +++ b/SGGL/BLL/HSSE/QualityAudit/EquipmentPersonQualityService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class EquipmentPersonQualityService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取特种设备作业人员资质 diff --git a/SGGL/BLL/HSSE/QualityAudit/EquipmentQualityAuditDetailService.cs b/SGGL/BLL/HSSE/QualityAudit/EquipmentQualityAuditDetailService.cs index 50e70ca4..1de5825c 100644 --- a/SGGL/BLL/HSSE/QualityAudit/EquipmentQualityAuditDetailService.cs +++ b/SGGL/BLL/HSSE/QualityAudit/EquipmentQualityAuditDetailService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class EquipmentQualityAuditDetailService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取特种设备资质审查明细 diff --git a/SGGL/BLL/HSSE/QualityAudit/EquipmentQualityService.cs b/SGGL/BLL/HSSE/QualityAudit/EquipmentQualityService.cs index 58ff34f1..bf423326 100644 --- a/SGGL/BLL/HSSE/QualityAudit/EquipmentQualityService.cs +++ b/SGGL/BLL/HSSE/QualityAudit/EquipmentQualityService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class EquipmentQualityService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取特殊机具设备资质 diff --git a/SGGL/BLL/HSSE/QualityAudit/GeneralEquipmentQualityService.cs b/SGGL/BLL/HSSE/QualityAudit/GeneralEquipmentQualityService.cs index 0d9f336f..53c7102a 100644 --- a/SGGL/BLL/HSSE/QualityAudit/GeneralEquipmentQualityService.cs +++ b/SGGL/BLL/HSSE/QualityAudit/GeneralEquipmentQualityService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class GeneralEquipmentQualityService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取一般机具设备资质 diff --git a/SGGL/BLL/HSSE/QualityAudit/PersonQualityService.cs b/SGGL/BLL/HSSE/QualityAudit/PersonQualityService.cs index 2eda2452..23058ce7 100644 --- a/SGGL/BLL/HSSE/QualityAudit/PersonQualityService.cs +++ b/SGGL/BLL/HSSE/QualityAudit/PersonQualityService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class PersonQualityService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取特殊岗位人员资质 diff --git a/SGGL/BLL/HSSE/QualityAudit/SafePersonQualityService.cs b/SGGL/BLL/HSSE/QualityAudit/SafePersonQualityService.cs index 55df88a1..e5becf79 100644 --- a/SGGL/BLL/HSSE/QualityAudit/SafePersonQualityService.cs +++ b/SGGL/BLL/HSSE/QualityAudit/SafePersonQualityService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class SafePersonQualityService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取安全人员资质 diff --git a/SGGL/BLL/HSSE/QualityAudit/SubUnitQualityAuditDetailService.cs b/SGGL/BLL/HSSE/QualityAudit/SubUnitQualityAuditDetailService.cs index 68df4968..04f78bfa 100644 --- a/SGGL/BLL/HSSE/QualityAudit/SubUnitQualityAuditDetailService.cs +++ b/SGGL/BLL/HSSE/QualityAudit/SubUnitQualityAuditDetailService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class SubUnitQualityAuditDetailService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取分包商资质审查明细 diff --git a/SGGL/BLL/HSSE/QualityAudit/SubUnitQualityService.cs b/SGGL/BLL/HSSE/QualityAudit/SubUnitQualityService.cs index 1ac4fa09..b0cf2cec 100644 --- a/SGGL/BLL/HSSE/QualityAudit/SubUnitQualityService.cs +++ b/SGGL/BLL/HSSE/QualityAudit/SubUnitQualityService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class SubUnitQualityService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取分包商资质 diff --git a/SGGL/BLL/HSSE/Resources/SignManageService.cs b/SGGL/BLL/HSSE/Resources/SignManageService.cs index 1f49cbff..fda52c34 100644 --- a/SGGL/BLL/HSSE/Resources/SignManageService.cs +++ b/SGGL/BLL/HSSE/Resources/SignManageService.cs @@ -7,7 +7,7 @@ public static class SignManageService { - public static Model.SGGLDB db = Funs.DB; + /// /// 获取标牌信息 diff --git a/SGGL/BLL/HSSE/SecuritySystem/SafetyOrganizationService.cs b/SGGL/BLL/HSSE/SecuritySystem/SafetyOrganizationService.cs index 6edcdeb3..9a9516c6 100644 --- a/SGGL/BLL/HSSE/SecuritySystem/SafetyOrganizationService.cs +++ b/SGGL/BLL/HSSE/SecuritySystem/SafetyOrganizationService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class SafetyOrganizationService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取安全管理机构信息 diff --git a/SGGL/BLL/HSSE/Solution/ConstructSolutionService.cs b/SGGL/BLL/HSSE/Solution/ConstructSolutionService.cs index a655086f..2d32a9f7 100644 --- a/SGGL/BLL/HSSE/Solution/ConstructSolutionService.cs +++ b/SGGL/BLL/HSSE/Solution/ConstructSolutionService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class ConstructSolutionService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取施工方案/审查 diff --git a/SGGL/BLL/HSSE/Solution/ExpertArgumentService.cs b/SGGL/BLL/HSSE/Solution/ExpertArgumentService.cs index 6cf86a2f..a8e193af 100644 --- a/SGGL/BLL/HSSE/Solution/ExpertArgumentService.cs +++ b/SGGL/BLL/HSSE/Solution/ExpertArgumentService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class ExpertArgumentService { - public static Model.SGGLDB db = Funs.DB; + #region 专家论证清单 /// diff --git a/SGGL/BLL/HSSE/Solution/SolutionTemplateService.cs b/SGGL/BLL/HSSE/Solution/SolutionTemplateService.cs index 01551273..fedf6cb8 100644 --- a/SGGL/BLL/HSSE/Solution/SolutionTemplateService.cs +++ b/SGGL/BLL/HSSE/Solution/SolutionTemplateService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class SolutionTemplateService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取方案模板 diff --git a/SGGL/BLL/HSSE/Technique/EmergencyService.cs b/SGGL/BLL/HSSE/Technique/EmergencyService.cs index 7a309ca2..0e6da8da 100644 --- a/SGGL/BLL/HSSE/Technique/EmergencyService.cs +++ b/SGGL/BLL/HSSE/Technique/EmergencyService.cs @@ -7,7 +7,7 @@ namespace BLL { public static class EmergencyService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取应急预案 diff --git a/SGGL/BLL/HSSE/Technique/EnvironmentalService.cs b/SGGL/BLL/HSSE/Technique/EnvironmentalService.cs index 9a4944bd..87b7d96b 100644 --- a/SGGL/BLL/HSSE/Technique/EnvironmentalService.cs +++ b/SGGL/BLL/HSSE/Technique/EnvironmentalService.cs @@ -4,7 +4,7 @@ namespace BLL { public static class EnvironmentalService { - public static Model.SGGLDB db = Funs.DB; + /// /// 获取环境危险源信息 diff --git a/SGGL/BLL/HSSE/Technique/HazardListService.cs b/SGGL/BLL/HSSE/Technique/HazardListService.cs index 902888a6..daac3e8d 100644 --- a/SGGL/BLL/HSSE/Technique/HazardListService.cs +++ b/SGGL/BLL/HSSE/Technique/HazardListService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class HazardListService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取危险源清单 diff --git a/SGGL/BLL/HSSE/Technique/HazardListTypeService.cs b/SGGL/BLL/HSSE/Technique/HazardListTypeService.cs index b607e741..ff1d9bd2 100644 --- a/SGGL/BLL/HSSE/Technique/HazardListTypeService.cs +++ b/SGGL/BLL/HSSE/Technique/HazardListTypeService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class HazardListTypeService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取危险源类型 diff --git a/SGGL/BLL/HSSE/Technique/RectifyItemService.cs b/SGGL/BLL/HSSE/Technique/RectifyItemService.cs index 4c11d7d9..098125f0 100644 --- a/SGGL/BLL/HSSE/Technique/RectifyItemService.cs +++ b/SGGL/BLL/HSSE/Technique/RectifyItemService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class RectifyItemService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取安全隐患明细 diff --git a/SGGL/BLL/HSSE/Technique/RectifyService.cs b/SGGL/BLL/HSSE/Technique/RectifyService.cs index d3477abd..76f56d9d 100644 --- a/SGGL/BLL/HSSE/Technique/RectifyService.cs +++ b/SGGL/BLL/HSSE/Technique/RectifyService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class RectifyService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取安全隐患 diff --git a/SGGL/BLL/HSSE/Technique/SpecialSchemeService.cs b/SGGL/BLL/HSSE/Technique/SpecialSchemeService.cs index 4a11214f..9bfa47e8 100644 --- a/SGGL/BLL/HSSE/Technique/SpecialSchemeService.cs +++ b/SGGL/BLL/HSSE/Technique/SpecialSchemeService.cs @@ -8,7 +8,7 @@ namespace BLL public static class SpecialSchemeService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取专项方案 diff --git a/SGGL/BLL/HSSE/Technique/Technique_CheckItemDetailService.cs b/SGGL/BLL/HSSE/Technique/Technique_CheckItemDetailService.cs index 3c013ec4..f85f9d48 100644 --- a/SGGL/BLL/HSSE/Technique/Technique_CheckItemDetailService.cs +++ b/SGGL/BLL/HSSE/Technique/Technique_CheckItemDetailService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class Technique_CheckItemDetailService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取检查项明细 diff --git a/SGGL/BLL/HSSE/Technique/Technique_CheckItemSetService.cs b/SGGL/BLL/HSSE/Technique/Technique_CheckItemSetService.cs index 02315d30..40b73522 100644 --- a/SGGL/BLL/HSSE/Technique/Technique_CheckItemSetService.cs +++ b/SGGL/BLL/HSSE/Technique/Technique_CheckItemSetService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class Technique_CheckItemSetService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取检查项 diff --git a/SGGL/BLL/JDGL/Check/ElectricalCompletionService.cs b/SGGL/BLL/JDGL/Check/ElectricalCompletionService.cs index 76a1eeef..8e070796 100644 --- a/SGGL/BLL/JDGL/Check/ElectricalCompletionService.cs +++ b/SGGL/BLL/JDGL/Check/ElectricalCompletionService.cs @@ -10,7 +10,7 @@ namespace BLL /// public class ElectricalCompletionService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取电气完成情况 diff --git a/SGGL/BLL/JDGL/Check/EquipmentCompletionService.cs b/SGGL/BLL/JDGL/Check/EquipmentCompletionService.cs index 7b2b8eec..e0183dc3 100644 --- a/SGGL/BLL/JDGL/Check/EquipmentCompletionService.cs +++ b/SGGL/BLL/JDGL/Check/EquipmentCompletionService.cs @@ -10,7 +10,7 @@ namespace BLL /// public class EquipmentCompletionService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取设备完成情况 diff --git a/SGGL/BLL/JDGL/Check/LowTankCompletionService.cs b/SGGL/BLL/JDGL/Check/LowTankCompletionService.cs index 13b0c617..e40944dc 100644 --- a/SGGL/BLL/JDGL/Check/LowTankCompletionService.cs +++ b/SGGL/BLL/JDGL/Check/LowTankCompletionService.cs @@ -10,7 +10,7 @@ namespace BLL /// public class LowTankCompletionService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取低温储罐完成情况 diff --git a/SGGL/BLL/JDGL/Check/MeterCompletionService.cs b/SGGL/BLL/JDGL/Check/MeterCompletionService.cs index d4e5919d..54e376fd 100644 --- a/SGGL/BLL/JDGL/Check/MeterCompletionService.cs +++ b/SGGL/BLL/JDGL/Check/MeterCompletionService.cs @@ -10,7 +10,7 @@ namespace BLL /// public class MeterCompletionService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取仪表完成情况 diff --git a/SGGL/BLL/JDGL/Check/MonthPlanService.cs b/SGGL/BLL/JDGL/Check/MonthPlanService.cs index 35b0e1f6..66465676 100644 --- a/SGGL/BLL/JDGL/Check/MonthPlanService.cs +++ b/SGGL/BLL/JDGL/Check/MonthPlanService.cs @@ -10,7 +10,7 @@ namespace BLL /// public class MonthPlanService { - //public static Model.SGGLDB db = Funs.DB; + // /// /// 根据主键获取月度计划情况 diff --git a/SGGL/BLL/JDGL/Check/PipelineCompletionService.cs b/SGGL/BLL/JDGL/Check/PipelineCompletionService.cs index d9a6a8e8..3e49808b 100644 --- a/SGGL/BLL/JDGL/Check/PipelineCompletionService.cs +++ b/SGGL/BLL/JDGL/Check/PipelineCompletionService.cs @@ -10,7 +10,7 @@ namespace BLL /// public class PipelineCompletionService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取管道完成情况 diff --git a/SGGL/BLL/JDGL/Check/ProgressCompletionService.cs b/SGGL/BLL/JDGL/Check/ProgressCompletionService.cs index 25a29434..c3d07f21 100644 --- a/SGGL/BLL/JDGL/Check/ProgressCompletionService.cs +++ b/SGGL/BLL/JDGL/Check/ProgressCompletionService.cs @@ -10,7 +10,7 @@ namespace BLL /// public class ProgressCompletionService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取进度完成情况 diff --git a/SGGL/BLL/JDGL/Check/QuantityCompletionService.cs b/SGGL/BLL/JDGL/Check/QuantityCompletionService.cs index ea800f4d..a0cc389a 100644 --- a/SGGL/BLL/JDGL/Check/QuantityCompletionService.cs +++ b/SGGL/BLL/JDGL/Check/QuantityCompletionService.cs @@ -10,7 +10,7 @@ namespace BLL /// public class QuantityCompletionService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取工程量完成情况 diff --git a/SGGL/BLL/JDGL/Check/QuantityListService.cs b/SGGL/BLL/JDGL/Check/QuantityListService.cs index 8da7eecb..7ff0321c 100644 --- a/SGGL/BLL/JDGL/Check/QuantityListService.cs +++ b/SGGL/BLL/JDGL/Check/QuantityListService.cs @@ -10,7 +10,7 @@ namespace BLL /// public class QuantityListService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取工程量清单 diff --git a/SGGL/BLL/JDGL/Check/SteelStructureCompletionService.cs b/SGGL/BLL/JDGL/Check/SteelStructureCompletionService.cs index 362df03c..996334ef 100644 --- a/SGGL/BLL/JDGL/Check/SteelStructureCompletionService.cs +++ b/SGGL/BLL/JDGL/Check/SteelStructureCompletionService.cs @@ -10,7 +10,7 @@ namespace BLL /// public class SteelStructureCompletionService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取钢结构完成情况 diff --git a/SGGL/BLL/JDGL/Check/UndergroundPipeCompletionService.cs b/SGGL/BLL/JDGL/Check/UndergroundPipeCompletionService.cs index 66d2406b..3ec7bb94 100644 --- a/SGGL/BLL/JDGL/Check/UndergroundPipeCompletionService.cs +++ b/SGGL/BLL/JDGL/Check/UndergroundPipeCompletionService.cs @@ -10,7 +10,7 @@ namespace BLL /// public class UndergroundPipeCompletionService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取全厂地下管网完成情况 diff --git a/SGGL/BLL/JDGL/Check/WeekPlanService.cs b/SGGL/BLL/JDGL/Check/WeekPlanService.cs index 4e9ca349..aae6c89f 100644 --- a/SGGL/BLL/JDGL/Check/WeekPlanService.cs +++ b/SGGL/BLL/JDGL/Check/WeekPlanService.cs @@ -10,7 +10,7 @@ namespace BLL /// public class WeekPlanService { - //public static Model.SGGLDB db = Funs.DB; + // /// /// 根据主键获取周计划情况 diff --git a/SGGL/BLL/JDGL/SGManPower/ManPowerPlanService.cs b/SGGL/BLL/JDGL/SGManPower/ManPowerPlanService.cs index 3fd4a548..19eeaf5d 100644 --- a/SGGL/BLL/JDGL/SGManPower/ManPowerPlanService.cs +++ b/SGGL/BLL/JDGL/SGManPower/ManPowerPlanService.cs @@ -6,7 +6,7 @@ namespace BLL { public class ManPowerPlanService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取施工人力计划情况 diff --git a/SGGL/BLL/JDGL/WBS/EquipmentMaterialBigTypeService.cs b/SGGL/BLL/JDGL/WBS/EquipmentMaterialBigTypeService.cs index bfed1238..d8a1e682 100644 --- a/SGGL/BLL/JDGL/WBS/EquipmentMaterialBigTypeService.cs +++ b/SGGL/BLL/JDGL/WBS/EquipmentMaterialBigTypeService.cs @@ -9,7 +9,7 @@ namespace BLL { public static class EquipmentMaterialBigTypeService { - public static Model.SGGLDB db = Funs.DB; + /// /// 获取实体集合 diff --git a/SGGL/BLL/JDGL/WBS/EquipmentMaterialTypeService.cs b/SGGL/BLL/JDGL/WBS/EquipmentMaterialTypeService.cs index b019f444..667a50b0 100644 --- a/SGGL/BLL/JDGL/WBS/EquipmentMaterialTypeService.cs +++ b/SGGL/BLL/JDGL/WBS/EquipmentMaterialTypeService.cs @@ -9,7 +9,7 @@ namespace BLL { public static class EquipmentMaterialTypeService { - public static Model.SGGLDB db = Funs.DB; + /// /// 获取实体集合 diff --git a/SGGL/BLL/JDGL/WBS/WorkloadStatisticsService.cs b/SGGL/BLL/JDGL/WBS/WorkloadStatisticsService.cs index 5586385e..5794faf7 100644 --- a/SGGL/BLL/JDGL/WBS/WorkloadStatisticsService.cs +++ b/SGGL/BLL/JDGL/WBS/WorkloadStatisticsService.cs @@ -7,7 +7,7 @@ namespace BLL { public static class WorkloadStatisticsService { - public static Model.SGGLDB db = Funs.DB; + /// /// 获取模拟树表格 diff --git a/SGGL/BLL/Notice/NoticeService.cs b/SGGL/BLL/Notice/NoticeService.cs index 9118f2c0..8be37032 100644 --- a/SGGL/BLL/Notice/NoticeService.cs +++ b/SGGL/BLL/Notice/NoticeService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class NoticeService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取通知 diff --git a/SGGL/BLL/OfficeCheck/ProjectEvaluation/ProjectEvaluationService.cs b/SGGL/BLL/OfficeCheck/ProjectEvaluation/ProjectEvaluationService.cs index 8784ec25..8840ceb4 100644 --- a/SGGL/BLL/OfficeCheck/ProjectEvaluation/ProjectEvaluationService.cs +++ b/SGGL/BLL/OfficeCheck/ProjectEvaluation/ProjectEvaluationService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class ProjectEvaluationService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取项目绩效评价 diff --git a/SGGL/BLL/PZHGL/GJSX/GJSXItemService.cs b/SGGL/BLL/PZHGL/GJSX/GJSXItemService.cs index cc17cf6c..b21b20e2 100644 --- a/SGGL/BLL/PZHGL/GJSX/GJSXItemService.cs +++ b/SGGL/BLL/PZHGL/GJSX/GJSXItemService.cs @@ -12,7 +12,7 @@ namespace BLL /// public static class GJSXItemService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据关键事项ID查询所有关键事项进展 @@ -31,7 +31,7 @@ namespace BLL /// public static System.Collections.IEnumerable GetIEnumerableByGJSXID(string GJSXID) { - return from x in db.GJSX_detail + return from x in Funs.DB.GJSX_detail where x.GJSXID == GJSXID orderby x.Sort select new @@ -155,6 +155,7 @@ namespace BLL /// public static bool IsExistOperateionId(string GJSXID, string operationId) { + Model.SGGLDB db = Funs.DB; var q = from x in db.GJSX_detail where x.GJSXID == GJSXID && x.Progress_user == operationId select x; if (q.Count() > 0) { diff --git a/SGGL/BLL/PZHGL/GJSX/GJSXMonitorService.cs b/SGGL/BLL/PZHGL/GJSX/GJSXMonitorService.cs index 1fb11917..4c23df69 100644 --- a/SGGL/BLL/PZHGL/GJSX/GJSXMonitorService.cs +++ b/SGGL/BLL/PZHGL/GJSX/GJSXMonitorService.cs @@ -21,7 +21,7 @@ namespace BLL { public static class GJSXMonitorService { - //public static Model.SGGLDB db = Funs.DB; + // /// /// 关键事项新增通知提醒责任人、抄送人 diff --git a/SGGL/BLL/PZHGL/GJSX/GJSXProcessService.cs b/SGGL/BLL/PZHGL/GJSX/GJSXProcessService.cs index eac0f768..762e7a95 100644 --- a/SGGL/BLL/PZHGL/GJSX/GJSXProcessService.cs +++ b/SGGL/BLL/PZHGL/GJSX/GJSXProcessService.cs @@ -8,7 +8,7 @@ namespace BLL { public static class GJSXProcessService { - public static Model.SGGLDB db = Funs.DB; + /// /// 添加 diff --git a/SGGL/BLL/PZHGL/GJSX/GJSXService.cs b/SGGL/BLL/PZHGL/GJSX/GJSXService.cs index dd15f6d3..7320659a 100644 --- a/SGGL/BLL/PZHGL/GJSX/GJSXService.cs +++ b/SGGL/BLL/PZHGL/GJSX/GJSXService.cs @@ -8,7 +8,7 @@ namespace BLL { public static class GJSXService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取信息 @@ -104,6 +104,7 @@ namespace BLL public static System.Collections.IEnumerable GetListData(string projectId) { + Model.SGGLDB db = Funs.DB; IQueryable q = GetGJSXList().AsQueryable(); if (!string.IsNullOrEmpty(projectId)) diff --git a/SGGL/BLL/PZHGL/InformationProject/ConstructionLogService.cs b/SGGL/BLL/PZHGL/InformationProject/ConstructionLogService.cs index 3bc462ae..0171768e 100644 --- a/SGGL/BLL/PZHGL/InformationProject/ConstructionLogService.cs +++ b/SGGL/BLL/PZHGL/InformationProject/ConstructionLogService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class ConstructionLogService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取项目级施工日志 diff --git a/SGGL/BLL/PZHGL/InformationProject/ConstructionPlanApproveService.cs b/SGGL/BLL/PZHGL/InformationProject/ConstructionPlanApproveService.cs index 68bd0093..c7072902 100644 --- a/SGGL/BLL/PZHGL/InformationProject/ConstructionPlanApproveService.cs +++ b/SGGL/BLL/PZHGL/InformationProject/ConstructionPlanApproveService.cs @@ -9,7 +9,7 @@ namespace BLL { public class ConstructionPlanApproveService { - public static Model.SGGLDB db = Funs.DB; + /// /// 获取分页列表 @@ -17,6 +17,7 @@ namespace BLL /// public static IEnumerable getListData(string ConstructionPlanId) { + Model.SGGLDB db = Funs.DB; return from x in db.ZHGL_ConstructionPlanApprove where x.ConstructionPlanId == ConstructionPlanId && x.ApproveDate != null orderby x.ApproveDate @@ -98,6 +99,7 @@ namespace BLL /// 一个总承包商施工计划审批实体 public static Model.ZHGL_ConstructionPlanApprove GetConstructionPlanApproveByConstructionPlanId(string constructionPlanId) { + Model.SGGLDB db = Funs.DB; return db.ZHGL_ConstructionPlanApprove.FirstOrDefault(x => x.ConstructionPlanId == constructionPlanId && x.ApproveDate == null); } /// @@ -120,6 +122,7 @@ namespace BLL public static Model.ZHGL_ConstructionPlanApprove GetComplie(string ConstructionPlanId) { + Model.SGGLDB db = Funs.DB; return db.ZHGL_ConstructionPlanApprove.FirstOrDefault(x => x.ConstructionPlanId == ConstructionPlanId && x.ApproveType == BLL.Const.ConstructionPlan_Compile); } public static Model.ZHGL_ConstructionPlanApprove GetConstructionPlanApproveById(string ConstructionPlanApproveId) diff --git a/SGGL/BLL/PZHGL/InformationProject/ConstructionPlanService.cs b/SGGL/BLL/PZHGL/InformationProject/ConstructionPlanService.cs index 88a1cffb..42403552 100644 --- a/SGGL/BLL/PZHGL/InformationProject/ConstructionPlanService.cs +++ b/SGGL/BLL/PZHGL/InformationProject/ConstructionPlanService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class ConstructionPlanService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取总承包商施工计划 diff --git a/SGGL/BLL/PZHGL/InformationProject/ConstructionReportApproveService.cs b/SGGL/BLL/PZHGL/InformationProject/ConstructionReportApproveService.cs index e37b07ce..376b8620 100644 --- a/SGGL/BLL/PZHGL/InformationProject/ConstructionReportApproveService.cs +++ b/SGGL/BLL/PZHGL/InformationProject/ConstructionReportApproveService.cs @@ -9,7 +9,7 @@ namespace BLL { public class ConstructionReportApproveService { - public static Model.SGGLDB db = Funs.DB; + /// /// 获取分页列表 @@ -17,6 +17,7 @@ namespace BLL /// public static IEnumerable getListData(string ConstructionReportId) { + Model.SGGLDB db = Funs.DB; return from x in db.ZHGL_ConstructionReportApprove where x.ConstructionReportId == ConstructionReportId && x.ApproveDate != null orderby x.ApproveDate @@ -98,6 +99,7 @@ namespace BLL /// 一个总承包商施工报告审批实体 public static Model.ZHGL_ConstructionReportApprove GetConstructionReportApproveByConstructionReportId(string constructionReportId) { + Model.SGGLDB db = Funs.DB; return db.ZHGL_ConstructionReportApprove.FirstOrDefault(x => x.ConstructionReportId == constructionReportId && x.ApproveDate == null); } /// @@ -120,6 +122,7 @@ namespace BLL public static Model.ZHGL_ConstructionReportApprove GetComplie(string ConstructionReportId) { + Model.SGGLDB db = Funs.DB; return db.ZHGL_ConstructionReportApprove.FirstOrDefault(x => x.ConstructionReportId == ConstructionReportId && x.ApproveType == BLL.Const.ConstructionReport_Compile); } public static Model.ZHGL_ConstructionReportApprove GetConstructionReportApproveById(string ConstructionReportApproveId) diff --git a/SGGL/BLL/PZHGL/InformationProject/ConstructionReportService.cs b/SGGL/BLL/PZHGL/InformationProject/ConstructionReportService.cs index 13bb1470..55c226a2 100644 --- a/SGGL/BLL/PZHGL/InformationProject/ConstructionReportService.cs +++ b/SGGL/BLL/PZHGL/InformationProject/ConstructionReportService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class ConstructionReportService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取总承包商施工报告 diff --git a/SGGL/BLL/PZHGL/InformationProject/PictureService.cs b/SGGL/BLL/PZHGL/InformationProject/PictureService.cs index b0d7314a..bf8c3570 100644 --- a/SGGL/BLL/PZHGL/InformationProject/PictureService.cs +++ b/SGGL/BLL/PZHGL/InformationProject/PictureService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class PictureService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取项目图片 diff --git a/SGGL/BLL/PZHGL/InformationProject/ReceiveFileManagerService.cs b/SGGL/BLL/PZHGL/InformationProject/ReceiveFileManagerService.cs index 1ef9ed96..42f53062 100644 --- a/SGGL/BLL/PZHGL/InformationProject/ReceiveFileManagerService.cs +++ b/SGGL/BLL/PZHGL/InformationProject/ReceiveFileManagerService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class ReceiveFileManagerService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取一般来文 @@ -166,6 +166,7 @@ namespace BLL /// public static void IssueReceiveFile(string receiveFileManagerId) { + Model.SGGLDB db = Funs.DB; var getFile = Funs.DB.InformationProject_ReceiveFileManager.FirstOrDefault(x => x.ReceiveFileManagerId == receiveFileManagerId); if (getFile != null && getFile.FileType == "1") { diff --git a/SGGL/BLL/PZHGL/InformationProject/WorkHandoverApproveService.cs b/SGGL/BLL/PZHGL/InformationProject/WorkHandoverApproveService.cs index 7f208a59..cb5c453d 100644 --- a/SGGL/BLL/PZHGL/InformationProject/WorkHandoverApproveService.cs +++ b/SGGL/BLL/PZHGL/InformationProject/WorkHandoverApproveService.cs @@ -9,7 +9,7 @@ namespace BLL { public class WorkHandoverApproveService { - public static Model.SGGLDB db = Funs.DB; + /// /// 获取分页列表 @@ -17,6 +17,7 @@ namespace BLL /// public static IEnumerable getListData(string WorkHandoverId) { + Model.SGGLDB db = Funs.DB; return from x in db.ZHGL_WorkHandoverApprove where x.WorkHandoverId == WorkHandoverId && x.ApproveDate != null orderby x.ApproveDate @@ -98,6 +99,7 @@ namespace BLL /// 一个工作交接审批实体 public static Model.ZHGL_WorkHandoverApprove GetWorkHandoverApproveByWorkHandoverId(string constructionPlanId) { + Model.SGGLDB db = Funs.DB; return db.ZHGL_WorkHandoverApprove.FirstOrDefault(x => x.WorkHandoverId == constructionPlanId && x.ApproveDate == null); } /// @@ -120,6 +122,7 @@ namespace BLL public static Model.ZHGL_WorkHandoverApprove GetComplie(string WorkHandoverId) { + Model.SGGLDB db = Funs.DB; return db.ZHGL_WorkHandoverApprove.FirstOrDefault(x => x.WorkHandoverId == WorkHandoverId && x.ApproveType == BLL.Const.WorkHandover_Compile); } public static Model.ZHGL_WorkHandoverApprove GetWorkHandoverApproveById(string WorkHandoverApproveId) diff --git a/SGGL/BLL/PZHGL/InformationProject/WorkHandoverDetailService.cs b/SGGL/BLL/PZHGL/InformationProject/WorkHandoverDetailService.cs index e51e2e24..69d4c8c7 100644 --- a/SGGL/BLL/PZHGL/InformationProject/WorkHandoverDetailService.cs +++ b/SGGL/BLL/PZHGL/InformationProject/WorkHandoverDetailService.cs @@ -9,7 +9,7 @@ namespace BLL { public class WorkHandoverDetailService { - public static Model.SGGLDB db = Funs.DB; + /// /// 获取工作交接明细列表 @@ -19,6 +19,7 @@ namespace BLL /// public static IEnumerable getListData(string WorkHandoverId) { + Model.SGGLDB db = Funs.DB; return from x in db.ZHGL_WorkHandoverDetail where x.WorkHandoverId == WorkHandoverId select new diff --git a/SGGL/BLL/PZHGL/InformationProject/WorkHandoverService.cs b/SGGL/BLL/PZHGL/InformationProject/WorkHandoverService.cs index e3d06d77..723046e2 100644 --- a/SGGL/BLL/PZHGL/InformationProject/WorkHandoverService.cs +++ b/SGGL/BLL/PZHGL/InformationProject/WorkHandoverService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class WorkHandoverService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取工作交接 diff --git a/SGGL/BLL/PZHGL/ProjectData/ProjectMapService.cs b/SGGL/BLL/PZHGL/ProjectData/ProjectMapService.cs index f43308b7..1350fb2b 100644 --- a/SGGL/BLL/PZHGL/ProjectData/ProjectMapService.cs +++ b/SGGL/BLL/PZHGL/ProjectData/ProjectMapService.cs @@ -7,7 +7,7 @@ namespace BLL /// public static class ProjectMapService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取项目地图 diff --git a/SGGL/BLL/Person/PersonTotalService.cs b/SGGL/BLL/Person/PersonTotalService.cs index bda7de92..db74a6e3 100644 --- a/SGGL/BLL/Person/PersonTotalService.cs +++ b/SGGL/BLL/Person/PersonTotalService.cs @@ -8,7 +8,7 @@ namespace BLL { public static class PersonTotalService { - public static Model.SGGLDB db = Funs.DB; + /// /// 获取人员信息 diff --git a/SGGL/BLL/Person/Person_DutyService.cs b/SGGL/BLL/Person/Person_DutyService.cs index 8938da72..bbb5c1c1 100644 --- a/SGGL/BLL/Person/Person_DutyService.cs +++ b/SGGL/BLL/Person/Person_DutyService.cs @@ -8,7 +8,7 @@ namespace BLL { public static class Person_DutyService { - public static Model.SGGLDB db = Funs.DB; + /// /// 获取人员信息 /// diff --git a/SGGL/BLL/Person/Person_DutyTemplateService.cs b/SGGL/BLL/Person/Person_DutyTemplateService.cs index cb6d1a38..682f2418 100644 --- a/SGGL/BLL/Person/Person_DutyTemplateService.cs +++ b/SGGL/BLL/Person/Person_DutyTemplateService.cs @@ -8,7 +8,7 @@ namespace BLL { public static class Person_DutyTemplateService { - public static Model.SGGLDB db = Funs.DB; + /// /// 获取员工责任书模板信息 /// diff --git a/SGGL/BLL/Person/Person_MeetingService.cs b/SGGL/BLL/Person/Person_MeetingService.cs index f1ed4d7f..5fdf2461 100644 --- a/SGGL/BLL/Person/Person_MeetingService.cs +++ b/SGGL/BLL/Person/Person_MeetingService.cs @@ -5,7 +5,7 @@ namespace BLL { public class Person_MeetingService { - public static Model.SGGLDB db = Funs.DB; + /// /// 获取实体集合 diff --git a/SGGL/BLL/Person/Person_QuarterCheckApproveService.cs b/SGGL/BLL/Person/Person_QuarterCheckApproveService.cs index b94fc78e..b72a1362 100644 --- a/SGGL/BLL/Person/Person_QuarterCheckApproveService.cs +++ b/SGGL/BLL/Person/Person_QuarterCheckApproveService.cs @@ -8,7 +8,7 @@ namespace BLL { public static class Person_QuarterCheckApproveService { - public static Model.SGGLDB db = Funs.DB; + /// /// 获取人员信息 diff --git a/SGGL/BLL/Person/Person_QuarterCheckItemService.cs b/SGGL/BLL/Person/Person_QuarterCheckItemService.cs index caabc45b..e5736ed1 100644 --- a/SGGL/BLL/Person/Person_QuarterCheckItemService.cs +++ b/SGGL/BLL/Person/Person_QuarterCheckItemService.cs @@ -8,7 +8,7 @@ namespace BLL { public static class Person_QuarterCheckItemService { - public static Model.SGGLDB db = Funs.DB; + /// /// 获取人员信息 diff --git a/SGGL/BLL/Person/Person_QuarterCheckService.cs b/SGGL/BLL/Person/Person_QuarterCheckService.cs index 637056ff..2457f704 100644 --- a/SGGL/BLL/Person/Person_QuarterCheckService.cs +++ b/SGGL/BLL/Person/Person_QuarterCheckService.cs @@ -9,7 +9,7 @@ namespace BLL { public static class Person_QuarterCheckService { - public static Model.SGGLDB db = Funs.DB; + /// /// 获取人员信息 diff --git a/SGGL/BLL/Person/Person_ShuntApproveService.cs b/SGGL/BLL/Person/Person_ShuntApproveService.cs index 17be954c..33a8da0f 100644 --- a/SGGL/BLL/Person/Person_ShuntApproveService.cs +++ b/SGGL/BLL/Person/Person_ShuntApproveService.cs @@ -9,7 +9,7 @@ namespace BLL { public class Person_ShuntApproveService { - public static Model.SGGLDB db = Funs.DB; + /// /// 获取分流管理模板列表 @@ -19,6 +19,7 @@ namespace BLL /// public static IEnumerable getListData(string ShuntId) { + Model.SGGLDB db = Funs.DB; return from x in db.Person_ShuntApprove where x.ShuntId == ShuntId && x.ApproveDate != null orderby x.ApproveDate @@ -41,7 +42,7 @@ namespace BLL /// 一个分流管理审批实体 public static Model.Person_ShuntApprove GetShuntApproveByShuntApproveId(string ShuntApproveId) { - return db.Person_ShuntApprove.FirstOrDefault(x => x.ShuntApproveId == ShuntApproveId); + return Funs.DB.Person_ShuntApprove.FirstOrDefault(x => x.ShuntApproveId == ShuntApproveId); } /// @@ -51,7 +52,7 @@ namespace BLL /// 一个分流管理审批实体 public static Model.Person_ShuntApprove GetShuntApproveByShuntId(string ShuntId) { - return db.Person_ShuntApprove.FirstOrDefault(x => x.ShuntId == ShuntId && x.ApproveDate == null); + return Funs.DB.Person_ShuntApprove.FirstOrDefault(x => x.ShuntId == ShuntId && x.ApproveDate == null); } /// @@ -61,17 +62,17 @@ namespace BLL /// 一个分流管理审批实体 public static Model.Person_ShuntApprove GetShuntApproveByApproveId(string approveId) { - return db.Person_ShuntApprove.FirstOrDefault(x => x.ShuntApproveId == approveId); + return Funs.DB.Person_ShuntApprove.FirstOrDefault(x => x.ShuntApproveId == approveId); } public static Model.Person_ShuntApprove GetComplie(string ShuntId) { - return db.Person_ShuntApprove.FirstOrDefault(x => x.ShuntId == ShuntId && x.ApproveType == BLL.Const.Shunt_Compile); + return Funs.DB.Person_ShuntApprove.FirstOrDefault(x => x.ShuntId == ShuntId && x.ApproveType == BLL.Const.Shunt_Compile); } public static Model.Person_ShuntApprove GetAudit(string ShuntId) { - return db.Person_ShuntApprove.FirstOrDefault(x => x.ShuntId == ShuntId && x.ApproveType == BLL.Const.Shunt_Audit); + return Funs.DB.Person_ShuntApprove.FirstOrDefault(x => x.ShuntId == ShuntId && x.ApproveType == BLL.Const.Shunt_Audit); } /// @@ -81,7 +82,7 @@ namespace BLL /// 分流管理审批集合 public static List GetShuntApprovesByShuntApproveId(string ShuntApproveId) { - return (from x in db.Person_ShuntApprove where x.ShuntApproveId == ShuntApproveId select x).ToList(); + return (from x in Funs.DB.Person_ShuntApprove where x.ShuntApproveId == ShuntApproveId select x).ToList(); } /// diff --git a/SGGL/BLL/Person/Person_TrainingPlanService.cs b/SGGL/BLL/Person/Person_TrainingPlanService.cs index abc04e2f..cd739dd2 100644 --- a/SGGL/BLL/Person/Person_TrainingPlanService.cs +++ b/SGGL/BLL/Person/Person_TrainingPlanService.cs @@ -8,7 +8,7 @@ namespace BLL { public static class Person_TrainingPlanService { - public static Model.SGGLDB db = Funs.DB; + /// /// 获取人员信息 /// diff --git a/SGGL/BLL/PersonManage/Test/ServerTestPlanService.cs b/SGGL/BLL/PersonManage/Test/ServerTestPlanService.cs index eebb2f61..3400cfa3 100644 --- a/SGGL/BLL/PersonManage/Test/ServerTestPlanService.cs +++ b/SGGL/BLL/PersonManage/Test/ServerTestPlanService.cs @@ -9,7 +9,7 @@ namespace BLL /// public static class ServerTestPlanService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取知识竞赛计划 diff --git a/SGGL/BLL/PersonManage/Test/ServerTestPlanTrainingService.cs b/SGGL/BLL/PersonManage/Test/ServerTestPlanTrainingService.cs index e8a91ac5..8c56f443 100644 --- a/SGGL/BLL/PersonManage/Test/ServerTestPlanTrainingService.cs +++ b/SGGL/BLL/PersonManage/Test/ServerTestPlanTrainingService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class ServerTestPlanTrainingService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取知识竞赛计划 diff --git a/SGGL/BLL/PersonManage/Test/ServerTestRecordService.cs b/SGGL/BLL/PersonManage/Test/ServerTestRecordService.cs index 343c3520..d3002b42 100644 --- a/SGGL/BLL/PersonManage/Test/ServerTestRecordService.cs +++ b/SGGL/BLL/PersonManage/Test/ServerTestRecordService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class ServerTestRecordService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取考试记录 diff --git a/SGGL/BLL/ProjectData/MainItemService.cs b/SGGL/BLL/ProjectData/MainItemService.cs index 0e112534..61d1e8ab 100644 --- a/SGGL/BLL/ProjectData/MainItemService.cs +++ b/SGGL/BLL/ProjectData/MainItemService.cs @@ -10,7 +10,7 @@ namespace BLL { public class MainItemService { - public static Model.SGGLDB db = Funs.DB; + /// /// 记录数 @@ -21,10 +21,10 @@ namespace BLL set; } - /// - /// 定义变量 - /// - private static IQueryable qq = from x in db.ProjectData_MainItem select x; + ///// + ///// 定义变量 + ///// + //private static IQueryable qq = from x in Funs.DB.ProjectData_MainItem select x; /// diff --git a/SGGL/BLL/ProjectData/ProjectSateService.cs b/SGGL/BLL/ProjectData/ProjectSateService.cs index e9c1205e..f3bcdb04 100644 --- a/SGGL/BLL/ProjectData/ProjectSateService.cs +++ b/SGGL/BLL/ProjectData/ProjectSateService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class ProjectSateService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取项目状态及软件关闭信息 diff --git a/SGGL/BLL/ProjectData/ProjectSetMapService.cs b/SGGL/BLL/ProjectData/ProjectSetMapService.cs index 8e4a0ca4..6cd35eda 100644 --- a/SGGL/BLL/ProjectData/ProjectSetMapService.cs +++ b/SGGL/BLL/ProjectData/ProjectSetMapService.cs @@ -6,7 +6,7 @@ public static class ProjectSetMapService { - public static Model.SGGLDB db = Funs.DB; + /// ///获取项目坐标点 diff --git a/SGGL/BLL/ProjectData/ProjectUnitService.cs b/SGGL/BLL/ProjectData/ProjectUnitService.cs index c1f3a705..28f1cd4e 100644 --- a/SGGL/BLL/ProjectData/ProjectUnitService.cs +++ b/SGGL/BLL/ProjectData/ProjectUnitService.cs @@ -6,7 +6,7 @@ public static class ProjectUnitService { - public static Model.SGGLDB db = Funs.DB; + /// ///获取项目单位信息 @@ -179,6 +179,7 @@ /// public static void DeleteProjectUnitByProjectId(string projectId) { + Model.SGGLDB db = Funs.DB; var q = (from x in db.Project_ProjectUnit where x.ProjectId == projectId select x).ToList(); if (q != null) { diff --git a/SGGL/BLL/ProjectData/TeamGroupService.cs b/SGGL/BLL/ProjectData/TeamGroupService.cs index bb051631..cb30f022 100644 --- a/SGGL/BLL/ProjectData/TeamGroupService.cs +++ b/SGGL/BLL/ProjectData/TeamGroupService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class TeamGroupService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取班组信息 diff --git a/SGGL/BLL/ProjectData/UnitWorkService.cs b/SGGL/BLL/ProjectData/UnitWorkService.cs index 884d35cc..688906a7 100644 --- a/SGGL/BLL/ProjectData/UnitWorkService.cs +++ b/SGGL/BLL/ProjectData/UnitWorkService.cs @@ -10,7 +10,7 @@ namespace BLL { public class UnitWorkService { - public static Model.SGGLDB db = Funs.DB; + /// /// 添加单位工程信息 diff --git a/SGGL/BLL/SysManage/DepartService.cs b/SGGL/BLL/SysManage/DepartService.cs index 239a78da..efbd7b66 100644 --- a/SGGL/BLL/SysManage/DepartService.cs +++ b/SGGL/BLL/SysManage/DepartService.cs @@ -7,7 +7,7 @@ namespace BLL { public static class DepartService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取信息 diff --git a/SGGL/BLL/SysManage/LogService.cs b/SGGL/BLL/SysManage/LogService.cs index 2f034fa1..d4613298 100644 --- a/SGGL/BLL/SysManage/LogService.cs +++ b/SGGL/BLL/SysManage/LogService.cs @@ -7,7 +7,7 @@ namespace BLL public static class LogService { - public static Model.SGGLDB db = Funs.DB; + /// /// Ӳ־ diff --git a/SGGL/BLL/SysManage/RoleItemService.cs b/SGGL/BLL/SysManage/RoleItemService.cs index 15158f87..81a7de79 100644 --- a/SGGL/BLL/SysManage/RoleItemService.cs +++ b/SGGL/BLL/SysManage/RoleItemService.cs @@ -8,7 +8,7 @@ namespace BLL { public static class RoleItemService { - public static Model.SGGLDB db = Funs.DB; + /// /// 获取角色明细信息 diff --git a/SGGL/BLL/SysManage/RoleService.cs b/SGGL/BLL/SysManage/RoleService.cs index 8706734f..a953b73c 100644 --- a/SGGL/BLL/SysManage/RoleService.cs +++ b/SGGL/BLL/SysManage/RoleService.cs @@ -7,7 +7,7 @@ public static class RoleService { - public static Model.SGGLDB db = Funs.DB; + /// /// 获取角色信息 diff --git a/SGGL/BLL/SysManage/SysHttplogService.cs b/SGGL/BLL/SysManage/SysHttplogService.cs index bec05059..c1bba712 100644 --- a/SGGL/BLL/SysManage/SysHttplogService.cs +++ b/SGGL/BLL/SysManage/SysHttplogService.cs @@ -11,7 +11,7 @@ namespace BLL public static class SysHttplogService { - public static Model.SGGLDB db = Funs.DB; + #region 获取列表 @@ -25,6 +25,7 @@ namespace BLL } public static List GetSys_HttpLogByModle(Model.Sys_HttpLog table) { + Model.SGGLDB db = Funs.DB; var q = from x in db.Sys_HttpLog where (string.IsNullOrEmpty(table.HttpLogId) || x.HttpLogId.Contains(table.HttpLogId)) && @@ -74,13 +75,14 @@ namespace BLL public static Model.Sys_HttpLog GetSys_HttpLogById(string HttpLogId) { + Model.SGGLDB db = Funs.DB; return db.Sys_HttpLog.FirstOrDefault(x => x.HttpLogId == HttpLogId); } public static void AddSys_HttpLog(Model.Sys_HttpLog newtable) { - + Model.SGGLDB db = Funs.DB; Model.Sys_HttpLog table = new Model.Sys_HttpLog { HttpLogId = newtable.HttpLogId, @@ -96,7 +98,7 @@ namespace BLL public static void AddBulkSys_HttpLog(List newtables) { - + Model.SGGLDB db = Funs.DB; db.Sys_HttpLog.InsertAllOnSubmit(newtables); db.SubmitChanges(); } @@ -104,7 +106,7 @@ namespace BLL public static void UpdateSys_HttpLog(Model.Sys_HttpLog newtable) { - + Model.SGGLDB db = Funs.DB; Model.Sys_HttpLog table = db.Sys_HttpLog.FirstOrDefault(x => x.HttpLogId == newtable.HttpLogId); if (table != null) { @@ -120,7 +122,7 @@ namespace BLL } public static void DeleteSys_HttpLogById(string HttpLogId) { - + Model.SGGLDB db = Funs.DB; Model.Sys_HttpLog table = db.Sys_HttpLog.FirstOrDefault(x => x.HttpLogId == HttpLogId); if (table != null) { @@ -132,6 +134,7 @@ namespace BLL public static void DeleteALLSys_HttpLog() { + Model.SGGLDB db = Funs.DB; if (db.Sys_HttpLog != null) { db.Sys_HttpLog.DeleteAllOnSubmit(db.Sys_HttpLog); diff --git a/SGGL/BLL/SysManage/SysMenuService.cs b/SGGL/BLL/SysManage/SysMenuService.cs index 4dd8d250..62e1d6fb 100644 --- a/SGGL/BLL/SysManage/SysMenuService.cs +++ b/SGGL/BLL/SysManage/SysMenuService.cs @@ -8,7 +8,7 @@ namespace BLL { public static class SysMenuService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据MenuId获取菜单名称项 diff --git a/SGGL/BLL/SysManage/UnitService.cs b/SGGL/BLL/SysManage/UnitService.cs index f87eebc7..be619345 100644 --- a/SGGL/BLL/SysManage/UnitService.cs +++ b/SGGL/BLL/SysManage/UnitService.cs @@ -13,7 +13,7 @@ namespace BLL /// public static class UnitService { - public static Model.SGGLDB db = Funs.DB; + /// /// 获取单位信息 diff --git a/SGGL/BLL/SysManage/UserService.cs b/SGGL/BLL/SysManage/UserService.cs index e199e510..5f373b66 100644 --- a/SGGL/BLL/SysManage/UserService.cs +++ b/SGGL/BLL/SysManage/UserService.cs @@ -8,7 +8,7 @@ namespace BLL public static class UserService { - public static Model.SGGLDB db = Funs.DB; + /// /// ȡûϢ diff --git a/SGGL/BLL/TaskScheduling/InterFaceService/DataForJTApiService.cs b/SGGL/BLL/TaskScheduling/InterFaceService/DataForJTApiService.cs index e9405578..e6563130 100644 --- a/SGGL/BLL/TaskScheduling/InterFaceService/DataForJTApiService.cs +++ b/SGGL/BLL/TaskScheduling/InterFaceService/DataForJTApiService.cs @@ -6,7 +6,7 @@ namespace BLL public static class DataForJTApiService { - public static Model.SGGLDB db = Funs.DB; + /// /// ȡӿϢ diff --git a/SGGL/BLL/TaskScheduling/InterFaceService/InterFaceLogService .cs b/SGGL/BLL/TaskScheduling/InterFaceService/InterFaceLogService .cs index a0a99bf3..87e97c29 100644 --- a/SGGL/BLL/TaskScheduling/InterFaceService/InterFaceLogService .cs +++ b/SGGL/BLL/TaskScheduling/InterFaceService/InterFaceLogService .cs @@ -8,7 +8,7 @@ namespace BLL public static class InterFaceLogService { - public static Model.SGGLDB db = Funs.DB; + public const string Type1 = "上报"; public const string Type2 = "下发"; @@ -25,6 +25,7 @@ namespace BLL } public static IQueryable GetInterFaceLogByModle(Model.InterFaceLog table) { + Model.SGGLDB db = Funs.DB; var q = from x in db.InterFaceLog where (string.IsNullOrEmpty(table.InterFaceLogId) || x.InterFaceLogId.Contains(table.InterFaceLogId)) && @@ -81,6 +82,7 @@ namespace BLL public static Model.InterFaceLog GetInterFaceLogById(string InterFaceLogId) { + Model.SGGLDB db = Funs.DB; return db.InterFaceLog.FirstOrDefault(x => x.InterFaceLogId == InterFaceLogId); } @@ -142,7 +144,7 @@ namespace BLL public static void UpdateInterFaceLog(Model.InterFaceLog newtable) { - + Model.SGGLDB db = Funs.DB; Model.InterFaceLog table = db.InterFaceLog.FirstOrDefault(x => x.InterFaceLogId == newtable.InterFaceLogId); if (table != null) { diff --git a/SGGL/BLL/TaskScheduling/InterFaceService/InterFaceTaskService .cs b/SGGL/BLL/TaskScheduling/InterFaceService/InterFaceTaskService .cs index 9fa0f538..1c31d117 100644 --- a/SGGL/BLL/TaskScheduling/InterFaceService/InterFaceTaskService .cs +++ b/SGGL/BLL/TaskScheduling/InterFaceService/InterFaceTaskService .cs @@ -15,7 +15,7 @@ namespace BLL public static class InterFaceTaskService { - public static Model.SGGLDB db = Funs.DB; + #region 获取列表 @@ -29,6 +29,7 @@ namespace BLL } public static List GetInterFaceTaskByModle(Model.InterFaceTask table) { + Model.SGGLDB db = Funs.DB; var q = from x in db.InterFaceTask where (string.IsNullOrEmpty(table.InterFaceTaskId) || x.InterFaceTaskId.Contains(table.InterFaceTaskId)) && @@ -73,11 +74,12 @@ namespace BLL public static Model.InterFaceTask GetInterFaceTaskById(string InterFaceTaskId) { + Model.SGGLDB db = Funs.DB; return db.InterFaceTask.FirstOrDefault(x => x.InterFaceTaskId == InterFaceTaskId); } public static void AddInterFaceTask(Model.InterFaceTask newtable) { - + Model.SGGLDB db = Funs.DB; Model.InterFaceTask table = new Model.InterFaceTask { InterFaceTaskId = newtable.InterFaceTaskId, @@ -94,7 +96,7 @@ namespace BLL public static void UpdateInterFaceTask(Model.InterFaceTask newtable) { - + Model.SGGLDB db = Funs.DB; Model.InterFaceTask table = db.InterFaceTask.FirstOrDefault(x => x.InterFaceTaskId == newtable.InterFaceTaskId); if (table != null) { @@ -110,7 +112,7 @@ namespace BLL } public static void DeleteInterFaceTaskById(string InterFaceTaskId) { - + Model.SGGLDB db = Funs.DB; Model.InterFaceTask table = db.InterFaceTask.FirstOrDefault(x => x.InterFaceTaskId == InterFaceTaskId); if (table != null) { diff --git a/SGGL/BLL/TestRun/DriverGoods/GoodsBuyItemService.cs b/SGGL/BLL/TestRun/DriverGoods/GoodsBuyItemService.cs index 5174c393..c51770ad 100644 --- a/SGGL/BLL/TestRun/DriverGoods/GoodsBuyItemService.cs +++ b/SGGL/BLL/TestRun/DriverGoods/GoodsBuyItemService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class GoodsBuyItemService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取请购单明细 diff --git a/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareSchemePlanItemService.cs b/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareSchemePlanItemService.cs index 2ee216e1..25cd3442 100644 --- a/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareSchemePlanItemService.cs +++ b/SGGL/BLL/TestRun/DriverPrepare/DriverPrepareSchemePlanItemService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class DriverPrepareSchemePlanItemService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取开车方案计划明细信息 diff --git a/SGGL/BLL/TestRun/DriverRun/DriverRunApproveService.cs b/SGGL/BLL/TestRun/DriverRun/DriverRunApproveService.cs index c999fe34..349c5777 100644 --- a/SGGL/BLL/TestRun/DriverRun/DriverRunApproveService.cs +++ b/SGGL/BLL/TestRun/DriverRun/DriverRunApproveService.cs @@ -10,7 +10,7 @@ namespace BLL { public class DriverRunApproveService { - public static Model.SGGLDB db = Funs.DB; + /// /// 获取开车保运管理模板列表 /// @@ -19,6 +19,7 @@ namespace BLL /// public static DataTable getListData(string DriverRunId) { + Model.SGGLDB db = Funs.DB; var res = from x in db.DriverRun_DriverRunApprove where x.DriverRunId == DriverRunId && x.ApproveDate != null && x.ApproveType != "S" orderby x.ApproveDate @@ -80,6 +81,7 @@ namespace BLL /// public static Model.DriverRun_DriverRunApprove GetSee(string DriverRunId, string userId) { + Model.SGGLDB db = Funs.DB; return db.DriverRun_DriverRunApprove.FirstOrDefault(x => x.DriverRunId == DriverRunId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null); } public static void See(string DriverRunId, string userId) @@ -101,6 +103,7 @@ namespace BLL /// 一个开车保运管理审批实体 public static Model.DriverRun_DriverRunApprove GetDriverRunApproveByDriverRunId(string DriverRunId) { + Model.SGGLDB db = Funs.DB; return db.DriverRun_DriverRunApprove.FirstOrDefault(x => x.DriverRunId == DriverRunId && x.ApproveType != "S" && x.ApproveDate == null); } /// @@ -166,6 +169,7 @@ namespace BLL /// public static Model.DriverRun_DriverRunApprove GetAudit1(string DriverRunId) { + Model.SGGLDB db = Funs.DB; return db.DriverRun_DriverRunApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.DriverRunId == DriverRunId && x.ApproveType == BLL.Const.DriverRun_Audit1); } @@ -176,6 +180,7 @@ namespace BLL /// public static Model.DriverRun_DriverRunApprove GetAudit2(string DriverRunId) { + Model.SGGLDB db = Funs.DB; return db.DriverRun_DriverRunApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.DriverRunId == DriverRunId && x.ApproveType == BLL.Const.DriverRun_Audit2); } @@ -186,11 +191,13 @@ namespace BLL /// public static Model.DriverRun_DriverRunApprove GetAudit3(string DriverRunId) { + Model.SGGLDB db = Funs.DB; return db.DriverRun_DriverRunApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.DriverRunId == DriverRunId && x.ApproveType == BLL.Const.DriverRun_Audit3); } public static Model.DriverRun_DriverRunApprove GetComplie(string DriverRunId) { + Model.SGGLDB db = Funs.DB; return db.DriverRun_DriverRunApprove.FirstOrDefault(x => x.DriverRunId == DriverRunId && x.ApproveType == BLL.Const.DriverRun_Compile); } public static List GetListDataByCodeForApi(string code) diff --git a/SGGL/BLL/ZHGL/DataSync/HJGLData_DefectService.cs b/SGGL/BLL/ZHGL/DataSync/HJGLData_DefectService.cs index f3eecb3a..640d7726 100644 --- a/SGGL/BLL/ZHGL/DataSync/HJGLData_DefectService.cs +++ b/SGGL/BLL/ZHGL/DataSync/HJGLData_DefectService.cs @@ -11,7 +11,7 @@ namespace BLL public static class HJGLData_DefectService { - public static Model.SGGLDB db = Funs.DB; + #region 获取列表 @@ -25,6 +25,7 @@ namespace BLL } public static List GetHJGLData_DefectByModle(Model.HJGLData_Defect table) { + Model.SGGLDB db = Funs.DB; var q = from x in db.HJGLData_Defect where (string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) && @@ -69,10 +70,12 @@ namespace BLL public static Model.HJGLData_Defect GetHJGLData_DefectById(string Id) { + Model.SGGLDB db = Funs.DB; return db.HJGLData_Defect.FirstOrDefault(x => x.Id == Id); } public static List GetHJGLData_DefectByDate(DateTime? reportDate) { + Model.SGGLDB db = Funs.DB; var q = from x in db.HJGLData_Defect where x.ReportDate.Value.Date.CompareTo(reportDate.Value.Date) == 0 select x; diff --git a/SGGL/BLL/ZHGL/DataSync/HSSEData_HiddenDangerDetailService.cs b/SGGL/BLL/ZHGL/DataSync/HSSEData_HiddenDangerDetailService.cs index 9677c589..72bccb55 100644 --- a/SGGL/BLL/ZHGL/DataSync/HSSEData_HiddenDangerDetailService.cs +++ b/SGGL/BLL/ZHGL/DataSync/HSSEData_HiddenDangerDetailService.cs @@ -11,7 +11,7 @@ namespace BLL public static class HSSEData_HiddenDangerDetailService { - public static Model.SGGLDB db = Funs.DB; + #region 获取列表 @@ -25,6 +25,7 @@ namespace BLL } public static List GetHSSEData_HiddenDangerDetailByModle(Model.HSSEData_HiddenDangerDetail table) { + Model.SGGLDB db = Funs.DB; var q = from x in db.HSSEData_HiddenDangerDetail where (string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) && @@ -70,11 +71,13 @@ namespace BLL public static Model.HSSEData_HiddenDangerDetail GetHSSEData_HiddenDangerDetailById(string Id) { + Model.SGGLDB db = Funs.DB; return db.HSSEData_HiddenDangerDetail.FirstOrDefault(x => x.Id == Id); } public static List GetHSSEData_HiddenDangerDetailByDate(DateTime? reportDate) { + Model.SGGLDB db = Funs.DB; var q = from x in db.HSSEData_HiddenDangerDetail where x.ReportDate.Value.Date.CompareTo(reportDate.Value.Date) == 0 select x; diff --git a/SGGL/BLL/ZHGL/DataSync/Hazard_RealTimeDeviceService.cs b/SGGL/BLL/ZHGL/DataSync/Hazard_RealTimeDeviceService.cs index 50a51306..9985fa36 100644 --- a/SGGL/BLL/ZHGL/DataSync/Hazard_RealTimeDeviceService.cs +++ b/SGGL/BLL/ZHGL/DataSync/Hazard_RealTimeDeviceService.cs @@ -11,7 +11,7 @@ namespace BLL public static class HazardRealtimedeviceService { - public static Model.SGGLDB db = Funs.DB; + #region 获取列表 @@ -25,6 +25,7 @@ namespace BLL } public static List GetHazard_RealTimeDeviceByModle(Model.Hazard_RealTimeDevice table) { + Model.SGGLDB db = Funs.DB; var q = from x in db.Hazard_RealTimeDevice where (string.IsNullOrEmpty(table.ID) || x.ID.Contains(table.ID)) && @@ -130,6 +131,7 @@ namespace BLL public static Model.Hazard_RealTimeDevice GetHazard_RealTimeDeviceById(string ID) { + Model.SGGLDB db = Funs.DB; return db.Hazard_RealTimeDevice.FirstOrDefault(x => x.ID == ID); } @@ -268,6 +270,7 @@ namespace BLL } public static List GetHazard_RealTimeDeviceByDate(DateTime? reportDate) { + Model.SGGLDB db = Funs.DB; var q = from x in db.Hazard_RealTimeDevice where x.ReportDate.Value.Date.CompareTo(reportDate.Value.Date) == 0 select x; diff --git a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_CQMSDataService.cs b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_CQMSDataService.cs index 959267fa..e9b4d08f 100644 --- a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_CQMSDataService.cs +++ b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_CQMSDataService.cs @@ -13,7 +13,7 @@ namespace BLL public static class Project_CQMSDataService { - public static Model.SGGLDB db = Funs.DB; + /// /// CQMS数据类型 /// @@ -80,6 +80,7 @@ namespace BLL } public static List GetProject_CQMSData_CQMSByModle(Model.Project_CQMSData_CQMS table) { + Model.SGGLDB db = Funs.DB; var q = from x in db.Project_CQMSData_CQMS where (string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) && @@ -157,10 +158,12 @@ namespace BLL /// public static Model.Project_CQMSData_CQMS GetProject_CQMSData_CQMSById(string Id) { + Model.SGGLDB db = Funs.DB; return db.Project_CQMSData_CQMS.FirstOrDefault(x => x.Id == Id); } public static List GetProject_CQMSData_CQMSByprojectid(string projectid) { + Model.SGGLDB db = Funs.DB; var q = (from x in db.Project_CQMSData_CQMS where x.ProjectId == projectid select x).ToList(); diff --git a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLService.cs b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLService.cs index 8dd8f688..695eb240 100644 --- a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLService.cs +++ b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLService.cs @@ -14,7 +14,7 @@ namespace BLL public static class Project_HJGLData_HJGLService { - public static Model.SGGLDB db = Funs.DB; + /// /// HJGL数据类型 /// @@ -54,6 +54,7 @@ namespace BLL } public static List GetProject_HJGLData_HJGLByModle(Model.Project_HJGLData_HJGL table) { + Model.SGGLDB db = Funs.DB; var q = from x in db.Project_HJGLData_HJGL where (string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) && @@ -116,11 +117,13 @@ namespace BLL public static Model.Project_HJGLData_HJGL GetProject_HJGLData_HJGLById(string Id) { + Model.SGGLDB db = Funs.DB; return db.Project_HJGLData_HJGL.FirstOrDefault(x => x.Id == Id); } public static List GetProject_HJGLData_HJGLByProjectid(string Projectid) { + Model.SGGLDB db = Funs.DB; var q = (from x in db.Project_HJGLData_HJGL where x.ProjectId == Projectid select x).ToList(); @@ -427,6 +430,7 @@ namespace BLL /// public static int GetOKFilmNum(string projectid) { + Model.SGGLDB db = Funs.DB; int result = 0; var ndt = (from x in db.ProcessControl_NondestructiveTest_New where x.ProjectId == projectid && x.ProfessionalName == "工艺管道" orderby x.CreateDate descending select x).FirstOrDefault(); if (ndt != null) diff --git a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HiddenDangerDetailService.cs b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HiddenDangerDetailService.cs index 454c7c8c..0482ce94 100644 --- a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HiddenDangerDetailService.cs +++ b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HiddenDangerDetailService.cs @@ -11,7 +11,7 @@ namespace BLL public static class Project_HSSEData_HiddenDangerDetailService { - public static Model.SGGLDB db = Funs.DB; + #region 获取列表 @@ -25,7 +25,7 @@ namespace BLL } public static List GetProject_HSSEData_HiddenDangerDetailByModle(Model.Project_HSSEData_HiddenDangerDetail table) { - var q = from x in db.Project_HSSEData_HiddenDangerDetail + var q = from x in Funs.DB.Project_HSSEData_HiddenDangerDetail where (string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) && (string.IsNullOrEmpty(table.ProjectId) || x.Id.Contains(table.ProjectId)) && @@ -72,7 +72,7 @@ namespace BLL public static Model.Project_HSSEData_HiddenDangerDetail GetModelById(string Id) { - return db.Project_HSSEData_HiddenDangerDetail.FirstOrDefault(x => x.Id == Id); + return Funs.DB.Project_HSSEData_HiddenDangerDetail.FirstOrDefault(x => x.Id == Id); } /// /// 获取项目该日期的隐患类别数据 diff --git a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_SYHSEData_SYHSEService.cs b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_SYHSEData_SYHSEService.cs index a6cef0c4..2303c227 100644 --- a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_SYHSEData_SYHSEService.cs +++ b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_SYHSEData_SYHSEService.cs @@ -13,7 +13,7 @@ namespace BLL public static class Project_SYHSEData_SYHSEService { - public static Model.SGGLDB db = Funs.DB; + /// /// 实业数据类型 /// @@ -61,7 +61,7 @@ namespace BLL } public static List GetProject_SYHSEData_SYHSEByModle(Model.Project_SYHSEData_SYHSE table) { - var q = from x in db.Project_SYHSEData_SYHSE + var q = from x in Funs.DB.Project_SYHSEData_SYHSE where (string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) && (string.IsNullOrEmpty(table.ProjectId) || x.Id.Contains(table.ProjectId)) && @@ -138,7 +138,7 @@ namespace BLL public static Model.Project_SYHSEData_SYHSE GetProject_SYHSEData_SYHSEById(string Id) { - return db.Project_SYHSEData_SYHSE.FirstOrDefault(x => x.Id == Id); + return Funs.DB.Project_SYHSEData_SYHSE.FirstOrDefault(x => x.Id == Id); } public static void AddProject_SYHSEData_SYHSE(Model.Project_SYHSEData_SYHSE newtable) { diff --git a/SGGL/BLL/ZHGL/DataSync/SYHSEData_DataService.cs b/SGGL/BLL/ZHGL/DataSync/SYHSEData_DataService.cs index ad280ff4..c4176d01 100644 --- a/SGGL/BLL/ZHGL/DataSync/SYHSEData_DataService.cs +++ b/SGGL/BLL/ZHGL/DataSync/SYHSEData_DataService.cs @@ -13,7 +13,7 @@ namespace BLL public static class SYHSEData_DataService { - public static Model.SGGLDB db = Funs.DB; + #region 获取列表 @@ -27,6 +27,7 @@ namespace BLL } public static List GetSYHSEData_DataByModle(Model.SYHSEData_Data table) { + Model.SGGLDB db = Funs.DB; var q = from x in db.SYHSEData_Data where (string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) && @@ -174,13 +175,14 @@ namespace BLL public static Model.SYHSEData_Data GetSYHSEData_DataById(string Id) { + Model.SGGLDB db = Funs.DB; return db.SYHSEData_Data.FirstOrDefault(x => x.Id == Id); } public static void AddSYHSEData_Data(Model.SYHSEData_Data newtable) { - + Model.SGGLDB db = Funs.DB; Model.SYHSEData_Data table = new Model.SYHSEData_Data { Id = newtable.Id, @@ -198,7 +200,7 @@ namespace BLL public static void AddBulkSYHSEData_Data(List newtables) { - + Model.SGGLDB db = Funs.DB; db.SYHSEData_Data.InsertAllOnSubmit(newtables); db.SubmitChanges(); } @@ -206,7 +208,7 @@ namespace BLL public static void UpdateSYHSEData_Data(Model.SYHSEData_Data newtable) { - + Model.SGGLDB db = Funs.DB; Model.SYHSEData_Data table = db.SYHSEData_Data.FirstOrDefault(x => x.Id == newtable.Id); if (table != null) { @@ -224,7 +226,7 @@ namespace BLL } public static void DeleteSYHSEData_DataById(string Id) { - + Model.SGGLDB db = Funs.DB; Model.SYHSEData_Data table = db.SYHSEData_Data.FirstOrDefault(x => x.Id == Id); if (table != null) { @@ -236,6 +238,7 @@ namespace BLL public static void DeleteALLSYHSEData_Data() { + Model.SGGLDB db = Funs.DB; if (db.SYHSEData_Data != null) { db.SYHSEData_Data.DeleteAllOnSubmit(db.SYHSEData_Data); diff --git a/SGGL/BLL/ZHGL/DataSync/SYHSEData_HiddenDangerCheckService.cs b/SGGL/BLL/ZHGL/DataSync/SYHSEData_HiddenDangerCheckService.cs index 1c17e777..729fa9a3 100644 --- a/SGGL/BLL/ZHGL/DataSync/SYHSEData_HiddenDangerCheckService.cs +++ b/SGGL/BLL/ZHGL/DataSync/SYHSEData_HiddenDangerCheckService.cs @@ -11,7 +11,7 @@ namespace BLL public static class SyhsedataHiddendangercheckService { - public static Model.SGGLDB db = Funs.DB; + #region 获取列表 @@ -25,6 +25,7 @@ namespace BLL } public static List GetSYHSEData_HiddenDangerCheckByModle(Model.SYHSEData_HiddenDangerCheck table) { + Model.SGGLDB db = Funs.DB; var q = from x in db.SYHSEData_HiddenDangerCheck where (string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) && @@ -67,13 +68,14 @@ namespace BLL public static Model.SYHSEData_HiddenDangerCheck GetSYHSEData_HiddenDangerCheckById(string Id) { + Model.SGGLDB db = Funs.DB; return db.SYHSEData_HiddenDangerCheck.FirstOrDefault(x => x.Id == Id); } public static void AddSYHSEData_HiddenDangerCheck(Model.SYHSEData_HiddenDangerCheck newtable) { - + Model.SGGLDB db = Funs.DB; Model.SYHSEData_HiddenDangerCheck table = new Model.SYHSEData_HiddenDangerCheck { Id = newtable.Id, @@ -89,7 +91,7 @@ namespace BLL public static void AddBulkSYHSEData_HiddenDangerCheck(List newtables) { - + Model.SGGLDB db = Funs.DB; db.SYHSEData_HiddenDangerCheck.InsertAllOnSubmit(newtables); db.SubmitChanges(); } @@ -97,7 +99,7 @@ namespace BLL public static void UpdateSYHSEData_HiddenDangerCheck(Model.SYHSEData_HiddenDangerCheck newtable) { - + Model.SGGLDB db = Funs.DB; Model.SYHSEData_HiddenDangerCheck table = db.SYHSEData_HiddenDangerCheck.FirstOrDefault(x => x.Id == newtable.Id); if (table != null) { @@ -113,7 +115,7 @@ namespace BLL } public static void DeleteSYHSEData_HiddenDangerCheckById(string Id) { - + Model.SGGLDB db = Funs.DB; Model.SYHSEData_HiddenDangerCheck table = db.SYHSEData_HiddenDangerCheck.FirstOrDefault(x => x.Id == Id); if (table != null) { @@ -125,6 +127,7 @@ namespace BLL public static void DeleteALLSYHSEData_HiddenDangerCheck() { + Model.SGGLDB db = Funs.DB; if (db.SYHSEData_HiddenDangerCheck != null) { db.SYHSEData_HiddenDangerCheck.DeleteAllOnSubmit(db.SYHSEData_HiddenDangerCheck); @@ -133,6 +136,7 @@ namespace BLL } public static List GetSYHSEData_HiddenDangerCheckByDate(DateTime? reportDate) { + Model.SGGLDB db = Funs.DB; var q = from x in db.SYHSEData_HiddenDangerCheck where x.ReportDate.Value.Date.CompareTo(reportDate.Value.Date) == 0 select x; @@ -140,7 +144,7 @@ namespace BLL } public static void DeleteSYHSEData_HiddenDangerCheckByDate(DateTime? reportDate) { - + Model.SGGLDB db = Funs.DB; var table = db.SYHSEData_HiddenDangerCheck.Where(x => x.ReportDate.Value.Date.CompareTo(reportDate.Value.Date) == 0); if (table != null) { diff --git a/SGGL/BLL/ZHGL/DataSync/SYHSEData_RiskControlService.cs b/SGGL/BLL/ZHGL/DataSync/SYHSEData_RiskControlService.cs index cf013d66..737564c3 100644 --- a/SGGL/BLL/ZHGL/DataSync/SYHSEData_RiskControlService.cs +++ b/SGGL/BLL/ZHGL/DataSync/SYHSEData_RiskControlService.cs @@ -11,7 +11,7 @@ namespace BLL public static class SyhsedataRiskcontrolService { - public static Model.SGGLDB db = Funs.DB; + #region 获取列表 @@ -25,6 +25,7 @@ namespace BLL } public static List GetSYHSEData_RiskControlByModle(Model.SYHSEData_RiskControl table) { + Model.SGGLDB db = Funs.DB; var q = from x in db.SYHSEData_RiskControl where (string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) && @@ -65,13 +66,14 @@ namespace BLL public static Model.SYHSEData_RiskControl GetSYHSEData_RiskControlById(string Id) { + Model.SGGLDB db = Funs.DB; return db.SYHSEData_RiskControl.FirstOrDefault(x => x.Id == Id); } public static void AddSYHSEData_RiskControl(Model.SYHSEData_RiskControl newtable) { - + Model.SGGLDB db = Funs.DB; Model.SYHSEData_RiskControl table = new Model.SYHSEData_RiskControl { Id = newtable.Id, @@ -85,7 +87,7 @@ namespace BLL public static void AddBulkSYHSEData_RiskControl(List newtables) { - + Model.SGGLDB db = Funs.DB; db.SYHSEData_RiskControl.InsertAllOnSubmit(newtables); db.SubmitChanges(); } @@ -93,7 +95,7 @@ namespace BLL public static void UpdateSYHSEData_RiskControl(Model.SYHSEData_RiskControl newtable) { - + Model.SGGLDB db = Funs.DB; Model.SYHSEData_RiskControl table = db.SYHSEData_RiskControl.FirstOrDefault(x => x.Id == newtable.Id); if (table != null) { @@ -107,7 +109,7 @@ namespace BLL } public static void DeleteSYHSEData_RiskControlById(string Id) { - + Model.SGGLDB db = Funs.DB; Model.SYHSEData_RiskControl table = db.SYHSEData_RiskControl.FirstOrDefault(x => x.Id == Id); if (table != null) { @@ -119,6 +121,7 @@ namespace BLL public static void DeleteALLSYHSEData_RiskControl() { + Model.SGGLDB db = Funs.DB; if (db.SYHSEData_RiskControl != null) { db.SYHSEData_RiskControl.DeleteAllOnSubmit(db.SYHSEData_RiskControl); @@ -127,6 +130,7 @@ namespace BLL } public static List GetSYHSEData_RiskControlByDate(DateTime? reportDate) { + Model.SGGLDB db = Funs.DB; var q = from x in db.SYHSEData_RiskControl where x.ReportDate.Value.Date.CompareTo(reportDate.Value.Date) == 0 select x; @@ -134,7 +138,7 @@ namespace BLL } public static void DeleteSYHSEData_RiskControlByDate(DateTime? reportDate) { - + Model.SGGLDB db = Funs.DB; var table = db.SYHSEData_RiskControl.Where(x => x.ReportDate.Value.Date.CompareTo(reportDate.Value.Date) == 0); if (table != null) { diff --git a/SGGL/BLL/ZHGL/DataSync/SYHSEData_SYHSEService.cs b/SGGL/BLL/ZHGL/DataSync/SYHSEData_SYHSEService.cs index 31f91a76..19b0cc25 100644 --- a/SGGL/BLL/ZHGL/DataSync/SYHSEData_SYHSEService.cs +++ b/SGGL/BLL/ZHGL/DataSync/SYHSEData_SYHSEService.cs @@ -10,7 +10,7 @@ namespace BLL { public static class SYHSEData_SYHSEService { - public static Model.SGGLDB db = Funs.DB; + #region 获取列表 diff --git a/SGGL/BLL/ZHGL/Emergency/UnitDrillRecordListService.cs b/SGGL/BLL/ZHGL/Emergency/UnitDrillRecordListService.cs index 47545cb0..98387ba3 100644 --- a/SGGL/BLL/ZHGL/Emergency/UnitDrillRecordListService.cs +++ b/SGGL/BLL/ZHGL/Emergency/UnitDrillRecordListService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class UnitDrillRecordListService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取应急演练 diff --git a/SGGL/BLL/ZHGL/Emergency/UnitEmergencyListService.cs b/SGGL/BLL/ZHGL/Emergency/UnitEmergencyListService.cs index 955669a7..a18fe6a7 100644 --- a/SGGL/BLL/ZHGL/Emergency/UnitEmergencyListService.cs +++ b/SGGL/BLL/ZHGL/Emergency/UnitEmergencyListService.cs @@ -10,7 +10,7 @@ namespace BLL /// public static class UnitEmergencyListService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取应急预案管理 diff --git a/SGGL/BLL/ZHGL/Environmental/EnergyReportService.cs b/SGGL/BLL/ZHGL/Environmental/EnergyReportService.cs index 0f709d3a..408a564f 100644 --- a/SGGL/BLL/ZHGL/Environmental/EnergyReportService.cs +++ b/SGGL/BLL/ZHGL/Environmental/EnergyReportService.cs @@ -11,7 +11,7 @@ namespace BLL public static class EnergyReportService { - public static Model.SGGLDB db = Funs.DB; + #region 获取列表 @@ -25,6 +25,7 @@ namespace BLL } public static List GetEnvironmental_EnergyReportByModle(Model.Environmental_EnergyReport table) { + Model.SGGLDB db = Funs.DB; var q = from x in db.Environmental_EnergyReport where (string.IsNullOrEmpty(table.EnergyReportId) || x.EnergyReportId.Contains(table.EnergyReportId)) && @@ -71,6 +72,7 @@ namespace BLL public static Model.Environmental_EnergyReport GetEnvironmental_EnergyReportById(string EnergyReportId) { + Model.SGGLDB db = Funs.DB; return db.Environmental_EnergyReport.FirstOrDefault(x => x.EnergyReportId == EnergyReportId); } @@ -80,7 +82,7 @@ namespace BLL } public static void AddEnvironmental_EnergyReport(Model.Environmental_EnergyReport newtable) { - + Model.SGGLDB db = Funs.DB; Model.Environmental_EnergyReport table = new Model.Environmental_EnergyReport { EnergyReportId = newtable.EnergyReportId, @@ -98,7 +100,7 @@ namespace BLL public static void AddBulkEnvironmental_EnergyReport(List newtables) { - + Model.SGGLDB db = Funs.DB; db.Environmental_EnergyReport.InsertAllOnSubmit(newtables); db.SubmitChanges(); } @@ -124,7 +126,7 @@ namespace BLL } public static void UpdateEnvironmental_EnergyReport(Model.Environmental_EnergyReport newtable) { - + Model.SGGLDB db = Funs.DB; Model.Environmental_EnergyReport table = db.Environmental_EnergyReport.FirstOrDefault(x => x.EnergyReportId == newtable.EnergyReportId); if (table != null) { @@ -142,7 +144,7 @@ namespace BLL } public static void DeleteEnvironmental_EnergyReportById(string EnergyReportId) { - + Model.SGGLDB db = Funs.DB; Model.Environmental_EnergyReport table = db.Environmental_EnergyReport.FirstOrDefault(x => x.EnergyReportId == EnergyReportId); if (table != null) { @@ -154,6 +156,7 @@ namespace BLL public static void DeleteALLEnvironmental_EnergyReport() { + Model.SGGLDB db = Funs.DB; if (db.Environmental_EnergyReport != null) { db.Environmental_EnergyReport.DeleteAllOnSubmit(db.Environmental_EnergyReport); diff --git a/SGGL/BLL/ZHGL/Environmental/EnergyreportItemService .cs b/SGGL/BLL/ZHGL/Environmental/EnergyreportItemService .cs index 832249c5..e31ed4a6 100644 --- a/SGGL/BLL/ZHGL/Environmental/EnergyreportItemService .cs +++ b/SGGL/BLL/ZHGL/Environmental/EnergyreportItemService .cs @@ -11,7 +11,7 @@ namespace BLL public static class EnergyreportItemService { - public static Model.SGGLDB db = Funs.DB; + #region 获取列表 @@ -25,6 +25,7 @@ namespace BLL } public static List GetEnvironmental_EnergyReportItemByModle(Model.Environmental_EnergyReportItem table) { + Model.SGGLDB db = Funs.DB; var q = from x in db.Environmental_EnergyReportItem where (string.IsNullOrEmpty(table.EnergyReportItemId) || x.EnergyReportItemId.Contains(table.EnergyReportItemId)) && @@ -87,6 +88,7 @@ namespace BLL public static Model.Environmental_EnergyReportItem GetEnvironmental_EnergyReportItemById(string EnergyReportItemId) { + Model.SGGLDB db = Funs.DB; return db.Environmental_EnergyReportItem.FirstOrDefault(x => x.EnergyReportItemId == EnergyReportItemId); } @@ -177,7 +179,7 @@ namespace BLL } public static void AddEnvironmental_EnergyReportItem(Model.Environmental_EnergyReportItem newtable) { - + Model.SGGLDB db = Funs.DB; Model.Environmental_EnergyReportItem table = new Model.Environmental_EnergyReportItem { EnergyReportItemId = newtable.EnergyReportItemId, @@ -209,7 +211,7 @@ namespace BLL public static void AddBulkEnvironmental_EnergyReportItem(List newtables) { - + Model.SGGLDB db = Funs.DB; db.Environmental_EnergyReportItem.InsertAllOnSubmit(newtables); db.SubmitChanges(); } @@ -217,7 +219,7 @@ namespace BLL public static void UpdateEnvironmental_EnergyReportItem(Model.Environmental_EnergyReportItem newtable) { - + Model.SGGLDB db = Funs.DB; Model.Environmental_EnergyReportItem table = db.Environmental_EnergyReportItem.FirstOrDefault(x => x.EnergyReportItemId == newtable.EnergyReportItemId); if (table != null) { @@ -249,7 +251,7 @@ namespace BLL } public static void DeleteEnvironmental_EnergyReportItemById(string EnergyReportItemId) { - + Model.SGGLDB db = Funs.DB; Model.Environmental_EnergyReportItem table = db.Environmental_EnergyReportItem.FirstOrDefault(x => x.EnergyReportItemId == EnergyReportItemId); if (table != null) { @@ -261,6 +263,7 @@ namespace BLL public static void DeleteALLEnvironmental_EnergyReportItem() { + Model.SGGLDB db = Funs.DB; if (db.Environmental_EnergyReportItem != null) { db.Environmental_EnergyReportItem.DeleteAllOnSubmit(db.Environmental_EnergyReportItem); diff --git a/SGGL/BLL/ZHGL/Environmental/ProjectEnergyReportService.cs b/SGGL/BLL/ZHGL/Environmental/ProjectEnergyReportService.cs index 2c423ba8..8a9bc377 100644 --- a/SGGL/BLL/ZHGL/Environmental/ProjectEnergyReportService.cs +++ b/SGGL/BLL/ZHGL/Environmental/ProjectEnergyReportService.cs @@ -12,7 +12,7 @@ namespace BLL public static class ProjectEnergyReportService { - public static Model.SGGLDB db = Funs.DB; + #region 获取列表 @@ -26,6 +26,7 @@ namespace BLL } public static List GetEnvironmental_ProjectEnergyReportByModle(Model.Environmental_ProjectEnergyReport table) { + Model.SGGLDB db = Funs.DB; var q = from x in db.Environmental_ProjectEnergyReport where (string.IsNullOrEmpty(table.EnergyReportId) || x.EnergyReportId.Contains(table.EnergyReportId)) && @@ -73,6 +74,7 @@ namespace BLL public static Model.Environmental_ProjectEnergyReport GetEnvironmental_ProjectEnergyReportById(string EnergyReportId) { + Model.SGGLDB db = Funs.DB; return db.Environmental_ProjectEnergyReport.FirstOrDefault(x => x.EnergyReportId == EnergyReportId); } @@ -82,7 +84,7 @@ namespace BLL } public static void AddEnvironmental_ProjectEnergyReport(Model.Environmental_ProjectEnergyReport newtable) { - + Model.SGGLDB db = Funs.DB; Model.Environmental_ProjectEnergyReport table = new Model.Environmental_ProjectEnergyReport { EnergyReportId = newtable.EnergyReportId, @@ -101,7 +103,7 @@ namespace BLL public static void AddBulkEnvironmental_ProjectEnergyReport(List newtables) { - + Model.SGGLDB db = Funs.DB; db.Environmental_ProjectEnergyReport.InsertAllOnSubmit(newtables); db.SubmitChanges(); } @@ -131,7 +133,7 @@ namespace BLL } public static void UpdateEnvironmental_ProjectEnergyReport(Model.Environmental_ProjectEnergyReport newtable) { - + Model.SGGLDB db = Funs.DB; Model.Environmental_ProjectEnergyReport table = db.Environmental_ProjectEnergyReport.FirstOrDefault(x => x.EnergyReportId == newtable.EnergyReportId); if (table != null) { @@ -150,7 +152,7 @@ namespace BLL } public static void DeleteEnvironmental_ProjectEnergyReportById(string EnergyReportId) { - + Model.SGGLDB db = Funs.DB; Model.Environmental_ProjectEnergyReport table = db.Environmental_ProjectEnergyReport.FirstOrDefault(x => x.EnergyReportId == EnergyReportId); if (table != null) { @@ -162,6 +164,7 @@ namespace BLL public static void DeleteALLEnvironmental_ProjectEnergyReport() { + Model.SGGLDB db = Funs.DB; if (db.Environmental_ProjectEnergyReport != null) { db.Environmental_ProjectEnergyReport.DeleteAllOnSubmit(db.Environmental_ProjectEnergyReport); diff --git a/SGGL/BLL/ZHGL/Environmental/ProjectEnergyreportItemService .cs b/SGGL/BLL/ZHGL/Environmental/ProjectEnergyreportItemService .cs index 4fa85ed2..7e1df9c0 100644 --- a/SGGL/BLL/ZHGL/Environmental/ProjectEnergyreportItemService .cs +++ b/SGGL/BLL/ZHGL/Environmental/ProjectEnergyreportItemService .cs @@ -11,7 +11,7 @@ namespace BLL public static class ProjectEnergyreportItemService { - public static Model.SGGLDB db = Funs.DB; + #region 获取列表 @@ -25,6 +25,7 @@ namespace BLL } public static List GetEnvironmental_ProjectEnergyReportItemByModle(Model.Environmental_ProjectEnergyReportItem table) { + Model.SGGLDB db = Funs.DB; var q = from x in db.Environmental_ProjectEnergyReportItem where (string.IsNullOrEmpty(table.EnergyReportItemId) || x.EnergyReportItemId.Contains(table.EnergyReportItemId)) && @@ -87,6 +88,7 @@ namespace BLL public static Model.Environmental_ProjectEnergyReportItem GetEnvironmental_ProjectEnergyReportItemById(string EnergyReportItemId) { + Model.SGGLDB db = Funs.DB; return db.Environmental_ProjectEnergyReportItem.FirstOrDefault(x => x.EnergyReportItemId == EnergyReportItemId); } @@ -183,7 +185,7 @@ namespace BLL } public static void AddEnvironmental_ProjectEnergyReportItem(Model.Environmental_ProjectEnergyReportItem newtable) { - + Model.SGGLDB db = Funs.DB; Model.Environmental_ProjectEnergyReportItem table = new Model.Environmental_ProjectEnergyReportItem { EnergyReportItemId = newtable.EnergyReportItemId, @@ -215,7 +217,7 @@ namespace BLL public static void AddBulkEnvironmental_ProjectEnergyReportItem(List newtables) { - + Model.SGGLDB db = Funs.DB; db.Environmental_ProjectEnergyReportItem.InsertAllOnSubmit(newtables); db.SubmitChanges(); } @@ -223,7 +225,7 @@ namespace BLL public static void UpdateEnvironmental_ProjectEnergyReportItem(Model.Environmental_ProjectEnergyReportItem newtable) { - + Model.SGGLDB db = Funs.DB; Model.Environmental_ProjectEnergyReportItem table = db.Environmental_ProjectEnergyReportItem.FirstOrDefault(x => x.EnergyReportItemId == newtable.EnergyReportItemId); if (table != null) { @@ -255,7 +257,7 @@ namespace BLL } public static void DeleteEnvironmental_ProjectEnergyReportItemById(string EnergyReportItemId) { - + Model.SGGLDB db = Funs.DB; Model.Environmental_ProjectEnergyReportItem table = db.Environmental_ProjectEnergyReportItem.FirstOrDefault(x => x.EnergyReportItemId == EnergyReportItemId); if (table != null) { @@ -267,6 +269,7 @@ namespace BLL public static void DeleteALLEnvironmental_ProjectEnergyReportItem() { + Model.SGGLDB db = Funs.DB; if (db.Environmental_ProjectEnergyReportItem != null) { db.Environmental_ProjectEnergyReportItem.DeleteAllOnSubmit(db.Environmental_ProjectEnergyReportItem); diff --git a/SGGL/BLL/ZHGL/InspectionSummary/InspectionSummaryService.cs b/SGGL/BLL/ZHGL/InspectionSummary/InspectionSummaryService.cs index 4d7144fd..7c6c6111 100644 --- a/SGGL/BLL/ZHGL/InspectionSummary/InspectionSummaryService.cs +++ b/SGGL/BLL/ZHGL/InspectionSummary/InspectionSummaryService.cs @@ -9,7 +9,7 @@ namespace BLL { public class InspectionSummaryService { - public static Model.SGGLDB db = Funs.DB; + /// diff --git a/SGGL/BLL/ZHGL/Meeting/CompanySafetyMeetingService.cs b/SGGL/BLL/ZHGL/Meeting/CompanySafetyMeetingService.cs index 002877c0..503e46d4 100644 --- a/SGGL/BLL/ZHGL/Meeting/CompanySafetyMeetingService.cs +++ b/SGGL/BLL/ZHGL/Meeting/CompanySafetyMeetingService.cs @@ -9,7 +9,7 @@ namespace BLL /// public static class CompanySafetyMeetingService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取企业安委会 diff --git a/SGGL/BLL/ZHGL/Meeting/CompanySpecialMeetingService.cs b/SGGL/BLL/ZHGL/Meeting/CompanySpecialMeetingService.cs index 1e8886ee..00d4515e 100644 --- a/SGGL/BLL/ZHGL/Meeting/CompanySpecialMeetingService.cs +++ b/SGGL/BLL/ZHGL/Meeting/CompanySpecialMeetingService.cs @@ -9,7 +9,7 @@ namespace BLL /// public static class CompanySpecialMeetingService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取企业专题会 diff --git a/SGGL/BLL/ZHGL/Person/CompanyBranchPersonService.cs b/SGGL/BLL/ZHGL/Person/CompanyBranchPersonService.cs index 04e7f1a4..84d23ed5 100644 --- a/SGGL/BLL/ZHGL/Person/CompanyBranchPersonService.cs +++ b/SGGL/BLL/ZHGL/Person/CompanyBranchPersonService.cs @@ -11,7 +11,7 @@ namespace BLL /// public static class CompanyBranchPersonService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取公司分支机构人员 diff --git a/SGGL/BLL/ZHGL/RealName/BasicDataService.cs b/SGGL/BLL/ZHGL/RealName/BasicDataService.cs index 5d18f0bd..b1e71804 100644 --- a/SGGL/BLL/ZHGL/RealName/BasicDataService.cs +++ b/SGGL/BLL/ZHGL/RealName/BasicDataService.cs @@ -9,7 +9,7 @@ namespace BLL { public static class BasicDataService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取字典信息 diff --git a/SGGL/BLL/ZHGL/RealName/CityService.cs b/SGGL/BLL/ZHGL/RealName/CityService.cs index b23696f2..ab03aee8 100644 --- a/SGGL/BLL/ZHGL/RealName/CityService.cs +++ b/SGGL/BLL/ZHGL/RealName/CityService.cs @@ -8,7 +8,7 @@ namespace BLL { public static class CityService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取国家信息 diff --git a/SGGL/BLL/ZHGL/RealName/CountryService.cs b/SGGL/BLL/ZHGL/RealName/CountryService.cs index 06b3f014..48afe818 100644 --- a/SGGL/BLL/ZHGL/RealName/CountryService.cs +++ b/SGGL/BLL/ZHGL/RealName/CountryService.cs @@ -8,7 +8,7 @@ namespace BLL { public static class CountryService { - public static Model.SGGLDB db = Funs.DB; + /// /// 根据主键获取国家信息 diff --git a/SGGL/BLL/ZHGL/RealName/LeavePostService.cs b/SGGL/BLL/ZHGL/RealName/LeavePostService.cs index 612bb689..86dfe085 100644 --- a/SGGL/BLL/ZHGL/RealName/LeavePostService.cs +++ b/SGGL/BLL/ZHGL/RealName/LeavePostService.cs @@ -7,7 +7,7 @@ namespace BLL { public static class LeavePostService { - public static Model.SGGLDB db = Funs.DB; + #region 获取列表 /// /// 记录数 @@ -21,7 +21,7 @@ namespace BLL /// /// 定义变量 /// - private static IQueryable getLeavePosts = from x in db.RealName_LeavePost select x; + private static IQueryable getLeavePosts = from x in Funs.DB.RealName_LeavePost select x; /// /// 获取分页列表 diff --git a/SGGL/BLL/ZHGL/RealName/OnPostService.cs b/SGGL/BLL/ZHGL/RealName/OnPostService.cs index 17eb8b5c..a7289700 100644 --- a/SGGL/BLL/ZHGL/RealName/OnPostService.cs +++ b/SGGL/BLL/ZHGL/RealName/OnPostService.cs @@ -7,7 +7,7 @@ namespace BLL { public static class OnPostService { - public static Model.SGGLDB db = Funs.DB; + #region 获取列表 /// @@ -22,7 +22,7 @@ namespace BLL /// /// 定义变量 /// - private static IQueryable getDataLists = from x in db.SitePerson_Person + private static IQueryable getDataLists = from x in Funs.DB.SitePerson_Person where x.IsUsed == true select x; @@ -37,6 +37,7 @@ namespace BLL public static IEnumerable getListData(string projectId, string personName, string identityCard, string rblStates, string rbInfo, string rbIDCardNo, string rbRealName, Grid Grid1) { + Model.SGGLDB db = Funs.DB; IQueryable getDataList = getDataLists; if (projectId != Const._Null && !string.IsNullOrEmpty(projectId)) { diff --git a/SGGL/BLL/ZHGL/RealName/RealName_ProjectService.cs b/SGGL/BLL/ZHGL/RealName/RealName_ProjectService.cs index 6e5e3505..a51d8793 100644 --- a/SGGL/BLL/ZHGL/RealName/RealName_ProjectService.cs +++ b/SGGL/BLL/ZHGL/RealName/RealName_ProjectService.cs @@ -8,7 +8,7 @@ namespace BLL { public static class RealName_ProjectService { - public static Model.SGGLDB db = Funs.DB; + /// ///