lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

去除静态变量Funs.DB

Browse Source
This commit is contained in:
李鹏飞
2025-01-07 19:00:48 +08:00
parent 188974fadc
commit 2c1a328bc1
290 changed files with 1205 additions and 1242 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/HSSE/Accident/AccidentHandleService.cs
+1 -1
View File
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class AccidentHandleService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取HSSE事故（含未遂）处理
SGGL/BLL/HSSE/Accident/AccidentPersonRecordService.cs
+1 -1
View File
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class AccidentPersonRecordService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取HSSE事故（对人员）记录
SGGL/BLL/HSSE/Accident/AccidentReportOtherService.cs
+1 -1
View File
@@ -9,7 +9,7 @@ namespace BLL
/// </summary>
public static class AccidentReportOtherService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取事故调查处理报告
SGGL/BLL/HSSE/Accident/AccidentReportService.cs
+1 -1
View File
@@ -9,7 +9,7 @@ namespace BLL
/// </summary>
public static class AccidentReportService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取事故调查报告
SGGL/BLL/HSSE/Accident/NoFourLetoffService.cs
+1 -1
View File
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class NoFourLetoffService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取四不放过
SGGL/BLL/HSSE/Check/Check_CheckColligationDetailService.cs
+1 -1
View File
@@ -8,7 +8,7 @@ namespace BLL
/// </summary>
public class Check_CheckColligationDetailService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据综合检查id获取所有相关明细信息
SGGL/BLL/HSSE/Check/Check_CheckSpecialDetailService.cs
+1 -1
View File
@@ -8,7 +8,7 @@ namespace BLL
/// </summary>
public class Check_CheckSpecialDetailService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据专项检查id获取所有相关明细信息
SGGL/BLL/HSSE/Check/Check_CheckSpecialService.cs
+3 -4
View File
@@ -4,6 +4,7 @@ using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using Model;
namespace BLL
{
@@ -12,8 +13,6 @@ namespace BLL
/// </summary>
public static class Check_CheckSpecialService
{
public static Model.SGGLDB db = Funs.DB;
#region 获取专项检查列表信息
/// <summary>
/// 记录数
@@ -27,7 +26,7 @@ namespace BLL
/// <summary>
/// 定义变量
/// </summary>
private static IQueryable<Model.Check_CheckSpecial> getDataLists = from x in db.Check_CheckSpecial
private static IQueryable<Model.Check_CheckSpecial> getDataLists = from x in Funs.DB.Check_CheckSpecial
select x;
/// <summary>
@@ -90,7 +89,7 @@ namespace BLL
x.CheckSpecialId,
x.CheckTime,
x.CheckSpecialCode,
CheckItemName =db.Technique_CheckItemSet .First(y=>y.CheckItemSetId ==x. CheckItemSetId).CheckItemName,
CheckItemName =Funs.DB.Technique_CheckItemSet .First(y=>y.CheckItemSetId ==x. CheckItemSetId).CheckItemName,
CheckTypeName = x.CheckType == "1" ? "联合检查" : "专项检查",
StatesName = x.States == "2" ? "已完成" : (x.States == "1" ? "待整改" : "待提交"),
};
SGGL/BLL/HSSE/Check/Check_ProjectLeaderCheckService.cs
+5 -5
View File
@@ -4,6 +4,7 @@ using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Web.UI.WebControls;
using Model;
namespace BLL
{
@@ -12,8 +13,6 @@ namespace BLL
/// </summary>
public static class Check_ProjectLeaderCheckService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取领导带班检查
/// </summary>
@@ -37,7 +36,7 @@ namespace BLL
/// <summary>
/// 定义变量
/// </summary>
private static IQueryable<Model.Check_ProjectLeaderCheck> getDataLists = from x in db.Check_ProjectLeaderCheck
private static IQueryable<Model.Check_ProjectLeaderCheck> getDataLists = from x in Funs.DB.Check_ProjectLeaderCheck
select x;
/// <summary>
@@ -75,15 +74,16 @@ namespace BLL
return null;
}
getDataList = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
var db1 = Funs.DB;
return from x in getDataList
join y in db.Base_Project on x.ProjectId equals y.ProjectId
join y in db1.Base_Project on x.ProjectId equals y.ProjectId
into ps
from y in ps.DefaultIfEmpty()
select new
{
x.ProjectLeaderCheckId,
x.ProjectId,
db.Base_Project.First(u => u.ProjectId == x.ProjectId).ProjectName,
db1.Base_Project.First(u => u.ProjectId == x.ProjectId).ProjectName,
x.CheckCode,
x.UnitIds,
x.LeaderIds,
SGGL/BLL/HSSE/Check/IncentiveNoticeService.cs
+1 -1
View File
@@ -9,7 +9,7 @@ namespace BLL
/// </summary>
public static class IncentiveNoticeService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取奖励通知单
SGGL/BLL/HSSE/Check/PunishNoticeService.cs
+1 -1
View File
@@ -9,7 +9,7 @@ namespace BLL
/// </summary>
public static class PunishNoticeService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取处罚通知单
SGGL/BLL/HSSE/CostGoods/CostManageItemService.cs
+1 -1
View File
@@ -10,7 +10,7 @@ namespace BLL
/// </summary>
public static class CostManageItemService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键删除费用管理明细
SGGL/BLL/HSSE/CostGoods/CostManageService.cs
+1 -1
View File
@@ -11,7 +11,7 @@ namespace BLL
/// </summary>
public static class CostManageService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取安全费用管理
SGGL/BLL/HSSE/CostGoods/CostSmallDetailItemService.cs
+1 -1
View File
@@ -9,7 +9,7 @@ namespace BLL
/// </summary>
public static class CostSmallDetailItemService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取安全费用投入登记明细
SGGL/BLL/HSSE/CostGoods/CostSmallDetailService.cs
+1 -1
View File
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class CostSmallDetailService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取安全费用投入登记
SGGL/BLL/HSSE/CostGoods/ExpenseService.cs
+3 -4
View File
@@ -9,8 +9,6 @@ namespace BLL
/// </summary>
public static class ExpenseService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取措施费用使用计划
/// </summary>
@@ -171,8 +169,9 @@ namespace BLL
Year = Year,
};
db.CostGoods_Expense.InsertOnSubmit(newExpense);
db.SubmitChanges();
var db1 = Funs.DB;
db1.CostGoods_Expense.InsertOnSubmit(newExpense);
db1.SubmitChanges();
}
}
}
SGGL/BLL/HSSE/EduTrain/AccidentCaseItemService.cs
+1 -1
View File
@@ -5,7 +5,7 @@ namespace BLL
{
public class AccidentCaseItemService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据常见事故案例明细Id获取事故案例明细
SGGL/BLL/HSSE/EduTrain/AccidentCaseService.cs
+1 -1
View File
@@ -5,7 +5,7 @@ namespace BLL
{
public class AccidentCaseService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取事故伤害及预防
SGGL/BLL/HSSE/EduTrain/CompanyTrainingItemService.cs
+12 -10
View File
@@ -1,4 +1,5 @@
using System.Linq;
using Model;
namespace BLL
{
@@ -7,8 +8,6 @@ namespace BLL
/// </summary>
public class CompanyTrainingItemService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取公司培训明细信息
/// </summary>
@@ -16,7 +15,7 @@ namespace BLL
/// <returns></returns>
public static Model.Training_CompanyTrainingItem GetCompanyTrainingItemById(string companyTrainingItemId)
{
return db.Training_CompanyTrainingItem.FirstOrDefault(e => e.CompanyTrainingItemId == companyTrainingItemId);
return Funs.DB.Training_CompanyTrainingItem.FirstOrDefault(e => e.CompanyTrainingItemId == companyTrainingItemId);
}
/// <summary>
@@ -33,8 +32,9 @@ namespace BLL
newCompanyTrainingItem.AttachUrl = companyTrainingItem.AttachUrl;
newCompanyTrainingItem.CompileMan = companyTrainingItem.CompileMan;
newCompanyTrainingItem.CompileDate = companyTrainingItem.CompileDate;
db.Training_CompanyTrainingItem.InsertOnSubmit(newCompanyTrainingItem);
db.SubmitChanges();
var db1 = Funs.DB;
db1.Training_CompanyTrainingItem.InsertOnSubmit(newCompanyTrainingItem);
db1.SubmitChanges();
}
/// <summary>
@@ -43,7 +43,8 @@ namespace BLL
/// <param name="companyTrainingItem"></param>
public static void UpdateCompanyTrainingItem(Model.Training_CompanyTrainingItem companyTrainingItem)
{
Model.Training_CompanyTrainingItem newCompanyTrainingItem = db.Training_CompanyTrainingItem.FirstOrDefault(e => e.CompanyTrainingItemId == companyTrainingItem.CompanyTrainingItemId);
var db1 = Funs.DB;
Model.Training_CompanyTrainingItem newCompanyTrainingItem = db1.Training_CompanyTrainingItem.FirstOrDefault(e => e.CompanyTrainingItemId == companyTrainingItem.CompanyTrainingItemId);
if (newCompanyTrainingItem != null)
{
newCompanyTrainingItem.CompanyTrainingItemCode = companyTrainingItem.CompanyTrainingItemCode;
@@ -51,7 +52,7 @@ namespace BLL
newCompanyTrainingItem.AttachUrl = companyTrainingItem.AttachUrl;
newCompanyTrainingItem.CompileMan = companyTrainingItem.CompileMan;
newCompanyTrainingItem.CompileDate = companyTrainingItem.CompileDate;
db.SubmitChanges();
db1.SubmitChanges();
}
}
@@ -61,11 +62,12 @@ namespace BLL
/// <param name="companyTrainItemId"></param>
public static void DeleteCompanyTrainingItemById(string companyTrainItemId)
{
Model.Training_CompanyTrainingItem companyTrainingItem = db.Training_CompanyTrainingItem.FirstOrDefault(e => e.CompanyTrainingItemId == companyTrainItemId);
var db1 = Funs.DB;
Model.Training_CompanyTrainingItem companyTrainingItem = db1.Training_CompanyTrainingItem.FirstOrDefault(e => e.CompanyTrainingItemId == companyTrainItemId);
if (companyTrainingItem != null)
{
db.Training_CompanyTrainingItem.DeleteOnSubmit(companyTrainingItem);
db.SubmitChanges();
db1.Training_CompanyTrainingItem.DeleteOnSubmit(companyTrainingItem);
db1.SubmitChanges();
}
}
}
SGGL/BLL/HSSE/EduTrain/CompanyTrainingService.cs
+12 -10
View File
@@ -1,5 +1,6 @@
using System.Collections.Generic;
using System.Linq;
using Model;
namespace BLL
{
@@ -8,8 +9,6 @@ namespace BLL
/// </summary>
public class CompanyTrainingService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取公司培训
/// </summary>
@@ -17,7 +16,7 @@ namespace BLL
/// <returns></returns>
public static Model.Training_CompanyTraining GetCompanyTrainingById(string companyTrainingId)
{
return db.Training_CompanyTraining.FirstOrDefault(e => e.CompanyTrainingId == companyTrainingId);
return Funs.DB.Training_CompanyTraining.FirstOrDefault(e => e.CompanyTrainingId == companyTrainingId);
}
/// <summary>
@@ -32,8 +31,9 @@ namespace BLL
newCompanyTraining.CompanyTrainingName = companyTraining.CompanyTrainingName;
newCompanyTraining.SupCompanyTrainingId = companyTraining.SupCompanyTrainingId;
newCompanyTraining.IsEndLever = companyTraining.IsEndLever;
db.Training_CompanyTraining.InsertOnSubmit(newCompanyTraining);
db.SubmitChanges();
var db1 = Funs.DB;
db1.Training_CompanyTraining.InsertOnSubmit(newCompanyTraining);
db1.SubmitChanges();
}
/// <summary>
@@ -42,14 +42,15 @@ namespace BLL
/// <param name="companyTraining"></param>
public static void UpdateCompanyTraining(Model.Training_CompanyTraining companyTraining)
{
Model.Training_CompanyTraining newCompanyTraining = db.Training_CompanyTraining.FirstOrDefault(e => e.CompanyTrainingId == companyTraining.CompanyTrainingId);
var db1 = Funs.DB;
Model.Training_CompanyTraining newCompanyTraining = db1.Training_CompanyTraining.FirstOrDefault(e => e.CompanyTrainingId == companyTraining.CompanyTrainingId);
if (newCompanyTraining != null)
{
newCompanyTraining.CompanyTrainingCode = companyTraining.CompanyTrainingCode;
newCompanyTraining.CompanyTrainingName = companyTraining.CompanyTrainingName;
newCompanyTraining.SupCompanyTrainingId = companyTraining.SupCompanyTrainingId;
newCompanyTraining.IsEndLever = companyTraining.IsEndLever;
db.SubmitChanges();
db1.SubmitChanges();
}
}
@@ -59,11 +60,12 @@ namespace BLL
/// <param name="companyTrainingId"></param>
public static void DeleteCompanyTraining(string companyTrainingId)
{
Model.Training_CompanyTraining companyTraining = db.Training_CompanyTraining.FirstOrDefault(e => e.CompanyTrainingId == companyTrainingId);
var db1 = Funs.DB;
Model.Training_CompanyTraining companyTraining = db1.Training_CompanyTraining.FirstOrDefault(e => e.CompanyTrainingId == companyTrainingId);
if (companyTraining != null)
{
db.Training_CompanyTraining.DeleteOnSubmit(companyTraining);
db.SubmitChanges();
db1.Training_CompanyTraining.DeleteOnSubmit(companyTraining);
db1.SubmitChanges();
}
}
SGGL/BLL/HSSE/EduTrain/EduTrain_TrainRecordDetailService.cs
+1 -1
View File
@@ -8,7 +8,7 @@ namespace BLL
/// </summary>
public static class EduTrain_TrainRecordDetailService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据教育培训主键获取所有的教育培训明细信息
SGGL/BLL/HSSE/EduTrain/EduTrain_TrainRecordService.cs
+1 -1
View File
@@ -9,7 +9,7 @@ namespace BLL
/// </summary>
public static class EduTrain_TrainRecordService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据教育培训主键获取教育培训信息
SGGL/BLL/HSSE/EduTrain/EduTrain_TrainTestService.cs
+1 -1
View File
@@ -8,7 +8,7 @@ namespace BLL
/// </summary>
public static class EduTrain_TrainTestService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据教育培训主键获取所有的教育培训明细信息
SGGL/BLL/HSSE/EduTrain/TestPlanService.cs
+8 -7
View File
@@ -1,5 +1,6 @@
using System.Collections.Generic;
using System.Linq;
using Model;
namespace BLL
{
@@ -8,8 +9,6 @@ namespace BLL
/// </summary>
public static class TestPlanService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取培训计划
/// </summary>
@@ -53,8 +52,9 @@ namespace BLL
States = testPlan.States
};
db.Training_TestPlan.InsertOnSubmit(newTestPlan);
db.SubmitChanges();
var db1 = Funs.DB;
db1.Training_TestPlan.InsertOnSubmit(newTestPlan);
db1.SubmitChanges();
}
/// <summary>
@@ -63,7 +63,8 @@ namespace BLL
/// <param name="TestPlan"></param>
public static void UpdateTestPlan(Model.Training_TestPlan TestPlan)
{
Model.Training_TestPlan newTestPlan = db.Training_TestPlan.FirstOrDefault(e => e.TestPlanId == TestPlan.TestPlanId);
var db1 = Funs.DB;
Model.Training_TestPlan newTestPlan = db1.Training_TestPlan.FirstOrDefault(e => e.TestPlanId == TestPlan.TestPlanId);
if (newTestPlan != null)
{
newTestPlan.PlanCode = TestPlan.PlanCode;
@@ -83,7 +84,7 @@ namespace BLL
newTestPlan.WorkPostIds = TestPlan.WorkPostIds;
newTestPlan.WorkPostNames = TestPlan.WorkPostNames;
newTestPlan.States = TestPlan.States;
db.SubmitChanges();
db1.SubmitChanges();
}
}
@@ -138,7 +139,7 @@ namespace BLL
/// <returns></returns>
public static List<Model.Training_TestPlan> GetTestPlanList()
{
return (from x in db.Training_TestPlan orderby x.PlanCode select x).ToList();
return (from x in Funs.DB.Training_TestPlan orderby x.PlanCode select x).ToList();
}
/// <summary>
SGGL/BLL/HSSE/EduTrain/TestRecordItemService.cs
+4 -5
View File
@@ -7,8 +7,6 @@ namespace BLL
/// </summary>
public static class TestRecordItemService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据考试记录Id获取明细信息
/// </summary>
@@ -25,11 +23,12 @@ namespace BLL
/// <param name="planId"></param>
public static void DeleteTestRecordItemmByTestRecordItemId(string testRecordItemId)
{
var testRecordItem = db.Training_TestRecordItem.FirstOrDefault(x => x.TestRecordItemId == testRecordItemId);
var db1 = Funs.DB;
var testRecordItem = db1.Training_TestRecordItem.FirstOrDefault(x => x.TestRecordItemId == testRecordItemId);
if (testRecordItem != null)
{
db.Training_TestRecordItem.DeleteOnSubmit(testRecordItem);
db.SubmitChanges();
db1.Training_TestRecordItem.DeleteOnSubmit(testRecordItem);
db1.SubmitChanges();
}
}
}
SGGL/BLL/HSSE/EduTrain/TestRecordService.cs
+7 -7
View File
@@ -2,6 +2,7 @@
using System;
using System.Collections;
using System.Linq;
using Model;
namespace BLL
{
@@ -10,8 +11,6 @@ namespace BLL
/// </summary>
public static class TestRecordService
{
public static Model.SGGLDB db = Funs.DB;
#region 获取列表数据
/// <summary>
/// 记录数
@@ -25,7 +24,7 @@ namespace BLL
/// <summary>
/// 定义变量
/// </summary>
private static IQueryable<Model.Training_TestRecord> getDataLists = from x in db.Training_TestRecord
private static IQueryable<Model.Training_TestRecord> getDataLists = from x in Funs.DB.Training_TestRecord
where x.TestStartTime.HasValue
select x;
@@ -44,16 +43,17 @@ namespace BLL
return null;
}
getDataList = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
var db1 = Funs.DB;
return from x in getDataList
join y in db.Training_TestPlan on x.TestPlanId equals y.TestPlanId
join z in db.Training_Plan on y.PlanId equals z.PlanId into g
join y in db1.Training_TestPlan on x.TestPlanId equals y.TestPlanId
join z in db1.Training_Plan on y.PlanId equals z.PlanId into g
from z in g.DefaultIfEmpty()
select new
{
x.TestRecordId,
x.TestPlanId,
x.ProjectId,
db.Base_Project.First(p => p.ProjectId == x.ProjectId).ProjectName,
db1.Base_Project.First(p => p.ProjectId == x.ProjectId).ProjectName,
y.PlanName,
y.PlanCode,
y.TestPalce,
@@ -62,7 +62,7 @@ namespace BLL
x.TestEndTime,
x.TestScores,
z.TrainTypeId,
db.Base_TrainType.First(u=>u.TrainTypeId == z.TrainTypeId).TrainTypeName,
db1.Base_TrainType.First(u=>u.TrainTypeId == z.TrainTypeId).TrainTypeName,
z.TrainStartDate,
};
}
SGGL/BLL/HSSE/EduTrain/TestTrainingItemService.cs
+1 -1
View File
@@ -5,7 +5,7 @@ namespace BLL
{
public static class TestTrainingItemService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取信息
SGGL/BLL/HSSE/EduTrain/TestTrainingService.cs
+3 -4
View File
@@ -1,12 +1,11 @@
using System.Collections.Generic;
using System.Linq;
using Model;
namespace BLL
{
public static class TestTrainingService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取信息
/// </summary>
@@ -86,7 +85,7 @@ namespace BLL
/// <returns></returns>
public static List<Model.Training_TestTraining> GetTestTrainingList()
{
return (from x in db.Training_TestTraining orderby x.TrainingCode select x).ToList();
return (from x in Funs.DB.Training_TestTraining orderby x.TrainingCode select x).ToList();
}
/// <summary>
@@ -95,7 +94,7 @@ namespace BLL
/// <returns></returns>
public static List<Model.Training_TestTraining> 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();
SGGL/BLL/HSSE/EduTrain/TrainTestDBItemService.cs
+1 -1
View File
@@ -8,7 +8,7 @@ namespace BLL
/// </summary>
public static class TrainTestDBItemService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键删除安全试题库明细信息
SGGL/BLL/HSSE/EduTrain/TrainTestDBService.cs
+1 -1
View File
@@ -8,7 +8,7 @@ namespace BLL
/// </summary>
public static class TrainTestDBService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取安全试题库信息
SGGL/BLL/HSSE/EduTrain/TrainingItemService.cs
+1 -1
View File
@@ -5,7 +5,7 @@ namespace BLL
{
public class TrainingItemService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
///
SGGL/BLL/HSSE/EduTrain/TrainingPlanItemService.cs
+9 -8
View File
@@ -1,5 +1,6 @@
using System.Collections.Generic;
using System.Linq;
using Model;
namespace BLL
{
@@ -8,8 +9,6 @@ namespace BLL
/// </summary>
public static class TrainingPlanItemService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据培训计划明细表Id获取所有相关明细信息
/// </summary>
@@ -17,7 +16,7 @@ namespace BLL
/// <returns></returns>
public static List<Model.Training_PlanItem> GetPlanItemByPlanId(string planId)
{
return (from x in db.Training_PlanItem where x.PlanId == planId select x).ToList();
return (from x in Funs.DB.Training_PlanItem where x.PlanId == planId select x).ToList();
}
/// <summary>
@@ -32,8 +31,9 @@ namespace BLL
PlanId = planItem.PlanId,
TrainingEduId = planItem.TrainingEduId
};
db.Training_PlanItem.InsertOnSubmit(newPlanItem);
db.SubmitChanges();
var db1 = Funs.DB;
db1.Training_PlanItem.InsertOnSubmit(newPlanItem);
db1.SubmitChanges();
}
/// <summary>
@@ -42,11 +42,12 @@ namespace BLL
/// <param name="planItemId"></param>
public static void DeletePlanItemById(string planItemId)
{
var planItem = db.Training_PlanItem.FirstOrDefault(e => e.PlanItemId == planItemId);
var db1 = Funs.DB;
var planItem = db1.Training_PlanItem.FirstOrDefault(e => e.PlanItemId == planItemId);
if (planItem != null)
{
db.Training_PlanItem.DeleteOnSubmit(planItem);
db.SubmitChanges();
db1.Training_PlanItem.DeleteOnSubmit(planItem);
db1.SubmitChanges();
}
}
SGGL/BLL/HSSE/EduTrain/TrainingPlanService.cs
+5 -5
View File
@@ -1,5 +1,6 @@
using System.Collections.Generic;
using System.Linq;
using Model;
namespace BLL
{
@@ -8,8 +9,6 @@ namespace BLL
/// </summary>
public static class TrainingPlanService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取培训计划
/// </summary>
@@ -36,8 +35,9 @@ namespace BLL
WorkPostId = plan.WorkPostId,
States = plan.States
};
db.Training_Plan.InsertOnSubmit(newPlan);
db.SubmitChanges();
var db1 = Funs.DB;
db1.Training_Plan.InsertOnSubmit(newPlan);
db1.SubmitChanges();
}
/// <summary>
@@ -80,7 +80,7 @@ namespace BLL
/// <returns></returns>
public static List<Model.Training_Plan> GetPlanList()
{
return (from x in db.Training_Plan orderby x.PlanCode select x).ToList();
return (from x in Funs.DB.Training_Plan orderby x.PlanCode select x).ToList();
}
}
}
SGGL/BLL/HSSE/EduTrain/TrainingService.cs
+1 -1
View File
@@ -5,7 +5,7 @@ namespace BLL
{
public class TrainingService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据上级Id查询所有教育培训主键列的值
SGGL/BLL/HSSE/EduTrain/TrainingTaskService.cs
+9 -8
View File
@@ -1,5 +1,6 @@
using System.Collections.Generic;
using System.Linq;
using Model;
namespace BLL
{
@@ -8,8 +9,6 @@ namespace BLL
/// </summary>
public static class TrainingTaskService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取培训任务
/// </summary>
@@ -17,7 +16,7 @@ namespace BLL
/// <returns></returns>
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);
}
/// <summary>
@@ -44,8 +43,9 @@ namespace BLL
TaskDate = task.TaskDate,
States = task.States
};
db.Training_Task.InsertOnSubmit(newTask);
db.SubmitChanges();
var db1 = Funs.DB;
db1.Training_Task.InsertOnSubmit(newTask);
db1.SubmitChanges();
}
/// <summary>
@@ -71,11 +71,12 @@ namespace BLL
/// <param name="taskId"></param>
public static void DeleteTaskById(string taskId)
{
Model.Training_Task task = db.Training_Task.FirstOrDefault(e => e.TaskId == taskId);
var db1 = Funs.DB;
Model.Training_Task task = db1.Training_Task.FirstOrDefault(e => e.TaskId == taskId);
if (task != null)
{
db.Training_Task.DeleteOnSubmit(task);
db.SubmitChanges();
db1.Training_Task.DeleteOnSubmit(task);
db1.SubmitChanges();
}
}
SGGL/BLL/HSSE/Emergency/DrillRecordListService.cs
+1 -1
View File
@@ -9,7 +9,7 @@ namespace BLL
/// </summary>
public static class DrillRecordListService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取应急演练
SGGL/BLL/HSSE/Emergency/EmergencyListService.cs
+1 -1
View File
@@ -9,7 +9,7 @@ namespace BLL
/// </summary>
public static class EmergencyListService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取应急预案管理
SGGL/BLL/HSSE/Emergency/EmergencySupplyService.cs
+1 -1
View File
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class EmergencySupplyService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取应急物资管理
SGGL/BLL/HSSE/Emergency/EmergencyTeamAndTrainService.cs
+1 -1
View File
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class EmergencyTeamAndTrainService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取应急队伍/培训
SGGL/BLL/HSSE/Environmental/EIAReportService.cs
+1 -1
View File
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class EIAReportService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取环评报告
SGGL/BLL/HSSE/Environmental/EnvironmentalCheckService.cs
+4 -5
View File
@@ -12,8 +12,6 @@ namespace BLL
/// </summary>
public static class EnvironmentalCheckService
{
public static Model.SGGLDB db = Funs.DB;
#region 推送环境监测数据
/// <summary>
@@ -22,7 +20,8 @@ namespace BLL
/// <returns></returns>
public static ReturnData PushEnvironmentalCheckData()
{
var items = (from x in db.EnvironmentalCheck where x.IsPushed == false select x).ToList();
var db1 = Funs.DB;
var items = (from x in db1.EnvironmentalCheck where x.IsPushed == false select x).ToList();
Model.ReturnData responeData = new Model.ReturnData();
if (items.Count() > 0)
{
@@ -35,11 +34,11 @@ namespace BLL
{//推送成功后，修改数据状态
foreach (var item in items)
{
Model.EnvironmentalCheck envModel = db.EnvironmentalCheck.FirstOrDefault(e => e.Id == item.Id);
Model.EnvironmentalCheck envModel = db1.EnvironmentalCheck.FirstOrDefault(e => e.Id == item.Id);
if (envModel != null)
{
envModel.IsPushed = true;
db.SubmitChanges();
db1.SubmitChanges();
}
}
}
SGGL/BLL/HSSE/Environmental/EnvironmentalEmergencyPlanService.cs
+1 -1
View File
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class EnvironmentalEmergencyPlanService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取环境事件应急预案
SGGL/BLL/HSSE/Environmental/EnvironmentalMonitoringService.cs
+1 -1
View File
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class EnvironmentalMonitoringService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取环境监测数据
SGGL/BLL/HSSE/Environmental/UnexpectedEnvironmentalService.cs
+1 -1
View File
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class UnexpectedEnvironmentalService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取突发环境事件
SGGL/BLL/HSSE/HSSESystem/HSSEMainDutyService.cs
+1 -1
View File
@@ -8,7 +8,7 @@ namespace BLL
/// </summary>
public static class HSSEMainDutyService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取安全主体责任
SGGL/BLL/HSSE/HSSESystem/ServerSafetyInstitutionService.cs
+1 -1
View File
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class ServerSafetyInstitutionService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取安全制度
SGGL/BLL/HSSE/Hazard/ConstructionRiskApproveService.cs
+10 -9
View File
@@ -2,12 +2,12 @@
using System.Collections.Generic;
using System.Data;
using System.Linq;
using Model;
namespace BLL
{
public class ConstructionRiskApproveService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 获取风险管控模板列表
/// </summary>
@@ -16,14 +16,15 @@ namespace BLL
/// <returns></returns>
public static DataTable getListData(string ConstructionRiskId)
{
var res = from x in db.HSSE_ConstructionRiskApprove
var db1 = Funs.DB;
var res = from x in db1.HSSE_ConstructionRiskApprove
where x.ConstructionRiskId == ConstructionRiskId && x.ApproveDate != null && x.ApproveType != "S"
orderby x.ApproveDate
select new
{
x.ConstructionRiskApproveId,
x.ConstructionRiskId,
ApproveMan = (from y in db.Person_Persons where y.PersonId == x.ApproveMan select y.PersonName).First(),
ApproveMan = (from y in db1.Person_Persons where y.PersonId == x.ApproveMan select y.PersonName).First(),
x.ApproveDate,
x.IsAgree,
x.ApproveIdea,
@@ -76,7 +77,7 @@ namespace BLL
/// <returns></returns>
public static Model.HSSE_ConstructionRiskApprove GetSee(string ConstructionRiskId, string userId)
{
return db.HSSE_ConstructionRiskApprove.FirstOrDefault(x => x.ConstructionRiskId == ConstructionRiskId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null);
return Funs.DB.HSSE_ConstructionRiskApprove.FirstOrDefault(x => x.ConstructionRiskId == ConstructionRiskId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null);
}
public static void See(string ConstructionRiskId, string userId)
{
@@ -97,7 +98,7 @@ namespace BLL
/// <returns>一个风险管控审批实体</returns>
public static Model.HSSE_ConstructionRiskApprove GetConstructionRiskApproveByConstructionRiskId(string ConstructionRiskId)
{
return db.HSSE_ConstructionRiskApprove.FirstOrDefault(x => x.ConstructionRiskId == ConstructionRiskId && x.ApproveType != "S" && x.ApproveDate == null);
return Funs.DB.HSSE_ConstructionRiskApprove.FirstOrDefault(x => x.ConstructionRiskId == ConstructionRiskId && x.ApproveType != "S" && x.ApproveDate == null);
}
/// <summary>
/// 修改风险管控审批信息
@@ -162,7 +163,7 @@ namespace BLL
/// <returns></returns>
public static Model.HSSE_ConstructionRiskApprove GetAudit1(string ConstructionRiskId)
{
return db.HSSE_ConstructionRiskApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.ConstructionRiskId == ConstructionRiskId && x.ApproveType == BLL.Const.ConstructionRisk_Audit1);
return Funs.DB.HSSE_ConstructionRiskApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.ConstructionRiskId == ConstructionRiskId && x.ApproveType == BLL.Const.ConstructionRisk_Audit1);
}
/// <summary>
@@ -172,7 +173,7 @@ namespace BLL
/// <returns></returns>
public static Model.HSSE_ConstructionRiskApprove GetAudit2(string ConstructionRiskId)
{
return db.HSSE_ConstructionRiskApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.ConstructionRiskId == ConstructionRiskId && x.ApproveType == BLL.Const.ConstructionRisk_Audit2);
return Funs.DB.HSSE_ConstructionRiskApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.ConstructionRiskId == ConstructionRiskId && x.ApproveType == BLL.Const.ConstructionRisk_Audit2);
}
/// <summary>
@@ -182,12 +183,12 @@ namespace BLL
/// <returns></returns>
public static Model.HSSE_ConstructionRiskApprove GetAudit3(string ConstructionRiskId)
{
return db.HSSE_ConstructionRiskApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.ConstructionRiskId == ConstructionRiskId && x.ApproveType == BLL.Const.ConstructionRisk_Audit3);
return Funs.DB.HSSE_ConstructionRiskApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.ConstructionRiskId == ConstructionRiskId && x.ApproveType == BLL.Const.ConstructionRisk_Audit3);
}
public static Model.HSSE_ConstructionRiskApprove GetComplie(string ConstructionRiskId)
{
return db.HSSE_ConstructionRiskApprove.FirstOrDefault(x => x.ConstructionRiskId == ConstructionRiskId && x.ApproveType == BLL.Const.ConstructionRisk_Compile);
return Funs.DB.HSSE_ConstructionRiskApprove.FirstOrDefault(x => x.ConstructionRiskId == ConstructionRiskId && x.ApproveType == BLL.Const.ConstructionRisk_Compile);
}
public static List<Model.HSSE_ConstructionRiskApprove> GetListDataByCodeForApi(string code)
{
SGGL/BLL/HSSE/Hazard/ConstructionRiskCheckService.cs
+1 -1
View File
@@ -7,7 +7,7 @@ namespace BLL
{
public static class ConstructionRiskCheckService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 要求主键获取危险清单信息
SGGL/BLL/HSSE/Hazard/ConstructionRiskListService.cs
+1 -1
View File
@@ -8,7 +8,7 @@ namespace BLL
{
public static class ConstructionRiskListService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 要求主键获取危险清单信息
SGGL/BLL/HSSE/Hazard/Hazard_EnvironmentalRiskItemService.cs
+2 -3
View File
@@ -1,12 +1,11 @@
using System.Collections.Generic;
using System.Linq;
using Model;
namespace BLL
{
public static class Hazard_EnvironmentalRiskItemService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据危险源明细表id得到明细信息
/// </summary>
@@ -136,7 +135,7 @@ namespace BLL
/// <returns></returns>
public static List<Model.Hazard_EnvironmentalRiskItem> GetEnvironmentalRiskItemByEnvironmentalId(string environmentalId)
{
return (from x in db.Hazard_EnvironmentalRiskItem where x.EnvironmentalId == environmentalId select x).ToList();
return (from x in Funs.DB.Hazard_EnvironmentalRiskItem where x.EnvironmentalId == environmentalId select x).ToList();
}
}
}
SGGL/BLL/HSSE/Hazard/Hazard_EnvironmentalRiskListService.cs
+1 -1
View File
@@ -5,7 +5,7 @@ namespace BLL
{
public static class Hazard_EnvironmentalRiskListService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 要求主键获取危险清单信息
SGGL/BLL/HSSE/Hazard/Hazard_HazardListService.cs
+2 -3
View File
@@ -1,12 +1,11 @@
using System;
using System.Linq;
using Model;
namespace BLL
{
public static class Hazard_HazardListService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 要求主键获取危险清单信息
/// </summary>
@@ -23,7 +22,7 @@ namespace BLL
/// <returns>危险清单的数量</returns>
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();
}
/// <summary>
SGGL/BLL/HSSE/Hazard/Hazard_HazardSelectedItemService.cs
+8 -9
View File
@@ -1,13 +1,12 @@
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using Model;
namespace BLL
{
public static class Hazard_HazardSelectedItemService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据危险源类别编号查询危险源类别
/// </summary>
@@ -15,7 +14,7 @@ namespace BLL
/// <returns></returns>
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
{
@@ -48,7 +47,7 @@ namespace BLL
/// <returns></returns>
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
{
@@ -80,7 +79,7 @@ namespace BLL
/// <returns>危险因素明细集合</returns>
public static List<Model.Hazard_HazardSelectedItem> 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();
}
/// <summary>
@@ -89,7 +88,7 @@ namespace BLL
/// <returns>危险因素明细集合</returns>
public static List<Model.Hazard_HazardSelectedItem> 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();
}
/// <summary>
@@ -99,7 +98,7 @@ namespace BLL
/// <returns>一个危险源辨识与评价清单审批实体</returns>
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);
}
/// <summary>
@@ -109,7 +108,7 @@ namespace BLL
/// <returns>一个危险源辨识与评价清单审批实体</returns>
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);
}
/// <summary>
@@ -142,7 +141,7 @@ namespace BLL
/// <returns></returns>
public static List<Model.Hazard_HazardSelectedItem> GetHazardSelectedItemBySortAndListIdAndWorkStage(string hazardListTypeId, string hazardListId, string workStage)
{
return (from x in db.Hazard_HazardSelectedItem where x.HazardListTypeId == hazardListTypeId && x.HazardListId == hazardListId && x.WorkStage == workStage select x).ToList();
return (from x in Funs.DB.Hazard_HazardSelectedItem where x.HazardListTypeId == hazardListTypeId && x.HazardListId == hazardListId && x.WorkStage == workStage select x).ToList();
}
/// <summary>
SGGL/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs
+2 -3
View File
@@ -3,13 +3,12 @@ using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using Model;
namespace BLL
{
public static class HSSE_Hazard_HazardRegisterService
{
public static Model.SGGLDB db = Funs.DB;
#region 获取安全巡检列表信息
/// <summary>
/// 记录数
@@ -23,7 +22,7 @@ namespace BLL
/// <summary>
/// 定义变量
/// </summary>
private static IQueryable<Model.View_Hazard_HazardRegisterList> getDataLists = from x in db.View_Hazard_HazardRegisterList
private static IQueryable<Model.View_Hazard_HazardRegisterList> getDataLists = from x in Funs.DB.View_Hazard_HazardRegisterList
where x.ProblemTypes == "1"
select x;
SGGL/BLL/HSSE/InApproveManager/EquipmentInItemService.cs
+1 -1
View File
@@ -8,7 +8,7 @@ namespace BLL
/// </summary>
public static class EquipmentInItemService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取特种设备机具入场报批明细信息
SGGL/BLL/HSSE/InApproveManager/EquipmentInService.cs
+1 -1
View File
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class EquipmentInService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取特种设备机具入场报批
SGGL/BLL/HSSE/InApproveManager/EquipmentOutItemService.cs
+1 -1
View File
@@ -8,7 +8,7 @@ namespace BLL
/// </summary>
public static class EquipmentOutItemService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取特种设备机具出场报批明细
SGGL/BLL/HSSE/InApproveManager/EquipmentOutService.cs
+1 -1
View File
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class EquipmentOutService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取特种设备机具出场报批
SGGL/BLL/HSSE/InApproveManager/EquipmentQualityInItemService.cs
+1 -1
View File
@@ -8,7 +8,7 @@ namespace BLL
/// </summary>
public static class EquipmentQualityInItemService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主表ID获取明细信息
SGGL/BLL/HSSE/InApproveManager/EquipmentQualityInService.cs
+1 -1
View File
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class EquipmentQualityInService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取特种设备审批
SGGL/BLL/HSSE/InApproveManager/GeneralEquipmentInItemService.cs
+1 -1
View File
@@ -8,7 +8,7 @@ namespace BLL
/// </summary>
public static class GeneralEquipmentInItemService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取一般设备机具入场报批明细信息
SGGL/BLL/HSSE/InApproveManager/GeneralEquipmentInService.cs
+1 -1
View File
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class GeneralEquipmentInService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取一般设备机具入场报批
SGGL/BLL/HSSE/InApproveManager/GeneralEquipmentOutItemService.cs
+1 -1
View File
@@ -8,7 +8,7 @@ namespace BLL
/// </summary>
public static class GeneralEquipmentOutItemService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取一般设备机具出场报批
SGGL/BLL/HSSE/InApproveManager/GeneralEquipmentOutService.cs
+1 -1
View File
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class GeneralEquipmentOutService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取一般设备机具出场报批
SGGL/BLL/HSSE/InformationProject/ConstructionStandardIdentifyService.cs
+1 -1
View File
@@ -4,7 +4,7 @@ namespace BLL
{
public static class ConstructionStandardIdentifyService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据标准规范辨识主键获取一个标准规范辨识信息
SGGL/BLL/HSSE/InformationProject/ConstructionStandardSelectedItemService.cs
+1 -1
View File
@@ -5,7 +5,7 @@ namespace BLL
{
public static class ConstructionStandardSelectedItemService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据标准规范辨识Id获取对应所有标准规范项信息
SGGL/BLL/HSSE/InformationProject/ProjectAccidentCauseReportItemService.cs
+1 -1
View File
@@ -8,7 +8,7 @@ namespace BLL
/// </summary>
public static class ProjectAccidentCauseReportItemService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 职工伤亡事故原因分析报表明细表
SGGL/BLL/HSSE/InformationProject/ProjectAccidentCauseReportService.cs
+1 -1
View File
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class ProjectAccidentCauseReportService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 职工伤亡事故原因分析报表
SGGL/BLL/HSSE/InformationProject/ProjectDrillConductedQuarterlyReportItemService.cs
+1 -1
View File
@@ -8,7 +8,7 @@ namespace BLL
/// </summary>
public static class ProjectDrillConductedQuarterlyReportItemService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取应急演练开展情况季报表明细信息
SGGL/BLL/HSSE/InformationProject/ProjectDrillConductedQuarterlyReportService.cs
+1 -1
View File
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class ProjectDrillConductedQuarterlyReportService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取应急演练开展情况季报表
SGGL/BLL/HSSE/InformationProject/ProjectDrillPlanHalfYearReportItemService.cs
+1 -1
View File
@@ -8,7 +8,7 @@ namespace BLL
/// </summary>
public static class ProjectDrillPlanHalfYearReportItemService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取应急演练工作计划半年报明细信息
SGGL/BLL/HSSE/InformationProject/ProjectDrillPlanHalfYearReportService.cs
+1 -1
View File
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class ProjectDrillPlanHalfYearReportService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取应急演练工作计划半年报
SGGL/BLL/HSSE/InformationProject/ProjectMillionsMonthlyReportService.cs
+1 -1
View File
@@ -10,7 +10,7 @@ namespace BLL
/// </summary>
public static class ProjectMillionsMonthlyReportService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取企业安全数据统计月报
SGGL/BLL/HSSE/InformationProject/ProjectSafetyQuarterlyReportService.cs
+1 -1
View File
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class ProjectSafetyQuarterlyReportService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取安全生产数据季报
SGGL/BLL/HSSE/Law/HSSEStandardsListService.cs
+1 -1
View File
@@ -5,7 +5,7 @@ namespace BLL
{
public class HSSEStandardsListService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据id查询标准规范信息
SGGL/BLL/HSSE/Law/LawRegulationListService.cs
+1 -1
View File
@@ -8,7 +8,7 @@ namespace BLL
/// </summary>
public static class LawRegulationListService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取法律法规
SGGL/BLL/HSSE/Law/ManageRuleService.cs
+1 -1
View File
@@ -8,7 +8,7 @@ namespace BLL
/// </summary>
public static class ManageRuleService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取管理规定
SGGL/BLL/HSSE/Law/RulesRegulationsService.cs
+1 -1
View File
@@ -8,7 +8,7 @@ namespace BLL
/// </summary>
public static class RulesRegulationsService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取生产规章制度
SGGL/BLL/HSSE/License/HSETechnicalService.cs
+1 -1
View File
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class HSETechnicalService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取安全技术交底
SGGL/BLL/HSSE/License/LicenseManagerService.cs
+4 -5
View File
@@ -14,8 +14,6 @@ namespace BLL
/// </summary>
public static class LicenseManagerService
{
public static Model.SGGLDB db = Funs.DB;
#region 获取安全巡检列表信息
/// <summary>
/// 记录数
@@ -29,7 +27,7 @@ namespace BLL
/// <summary>
/// 定义变量
/// </summary>
private static IQueryable<Model.License_LicenseManager> getDataLists = from x in db.License_LicenseManager
private static IQueryable<Model.License_LicenseManager> getDataLists = from x in Funs.DB.License_LicenseManager
select x;
/// <summary>
@@ -85,13 +83,14 @@ namespace BLL
return null;
}
getDataList = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
var db1 = Funs.DB;
return from x in getDataList
select new
{
x.LicenseManagerId,
x.LicenseManagerCode,
LicenseTypeName = db.Base_LicenseType.First(t => t.LicenseTypeId == x.LicenseTypeId).LicenseTypeName,
UnitName = db.Base_Unit.First(u => u.UnitId == x.UnitId).UnitName,
LicenseTypeName = db1.Base_LicenseType.First(t => t.LicenseTypeId == x.LicenseTypeId).LicenseTypeName,
UnitName = db1.Base_Unit.First(u => u.UnitId == x.UnitId).UnitName,
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
x.CompileDate,
x.StartDate,
SGGL/BLL/HSSE/License/LicensePublicService.cs
+1 -1
View File
@@ -9,7 +9,7 @@ namespace BLL
/// </summary>
public static class LicensePublicService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 状态下拉框
/// </summary>
SGGL/BLL/HSSE/Manager/CompletionReportService.cs
+1 -1
View File
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class CompletionReportService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取完工报告
SGGL/BLL/HSSE/Meeting/AttendMeetingService.cs
+1 -1
View File
@@ -9,7 +9,7 @@ namespace BLL
/// </summary>
public static class AttendMeetingService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取其他会议记录
SGGL/BLL/HSSE/Meeting/ClassMeetingService.cs
+1 -1
View File
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class ClassMeetingService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取班前会
SGGL/BLL/HSSE/Meeting/MonthMeetingService.cs
+1 -1
View File
@@ -9,7 +9,7 @@ namespace BLL
/// </summary>
public static class MonthMeetingService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取安全月例会
SGGL/BLL/HSSE/Meeting/SafetyLeaderGroupMeetingService.cs
+1 -1
View File
@@ -11,7 +11,7 @@ namespace BLL
/// </summary>
public static class SafetyLeaderGroupMeetingService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取安全领导小组会议
SGGL/BLL/HSSE/Meeting/SpecialMeetingService.cs
+1 -1
View File
@@ -9,7 +9,7 @@ namespace BLL
/// </summary>
public static class SpecialMeetingService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取专题例会
SGGL/BLL/HSSE/Meeting/WeekMeetingService.cs
+1 -1
View File
@@ -9,7 +9,7 @@ namespace BLL
/// </summary>
public static class WeekMeetingService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取周例会
SGGL/BLL/HSSE/OccupationHealth/HazardDetectionService.cs
+1 -1
View File
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class HazardDetectionService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取危害检测
SGGL/BLL/HSSE/OccupationHealth/OccupationalDiseaseAccidentService.cs
+1 -1
View File
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class OccupationalDiseaseAccidentService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取职业病事故
SGGL/BLL/HSSE/OccupationHealth/PhysicalExaminationService.cs
+5 -5
View File
@@ -3,6 +3,7 @@ using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using Model;
namespace BLL
{
@@ -11,8 +12,6 @@ namespace BLL
/// </summary>
public static class PhysicalExaminationService
{
public static Model.SGGLDB db = Funs.DB;
#region 获取安全巡检列表信息
/// <summary>
/// 记录数
@@ -26,7 +25,7 @@ namespace BLL
/// <summary>
/// 定义变量
/// </summary>
private static IQueryable<Model.SitePerson_Person> getDataLists = from x in db.SitePerson_Person
private static IQueryable<Model.SitePerson_Person> getDataLists = from x in Funs.DB.SitePerson_Person
select x;
/// <summary>
@@ -54,13 +53,14 @@ namespace BLL
return null;
}
getDataList = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
var db1 = Funs.DB;
return from x in getDataList
select new
{
x.ProjectId,
ProjectName = db.Base_Project.First(p => p.ProjectId == x.ProjectId).ProjectName,
ProjectName = db1.Base_Project.First(p => p.ProjectId == x.ProjectId).ProjectName,
x.UnitId,
UnitName = db.Base_Unit.First(p => p.UnitId == x.UnitId).UnitName,
UnitName = db1.Base_Unit.First(p => p.UnitId == x.UnitId).UnitName,
x.SitePersonId,
x.PersonId,
x.CardNo,
SGGL/BLL/HSSE/QualityAudit/EquipmentPersonQualityService.cs
+1 -1
View File
@@ -9,7 +9,7 @@ namespace BLL
/// </summary>
public static class EquipmentPersonQualityService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取特种设备作业人员资质
SGGL/BLL/HSSE/QualityAudit/EquipmentQualityAuditDetailService.cs
+1 -1
View File
@@ -9,7 +9,7 @@ namespace BLL
/// </summary>
public static class EquipmentQualityAuditDetailService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取特种设备资质审查明细
SGGL/BLL/HSSE/QualityAudit/EquipmentQualityService.cs
+1 -1
View File
@@ -8,7 +8,7 @@ namespace BLL
/// </summary>
public static class EquipmentQualityService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取特殊机具设备资质
SGGL/BLL/HSSE/QualityAudit/GeneralEquipmentQualityService.cs
+1 -1
View File
@@ -9,7 +9,7 @@ namespace BLL
/// </summary>
public static class GeneralEquipmentQualityService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取一般机具设备资质
SGGL/BLL/HSSE/QualityAudit/PersonQualityService.cs
+5 -5
View File
@@ -5,6 +5,7 @@ using Aspose.Words.Lists;
using FineUIPro;
using Org.BouncyCastle.Ocsp;
using System.Collections;
using Model;
namespace BLL
{
@@ -13,8 +14,6 @@ namespace BLL
/// </summary>
public static class PersonQualityService
{
public static Model.SGGLDB db = Funs.DB;
#region 获取人员证书列表信息
/// <summary>
/// 记录数
@@ -28,7 +27,7 @@ namespace BLL
/// <summary>
/// 定义变量
/// </summary>
private static IQueryable<Model.QualityAudit_PersonQuality> getDataLists = from x in db.QualityAudit_PersonQuality
private static IQueryable<Model.QualityAudit_PersonQuality> getDataLists = from x in Funs.DB.QualityAudit_PersonQuality
select x;
/// <summary>
@@ -46,13 +45,14 @@ namespace BLL
return null;
}
getDataList = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
var db1 = Funs.DB;
return from x in getDataList
select new
{
x.PersonQualityId,
x.PersonId,
x.CertificateId,
CertificateName = db.Base_Certificate.First(u => u.CertificateId == x.CertificateId).CertificateName,
CertificateName = db1.Base_Certificate.First(u => u.CertificateId == x.CertificateId).CertificateName,
x.CertificateNo,
x.SendUnit,
x.SendDate,
@@ -60,7 +60,7 @@ namespace BLL
x.Major,
x.LimitDate,
x.Url,
db.AttachFile.First(u => u.ToKeyId == x.PersonQualityId).AttachUrl,
db1.AttachFile.First(u => u.ToKeyId == x.PersonQualityId).AttachUrl,
};
}
#endregion
SGGL/BLL/HSSE/QualityAudit/SafePersonQualityService.cs
+1 -1
View File
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class SafePersonQualityService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取安全人员资质
SGGL/BLL/HSSE/QualityAudit/SubUnitQualityAuditDetailService.cs
+1 -1
View File
@@ -9,7 +9,7 @@ namespace BLL
/// </summary>
public static class SubUnitQualityAuditDetailService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取分包商资质审查明细
SGGL/BLL/HSSE/QualityAudit/SubUnitQualityService.cs
+1 -1
View File
@@ -7,7 +7,7 @@ namespace BLL
/// </summary>
public static class SubUnitQualityService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取分包商资质
SGGL/BLL/HSSE/Resources/SignManageService.cs
+1 -1
View File
@@ -4,7 +4,7 @@
public static class SignManageService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 获取标牌信息

Some files were not shown because too many files have changed in this diff Show More