This commit is contained in:
2023-08-29 18:56:49 +08:00
parent 6b420b5bd8
commit 6c19bf6a3e
56 changed files with 2342 additions and 2166 deletions
@@ -96,39 +96,16 @@ namespace FineUIPro.Web.HSSE.EduTrain
/// </summary>
private void BindGrid()
{
var task = BLL.TrainingTaskService.GetTaskById(this.TaskId);
if (task != null)
{
string strSql = @"SELECT PlanItem.PlanItemId,PlanItem.PlanId,PlanItem.TrainingEduId,Training.TrainingCode,Training.TrainingId,Training.TrainingName
,TrainingItem.TrainingItemId,TrainingItem.TrainingItemCode,TrainingItem.TrainingItemName
FROM Training_PlanItem AS PlanItem
LEFT JOIN Training_TrainingItem AS TrainingItem ON PlanItem.TrainingEduItemId =TrainingItem.TrainingItemId
LEFT JOIN Training_Training AS Training ON TrainingItem.TrainingId =Training.TrainingId
WHERE PlanItem.TrainingEduItemId is not null and PlanItem.PlanId=@PlanId
union all
SELECT PlanItem.PlanItemId,PlanItem.PlanId,PlanItem.TrainingEduId,Training.CompanyTrainingCode,Training.CompanyTrainingId,Training.CompanyTrainingName
,TrainingItem.CompanyTrainingItemId,TrainingItem.CompanyTrainingItemCode,TrainingItem.CompanyTrainingItemName
FROM Training_PlanItem AS PlanItem
LEFT JOIN Training_CompanyTrainingItem AS TrainingItem ON PlanItem.CompanyTrainingId =TrainingItem.CompanyTrainingId
LEFT JOIN Training_CompanyTraining AS Training ON TrainingItem.CompanyTrainingId =Training.CompanyTrainingId
WHERE PlanItem.CompanyTrainingId is not null and PlanItem.PlanId=@PlanId";
string strSql = @"select TrainingItemId,d.TrainingCode,c.TrainingId,d.TrainingName, b.[TrainingItemCode],b.[TrainingItemName],b.[AttachUrl], c.TrainingItemCode,c.TrainingItemName from
[dbo].[Training_Task] a
left join [dbo].[Training_TaskItem] b on a.[TaskId]=b.[TaskId]
left join Training_TrainingItem c on b.TrainingItemCode=c.TrainingItemCode
LEFT JOIN Training_Training AS d ON c.TrainingId =d.TrainingId
where b.[TaskId] = @TaskId ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@PlanId", task.PlanId));
//var user = BLL.UserService.GetUserByUserId(task.UserId);
//if (user != null && !string.IsNullOrEmpty(user.InstallationId))
//{
// List<string> installs = Funs.GetStrListByStr(user.InstallationId, ',');
// if (installs.Count > 0)
// {
// int i = 0;
// foreach (var item in installs)
// {
// strSql += " AND (TrainingEduItem.InstallationIds LIKE @InstallationId" + i.ToString() + " OR TrainingEduItem.InstallationIds IS NULL)";
// listStr.Add(new SqlParameter("@InstallationId" + i.ToString(), item));
// i++;
// }
// }
//}
listStr.Add(new SqlParameter("@TaskId", this.TaskId));
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
@@ -136,7 +113,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
}
}
#endregion