diff --git a/SGGL/BLL/BaseInfo/InspectionAreaService.cs b/SGGL/BLL/BaseInfo/InspectionAreaService.cs
index ec5af5ee..1a70251f 100644
--- a/SGGL/BLL/BaseInfo/InspectionAreaService.cs
+++ b/SGGL/BLL/BaseInfo/InspectionAreaService.cs
@@ -26,7 +26,7 @@ namespace BLL
///
/// 定义变量
///
- public static IQueryable qq = from x in Funs.DB.Base_InspectionArea orderby x.InspectionAreaCode select x;
+ //public static IQueryable qq = from x in Funs.DB.Base_InspectionArea orderby x.InspectionAreaCode select x;
///
/// 获取分页列表
@@ -37,7 +37,7 @@ namespace BLL
///
public static IEnumerable GetListData(string inspectionAreaName, int startRowIndex, int maximumRows)
{
- IQueryable q = qq;
+ IQueryable q = from x in Funs.DB.Base_InspectionArea orderby x.InspectionAreaCode select x;
if (!string.IsNullOrEmpty(inspectionAreaName))
{
q = q.Where(e => e.InspectionAreaName.Contains(inspectionAreaName));
diff --git a/SGGL/BLL/BaseInfo/PersonManageService.cs b/SGGL/BLL/BaseInfo/PersonManageService.cs
index decb261c..a4bc70ec 100644
--- a/SGGL/BLL/BaseInfo/PersonManageService.cs
+++ b/SGGL/BLL/BaseInfo/PersonManageService.cs
@@ -26,7 +26,7 @@ namespace BLL
///
/// 定义变量
///
- public static IQueryable qq = from x in Funs.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;
///
/// 获取分页列表
@@ -39,7 +39,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;
+ IQueryable q = from x in Funs.DB.BS_Welder orderby x.WED_Unit, x.WED_Code select x;
if (!string.IsNullOrEmpty(project))
{
q = q.Where(e => e.ProjectId == project);
diff --git a/SGGL/BLL/CQMS/Check/CheckMonthService.cs b/SGGL/BLL/CQMS/Check/CheckMonthService.cs
index 589c057c..e5861986 100644
--- a/SGGL/BLL/CQMS/Check/CheckMonthService.cs
+++ b/SGGL/BLL/CQMS/Check/CheckMonthService.cs
@@ -23,7 +23,7 @@ namespace BLL
///
/// 定义变量
///
- public static IQueryable qq = from x in Funs.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;
///
/// 获取分页列表
@@ -36,7 +36,7 @@ namespace BLL
public static IEnumerable GetListData(string projectId, int startRowIndex, int maximumRows)
{
Model.SGGLDB db = Funs.DB;
- IQueryable q = qq;
+ IQueryable q = from x in Funs.DB.Check_CheckMonth orderby x.Months descending select x;
if (!string.IsNullOrEmpty(projectId))
{
q = q.Where(e => e.ProjectId == projectId);
diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/AccidentDesciptionCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/AccidentDesciptionCService.cs
index 082226b5..cdafb104 100644
--- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/AccidentDesciptionCService.cs
+++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/AccidentDesciptionCService.cs
@@ -8,7 +8,7 @@ namespace BLL
{
public class AccidentDesciptionCService
{
- private static Model.SGGLDB db = Funs.DB;
+ // private static Model.SGGLDB db = Funs.DB;
///
/// 根据月报Id获取事故说明
diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/AccidentDesciptionItemCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/AccidentDesciptionItemCService.cs
index 59f77294..38055582 100644
--- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/AccidentDesciptionItemCService.cs
+++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/AccidentDesciptionItemCService.cs
@@ -8,7 +8,7 @@ namespace BLL
{
public class AccidentDesciptionItemCService
{
- private static Model.SGGLDB db = Funs.DB;
+ //private static Model.SGGLDB db = Funs.DB;
///
/// 根据月报Id获取管理绩效数据统计
diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/ActivitiesCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/ActivitiesCService.cs
index 135aef22..2cd4fc2e 100644
--- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/ActivitiesCService.cs
+++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/ActivitiesCService.cs
@@ -7,7 +7,7 @@ namespace BLL
{
public static class ActivitiesCService
{
- private static Model.SGGLDB db = Funs.DB;
+ //private static Model.SGGLDB db = Funs.DB;
///
/// 根据月报Id获取HSSE活动
diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/CheckCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/CheckCService.cs
index 119cc979..b0941bfa 100644
--- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/CheckCService.cs
+++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/CheckCService.cs
@@ -7,7 +7,7 @@ namespace BLL
{
public static class CheckCService
{
- private static Model.SGGLDB db = Funs.DB;
+ //private static Model.SGGLDB db = Funs.DB;
///
/// 根据月报Id获取HSSE检查
diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/CostInvestmentPlanCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/CostInvestmentPlanCService.cs
index 69e4daa3..905f1859 100644
--- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/CostInvestmentPlanCService.cs
+++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/CostInvestmentPlanCService.cs
@@ -8,7 +8,7 @@ namespace BLL
{
public static class CostInvestmentPlanCService
{
- private static Model.SGGLDB db = Funs.DB;
+ //private static Model.SGGLDB db = Funs.DB;
///
/// 根据月报Id获取HSE费用投入计划
diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/EmergencyExercisesCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/EmergencyExercisesCService.cs
index f56f4c8a..74437445 100644
--- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/EmergencyExercisesCService.cs
+++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/EmergencyExercisesCService.cs
@@ -7,7 +7,7 @@ namespace BLL
{
public static class EmergencyExercisesCService
{
- private static Model.SGGLDB db = Funs.DB;
+ //private static Model.SGGLDB db = Funs.DB;
///
/// 根据月报Id获取应急演练活动
diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/EmergencyPlanCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/EmergencyPlanCService.cs
index 2a77ac72..56df7eb6 100644
--- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/EmergencyPlanCService.cs
+++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/EmergencyPlanCService.cs
@@ -7,7 +7,7 @@ namespace BLL
{
public static class EmergencyPlanCService
{
- private static Model.SGGLDB db = Funs.DB;
+ //private static Model.SGGLDB db = Funs.DB;
///
/// 根据月报Id获取应急预案修编
diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/FileManageCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/FileManageCService.cs
index 98b89db6..50ff6184 100644
--- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/FileManageCService.cs
+++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/FileManageCService.cs
@@ -7,7 +7,7 @@ namespace BLL
{
public class FileManageCService
{
- private static Model.SGGLDB db = Funs.DB;
+ //private static Model.SGGLDB db = Funs.DB;
///
/// 根据月报Id获取文件管理信息
diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/FiveExpenseCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/FiveExpenseCService.cs
index 9d8ec411..4a10479b 100644
--- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/FiveExpenseCService.cs
+++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/FiveExpenseCService.cs
@@ -7,7 +7,7 @@ namespace BLL
{
public class FiveExpenseCService
{
- private static Model.SGGLDB db = Funs.DB;
+ //private static Model.SGGLDB db = Funs.DB;
///
/// 根据月报Id获取五环HSE费用投入
diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/HazardCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/HazardCService.cs
index ec21a88e..1d4f1230 100644
--- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/HazardCService.cs
+++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/HazardCService.cs
@@ -7,7 +7,7 @@ namespace BLL
{
public class HazardCService
{
- private static Model.SGGLDB db = Funs.DB;
+ //private static Model.SGGLDB db = Funs.DB;
///
/// 根据月报Id获取危险源动态识别及控制
diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/ManageDocPlanCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/ManageDocPlanCService.cs
index 3663a34c..d156333b 100644
--- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/ManageDocPlanCService.cs
+++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/ManageDocPlanCService.cs
@@ -7,7 +7,7 @@ namespace BLL
{
public static class ManageDocPlanCService
{
- private static Model.SGGLDB db = Funs.DB;
+ //private static Model.SGGLDB db = Funs.DB;
///
/// 根据月报Id获取HSE管理文件/方案修编计划
diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/MeetingCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/MeetingCService.cs
index 16310600..c0b96fa3 100644
--- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/MeetingCService.cs
+++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/MeetingCService.cs
@@ -7,7 +7,7 @@ namespace BLL
{
public static class MeetingCService
{
- private static Model.SGGLDB db = Funs.DB;
+ //private static Model.SGGLDB db = Funs.DB;
///
/// 根据日报Id获取会议
diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/OtherWorkCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/OtherWorkCService.cs
index d28da9e6..22e00f85 100644
--- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/OtherWorkCService.cs
+++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/OtherWorkCService.cs
@@ -7,7 +7,7 @@ namespace BLL
{
public class OtherWorkCService
{
- private static Model.SGGLDB db = Funs.DB;
+ //private static Model.SGGLDB db = Funs.DB;
///
/// 根据月报ID获取其他工作情况列表
diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/OtherWorkPlanCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/OtherWorkPlanCService.cs
index 6a99d066..b061f77f 100644
--- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/OtherWorkPlanCService.cs
+++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/OtherWorkPlanCService.cs
@@ -7,7 +7,7 @@ namespace BLL
{
public static class OtherWorkPlanCService
{
- private static Model.SGGLDB db = Funs.DB;
+ //private static Model.SGGLDB db = Funs.DB;
///
/// 根据月报Id获取所有相关其他HSE工作计划
diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/ReviewRecordCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/ReviewRecordCService.cs
index 5a4e21ab..98082fe1 100644
--- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/ReviewRecordCService.cs
+++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/ReviewRecordCService.cs
@@ -7,7 +7,7 @@ namespace BLL
{
public class ReviewRecordCService
{
- private static Model.SGGLDB db = Funs.DB;
+ //private static Model.SGGLDB db = Funs.DB;
///
/// 根据月报Id获取详细审查记录
diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/SubExpenseCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/SubExpenseCService.cs
index 9c018d71..493c0789 100644
--- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/SubExpenseCService.cs
+++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/SubExpenseCService.cs
@@ -7,7 +7,7 @@ namespace BLL
{
public class SubExpenseCService
{
- private static Model.SGGLDB db = Funs.DB;
+ //private static Model.SGGLDB db = Funs.DB;
///
/// 根据月报Id获取所有相关分包商HSE费用投入
diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/TrainCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/TrainCService.cs
index 38ceba39..dbc22a6f 100644
--- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/TrainCService.cs
+++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/TrainCService.cs
@@ -7,7 +7,7 @@ namespace BLL
{
public static class TrainCService
{
- private static Model.SGGLDB db = Funs.DB;
+ //private static Model.SGGLDB db = Funs.DB;
///
/// 根据月报Id获取HSSE培训
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index d5c45da5..91712252 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -20498,7 +20498,7 @@
-
+