zhanghj/ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并最新

Browse Source
This commit is contained in:
李超
2022-12-20 09:32:32 +08:00
parent 844e9f1488
commit 1abdaa9476
654 changed files with 73563 additions and 9746 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/EduTrain/TaskView.aspx.cs
+13 -6
View File
@@ -99,12 +99,19 @@ namespace FineUIPro.Web.HSSE.EduTrain
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.PlanId=@PlanId ";
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";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@PlanId", task.PlanId));
//var user = BLL.UserService.GetUserByUserId(task.UserId);