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

20220928考试计划试题类型加判断

This commit is contained in:
杨红卫 2022-09-28 17:30:05 +08:00
parent 061826c677
commit 3a62ed2219
2 changed files with 45 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
SGGL/BLL/API/HSSE/APITestPlanService.cs
View File

@ -264,6 +264,9 @@ namespace BLL
{ {
var trainingType = TestTrainingService.GetTestTrainingById(item.TrainingTypeId); var trainingType = TestTrainingService.GetTestTrainingById(item.TrainingTypeId);
if (trainingType != null) if (trainingType != null)
{
var getT = db.Training_TestPlanTraining.FirstOrDefault(x => x.TestPlanId == newTestPlan.TestPlanId && x.TrainingId == item.TrainingTypeId);
if (getT == null)
{ {
Model.Training_TestPlanTraining newPlanItem = new Model.Training_TestPlanTraining Model.Training_TestPlanTraining newPlanItem = new Model.Training_TestPlanTraining
{ {
@ -282,6 +285,7 @@ namespace BLL
} }
} }
} }
}
return alterStr; return alterStr;
} }
@ -320,6 +324,9 @@ namespace BLL
{ {
var trainingType = db.Training_TestTraining.FirstOrDefault(e => e.TrainingId == item.TrainingTypeId); var trainingType = db.Training_TestTraining.FirstOrDefault(e => e.TrainingId == item.TrainingTypeId);
if (trainingType != null) if (trainingType != null)
{
var getT = db.Training_TestPlanTraining.FirstOrDefault(x => x.TestPlanId == testPlanId && x.TrainingId == item.TrainingTypeId);
if (getT == null)
{ {
Model.Training_TestPlanTraining newPlanItem = new Model.Training_TestPlanTraining Model.Training_TestPlanTraining newPlanItem = new Model.Training_TestPlanTraining
{ {
@ -337,6 +344,7 @@ namespace BLL
} }
} }
} }
}
#endregion #endregion
#region 根据培训计划ID生成 考试计划信息 #region 根据培训计划ID生成 考试计划信息
@ -458,6 +466,9 @@ namespace BLL
else else
{ {
foreach (var item in getTrainTypeItems) foreach (var item in getTrainTypeItems)
{
var getT = db.Training_TestPlanTraining.FirstOrDefault(x => x.TestPlanId == testPlanId && x.TrainingId == item.TrainingId);
if (getT == null)
{ {
/////考试题型类别及数量 /////考试题型类别及数量
Model.Training_TestPlanTraining newTestPlanTraining = new Model.Training_TestPlanTraining Model.Training_TestPlanTraining newTestPlanTraining = new Model.Training_TestPlanTraining
@ -474,6 +485,7 @@ namespace BLL
} }
} }
} }
}
////回写培训计划状态 ////回写培训计划状态
getTrainingPlan.States = "2"; getTrainingPlan.States = "2";
db.SubmitChanges(); db.SubmitChanges();

4
SGGL/BLL/API/HSSE/APITestRecordService.cs
View File

@ -151,9 +151,9 @@ namespace BLL
int sumTestType2Count = 0; int sumTestType2Count = 0;
int sumTestType3Count = 0; int sumTestType3Count = 0;
var testPlanTrainings = from x in db.Training_TestPlanTraining var testPlanTrainings =( from x in db.Training_TestPlanTraining
where x.TestPlanId == getTestPlan.TestPlanId where x.TestPlanId == getTestPlan.TestPlanId
select x; select new { x.TestPlanId,x.TrainingId,x.TestType1Count,x.TestType2Count,x.TestType3Count}).Distinct();
if (testPlanTrainings.Count() > 0) if (testPlanTrainings.Count() > 0)
{ {
//// 计划考试中单选、多选、判断题总数 //// 计划考试中单选、多选、判断题总数