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/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();
}
}