lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、优化考勤记录导入，优化出入记录写实名制推送记录表。2、优化考试答题，交卷接口方法。3、优化写入培训记录。

Browse Source
This commit is contained in:
杨红卫
2022-06-16 17:34:24 +08:00
parent b913f49cd8
commit 85a8b510ac
29 changed files with 488 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/HSSE/EduTrain/CompanyTrainingService.cs
+17 -4
View File
@@ -59,11 +59,24 @@ namespace BLL
/// <param name="companyTrainingId"></param>
public static void DeleteCompanyTraining(string companyTrainingId)
{
Model.Training_CompanyTraining companyTraining = db.Training_CompanyTraining.FirstOrDefault(e => e.CompanyTrainingId == companyTrainingId);
if (companyTraining!=null)
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
db.Training_CompanyTraining.DeleteOnSubmit(companyTraining);
db.SubmitChanges();
var companyTraining = db.Training_CompanyTraining.FirstOrDefault(e => e.CompanyTrainingId == companyTrainingId);
if (companyTraining != null)
{
var delItem = from x in db.Training_PlanItem where x.CompanyTrainingId == companyTrainingId select x;
if (delItem.Count() > 0)
{
db.Training_PlanItem.DeleteAllOnSubmit(delItem);
}
var delItemc = from x in db.Training_CompanyTrainingItem where x.CompanyTrainingId == companyTrainingId select x;
if (delItemc.Count() > 0)
{
db.Training_CompanyTrainingItem.DeleteAllOnSubmit(delItemc);
}
db.Training_CompanyTraining.DeleteOnSubmit(companyTraining);
db.SubmitChanges();
}
}
}
SGGL/BLL/HSSE/EduTrain/EduTrain_TrainRecordDetailService.cs
+3 -4
View File
@@ -98,13 +98,12 @@ namespace BLL
/// </summary>
/// <param name="trainingId"></param>
public static void DeleteTrainDetailByTrainDetail(string trainDetailId)
{
Model.SGGLDB db = Funs.DB;
{
Model.EduTrain_TrainRecordDetail trainDetails = Funs.DB.EduTrain_TrainRecordDetail.FirstOrDefault(e => e.TrainDetailId == trainDetailId);
if (trainDetails != null)
{
db.EduTrain_TrainRecordDetail.DeleteOnSubmit(trainDetails);
db.SubmitChanges();
Funs.DB.EduTrain_TrainRecordDetail.DeleteOnSubmit(trainDetails);
Funs.DB.SubmitChanges();
var rainRecord = EduTrain_TrainRecordService.GetTrainingByTrainingId(trainDetails.TrainingId);
if (rainRecord != null)
SGGL/BLL/HSSE/EduTrain/EduTrain_TrainRecordService.cs
+2 -3
View File
@@ -77,8 +77,7 @@ namespace BLL
/// <param name="training">教育培训实体</param>
public static void UpdateTraining(Model.EduTrain_TrainRecord training)
{
Model.SGGLDB db = Funs.DB;
Model.EduTrain_TrainRecord newTraining = db.EduTrain_TrainRecord.FirstOrDefault(e => e.TrainingId == training.TrainingId);
Model.EduTrain_TrainRecord newTraining = Funs.DB.EduTrain_TrainRecord.FirstOrDefault(e => e.TrainingId == training.TrainingId);
if (newTraining != null)
{
newTraining.TrainingCode = training.TrainingCode;
@@ -107,7 +106,7 @@ namespace BLL
newTraining.TrainPersonNum = training.TrainPersonNum;
newTraining.FromRecordId = training.FromRecordId;
newTraining.WorkPostIds = training.WorkPostIds;
db.SubmitChanges();
Funs.DB.SubmitChanges();
}
}
SGGL/BLL/HSSE/EduTrain/TestRecordService.cs
+2 -7
View File
@@ -38,15 +38,10 @@ namespace BLL
if (string.IsNullOrEmpty(newTestRecord.TestType))
{
var getTrainTypeName = (from x in db.Training_TestPlan
join y in db.Training_Plan on x.PlanId equals y.PlanId
join z in db.Base_TrainType on y.TrainTypeId equals z.TrainTypeId
where x.TestPlanId == testRecord.TestPlanId
select z).FirstOrDefault();
var getTrainTypeName = db.Training_TestPlan.FirstOrDefault(x => x.TestPlanId == testRecord.TestPlanId);
if (getTrainTypeName != null)
{
testRecord.TestType = getTrainTypeName.TrainTypeName;
newTestRecord.TestType = getTrainTypeName.PlanName;
}
}
SGGL/BLL/HSSE/EduTrain/TestTrainingService.cs
+17 -9
View File
@@ -63,18 +63,26 @@ namespace BLL
/// <param name="TrainingId"></param>
public static void DeleteTestTrainingById(string TrainingId)
{
Model.SGGLDB db = Funs.DB;
Model.Training_TestTraining TestTraining = db.Training_TestTraining.FirstOrDefault(e => e.TrainingId == TrainingId);
if (TestTraining != null)
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var TrainingItem = from x in db.Training_TestTrainingItem where x.TrainingId == TrainingId select x;
if (TrainingItem.Count() > 0)
var TestTraining = db.Training_TestTraining.FirstOrDefault(e => e.TrainingId == TrainingId);
if (TestTraining != null)
{
db.Training_TestTrainingItem.DeleteAllOnSubmit(TrainingItem);
}
var testPlanTraining = from x in db.Training_TestPlanTraining where x.TrainingId == TrainingId select x;
if (testPlanTraining.Count() > 0)
{
db.Training_TestPlanTraining.DeleteAllOnSubmit(testPlanTraining);
}
db.Training_TestTraining.DeleteOnSubmit(TestTraining);
db.SubmitChanges();
var TrainingItem = from x in db.Training_TestTrainingItem where x.TrainingId == TrainingId select x;
if (TrainingItem.Count() > 0)
{
db.Training_TestTrainingItem.DeleteAllOnSubmit(TrainingItem);
}
db.Training_TestTraining.DeleteOnSubmit(TestTraining);
db.SubmitChanges();
}
}
}
SGGL/BLL/HSSE/EduTrain/TrainingTaskService.cs
+8 -9
View File
@@ -73,11 +73,11 @@ namespace BLL
/// <param name="taskId"></param>
public static void DeleteTaskById(string taskId)
{
Model.Training_Task task = db.Training_Task.FirstOrDefault(e => e.TaskId == taskId);
Model.Training_Task task = Funs.DB.Training_Task.FirstOrDefault(e => e.TaskId == taskId);
if (task != null)
{
db.Training_Task.DeleteOnSubmit(task);
db.SubmitChanges();
Funs.DB.Training_Task.DeleteOnSubmit(task);
Funs.DB.SubmitChanges();
}
}
@@ -86,18 +86,17 @@ namespace BLL
/// </summary>
/// <param name="planId"></param>
public static void DeleteTaskByPlanId(string planId)
{
Model.SGGLDB db = Funs.DB;
var tasks = from x in db.Training_Task where x.PlanId == planId select x;
{
var tasks = from x in Funs.DB.Training_Task where x.PlanId == planId select x;
if (tasks.Count() > 0)
{
var taskItems = from x in db.Training_TaskItem where x.PlanId == planId select x;
var taskItems = from x in Funs.DB.Training_TaskItem where x.PlanId == planId select x;
if (tasks.Count() > 0)
{
db.Training_TaskItem.DeleteAllOnSubmit(taskItems);
Funs.DB.Training_TaskItem.DeleteAllOnSubmit(taskItems);
}
db.Training_Task.DeleteAllOnSubmit(tasks);
Funs.DB.Training_Task.DeleteAllOnSubmit(tasks);
}
}
}