1
This commit is contained in:
@@ -560,7 +560,7 @@ namespace BLL
|
||||
/// <param name="workPostIds">培训岗位ID</param>
|
||||
/// <param name="trainTypeId">培训类型ID</param>
|
||||
/// <returns></returns>
|
||||
public static List<Model.PersonItem> getTrainingPersonListByTrainTypeId(string projectId, string unitIds, string workPostIds, string trainTypeId, string name, string startDate, string endDate)
|
||||
public static List<Model.PersonItem> getTrainingPersonListByTrainTypeId(string projectId, string unitIds, string workPostIds, string trainTypeId, string name, string startDate, string endDate, string isRepeat)
|
||||
{
|
||||
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
|
||||
{
|
||||
@@ -620,7 +620,11 @@ namespace BLL
|
||||
}
|
||||
List<Model.PersonItem> getTrainPersonList = new List<Model.PersonItem>();
|
||||
var getTrainType = TrainTypeService.GetTrainTypeById(trainTypeId);
|
||||
if (getTrainType != null && (!getTrainType.IsRepeat.HasValue || getTrainType.IsRepeat == false))
|
||||
if ((getTrainType != null && (!getTrainType.IsRepeat.HasValue || getTrainType.IsRepeat == true)) || isRepeat == "1")
|
||||
{
|
||||
return getPersons.ToList();
|
||||
}
|
||||
else
|
||||
{
|
||||
foreach (var item in getPersons)
|
||||
{
|
||||
@@ -642,10 +646,6 @@ namespace BLL
|
||||
}
|
||||
return getTrainPersonList;
|
||||
}
|
||||
else
|
||||
{
|
||||
return getPersons.ToList();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1610,7 +1610,7 @@ namespace BLL
|
||||
{
|
||||
z.PlanName,
|
||||
z.PlanDate,
|
||||
CheckResultName = x.TestScores >=60 ? "合格" : "不合格",
|
||||
CheckResultName = x.TestScores >= 60 ? "合格" : "不合格",
|
||||
z.TestPlanId,
|
||||
};
|
||||
if (getDataLists.Count() > 0)
|
||||
|
||||
Reference in New Issue
Block a user