培训
This commit is contained in:
@@ -64,8 +64,9 @@ namespace FineUIPro.Web.HSSE.EduTrain
|
||||
if (trainingPlan != null)
|
||||
{
|
||||
|
||||
this.txtPlanName.Text = trainingPlan.PlanName;
|
||||
this.txtTrainContent.Text = trainingPlan.TrainContent;
|
||||
this.txtPlanCode.Text = trainingPlan.PlanCode;
|
||||
this.txtPlanName.Text = trainingPlan.PlanName;
|
||||
this.txtTrainContent.Text = trainingPlan.TrainContent;
|
||||
this.txtTeachMan.Text = trainingPlan.TeachMan;
|
||||
if (trainingPlan.TeachHour.HasValue)
|
||||
this.txtTeachHour.Text = trainingPlan.TeachHour.Value.ToString("0.##");
|
||||
@@ -90,7 +91,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
|
||||
{
|
||||
dpCompanyTraining.SelectedValueArray = planItem;
|
||||
}
|
||||
var getDataList = APIPersonService.getTrainingPersonListByTrainTypeId(this.CurrUser.LoginProjectId, trainingPlan.UnitIds, trainingPlan.WorkPostId, trainingPlan.TrainTypeId).OrderBy(x => x.UnitName).ThenBy(x => x.ProjectName).ToList();
|
||||
var getDataList = APIPersonService.getTrainingPersonListByTrainTypeId(this.CurrUser.LoginProjectId, trainingPlan.UnitIds, trainingPlan.WorkPostId,"", trainingPlan.TrainTypeId,"","").OrderBy(x => x.UnitName).ThenBy(x => x.ProjectName).ToList();
|
||||
dpSysUser.DataTextField = "PersonName";
|
||||
dpSysUser.DataValueField = "PersonId";
|
||||
dpSysUser.DataSource = getDataList;
|
||||
@@ -102,7 +103,12 @@ namespace FineUIPro.Web.HSSE.EduTrain
|
||||
dpSysUser.SelectedValueArray = userids;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
string code = ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId).ProjectCode + "-";
|
||||
txtPlanCode.Text = BLL.SQLHelper.RunProcNewId("SpGetNewCode5ByProjectId", "dbo.Training_Plan", "PlanCode", this.CurrUser.LoginProjectId, code);
|
||||
}
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
@@ -259,8 +265,9 @@ namespace FineUIPro.Web.HSSE.EduTrain
|
||||
|
||||
Model.Training_Plan trainingPlan = new Model.Training_Plan();
|
||||
trainingPlan.ProjectId = this.CurrUser.LoginProjectId;
|
||||
trainingPlan.PlanName = this.txtPlanName.Text;
|
||||
trainingPlan.TrainContent = this.txtTrainContent.Text;
|
||||
trainingPlan.PlanName = this.txtPlanName.Text;
|
||||
trainingPlan.PlanCode = this.txtPlanCode.Text;
|
||||
trainingPlan.TrainContent = this.txtTrainContent.Text;
|
||||
trainingPlan.TeachMan = this.txtTeachMan.Text;
|
||||
trainingPlan.TeachHour =decimal.Parse( this.txtTeachHour.Text);
|
||||
trainingPlan.TrainStartDate = this.dpTrainStartDate.SelectedDate;
|
||||
@@ -280,7 +287,10 @@ namespace FineUIPro.Web.HSSE.EduTrain
|
||||
}
|
||||
if (string.IsNullOrEmpty(PlanId))
|
||||
{
|
||||
trainingPlan.PlanCode = CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectTrainingPlanMenuId, CurrUser.LoginProjectId, CurrUser.UnitId);
|
||||
//string code = ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId).ProjectCode + "-";
|
||||
//trainingPlan.PlanCode = BLL.SQLHelper.RunProcNewId("SpGetNewCode5ByProjectId", "dbo.Training_Plan", "PlanCode", this.CurrUser.LoginProjectId, code);
|
||||
|
||||
//trainingPlan.PlanCode = CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectTrainingPlanMenuId, CurrUser.LoginProjectId, CurrUser.UnitId);
|
||||
trainingPlan.PlanId = SQLHelper.GetNewID();
|
||||
TrainingPlanService.AddPlan(trainingPlan);
|
||||
CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitId(Const.ProjectTrainingPlanMenuId, trainingPlan.ProjectId, null, trainingPlan.PlanId, trainingPlan.DesignerDate);
|
||||
@@ -431,7 +441,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
|
||||
dpSysUser.Items.Clear();
|
||||
string unitIds=string.Join(",",dpUnit.SelectedValue);
|
||||
string workPostIds = string.Join(",", dpWorkPost.SelectedValue);
|
||||
var getDataList = APIPersonService.getTrainingPersonListByTrainTypeId(this.CurrUser.LoginProjectId, unitIds, workPostIds, drpTrainType.SelectedValue).OrderBy(x => x.UnitName).ThenBy(x => x.ProjectName).ToList();
|
||||
var getDataList = APIPersonService.getTrainingPersonListByTrainTypeId(this.CurrUser.LoginProjectId, unitIds, workPostIds,"", drpTrainType.SelectedValue,"","").OrderBy(x => x.UnitName).ThenBy(x => x.ProjectName).ToList();
|
||||
dpSysUser.DataTextField = "PersonName";
|
||||
dpSysUser.DataValueField = "PersonId";
|
||||
dpSysUser.DataSource = getDataList;
|
||||
|
||||
Reference in New Issue
Block a user