1
This commit is contained in:
@@ -739,6 +739,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
|
||||
PersonService.UpdatePerson(person);
|
||||
}
|
||||
}
|
||||
this.BindGrid();
|
||||
ShowNotify("操作完成!", MessageBoxIcon.Success);
|
||||
}
|
||||
#endregion
|
||||
@@ -822,27 +823,27 @@ namespace FineUIPro.Web.HSSE.SitePerson
|
||||
{
|
||||
initTemplatePath = "File\\Word\\Person\\安全教育培训打印整套(电工).doc";
|
||||
}
|
||||
else if (person.WorkPostName == "电焊工")
|
||||
else if (person.WorkPostName.Contains("电焊工"))
|
||||
{
|
||||
initTemplatePath = "File\\Word\\Person\\安全教育培训打印整套(电焊工).doc";
|
||||
}
|
||||
else if (person.WorkPostName == "防水普工")
|
||||
else if (person.WorkPostName.Contains("防水普工"))
|
||||
{
|
||||
initTemplatePath = "File\\Word\\Person\\安全教育培训打印整套(防水普工).doc";
|
||||
}
|
||||
else if (person.WorkPostName == "钢筋工")
|
||||
else if (person.WorkPostName.Contains("钢筋工"))
|
||||
{
|
||||
initTemplatePath = "File\\Word\\Person\\安全教育培训打印整套(钢筋工).doc";
|
||||
}
|
||||
else if (person.WorkPostName == "管理人员")
|
||||
else if (person.WorkPostName.Contains("管理人员"))
|
||||
{
|
||||
initTemplatePath = "File\\Word\\Person\\安全教育培训打印整套(管理人员).doc";
|
||||
}
|
||||
else if (person.WorkPostName == "架子工")
|
||||
else if (person.WorkPostName.Contains("架子工"))
|
||||
{
|
||||
initTemplatePath = "File\\Word\\Person\\安全教育培训打印整套(架子工).doc";
|
||||
}
|
||||
else if (person.WorkPostName == "木工")
|
||||
else if (person.WorkPostName.Contains("木工"))
|
||||
{
|
||||
initTemplatePath = "File\\Word\\Person\\安全教育培训打印整套(木工).doc";
|
||||
}
|
||||
@@ -850,43 +851,43 @@ namespace FineUIPro.Web.HSSE.SitePerson
|
||||
{
|
||||
initTemplatePath = "File\\Word\\Person\\安全教育培训打印整套(普工).doc";
|
||||
}
|
||||
else if (person.WorkPostName == "施工电梯司机")
|
||||
else if (person.WorkPostName.Contains("施工电梯司机"))
|
||||
{
|
||||
initTemplatePath = "File\\Word\\Person\\安全教育培训打印整套(施工电梯司机).doc";
|
||||
}
|
||||
else if (person.WorkPostName == "水电工")
|
||||
else if (person.WorkPostName.Contains("水电工"))
|
||||
{
|
||||
initTemplatePath = "File\\Word\\Person\\安全教育培训打印整套(水电工).doc";
|
||||
}
|
||||
else if (person.WorkPostName == "司索信号工")
|
||||
else if (person.WorkPostName.Contains("司索信号工"))
|
||||
{
|
||||
initTemplatePath = "File\\Word\\Person\\安全教育培训打印整套(司索信号工).doc";
|
||||
}
|
||||
else if (person.WorkPostName == "塔吊司机")
|
||||
else if (person.WorkPostName.Contains("塔吊司机"))
|
||||
{
|
||||
initTemplatePath = "File\\Word\\Person\\安全教育培训打印整套(塔吊司机).doc";
|
||||
}
|
||||
else if (person.WorkPostName == "挖机司机")
|
||||
else if (person.WorkPostName.Contains("挖掘机司机"))
|
||||
{
|
||||
initTemplatePath = "File\\Word\\Person\\安全教育培训打印整套(挖机司机).doc";
|
||||
}
|
||||
else if (person.WorkPostName == "瓦工")
|
||||
else if (person.WorkPostName.Contains("瓦工"))
|
||||
{
|
||||
initTemplatePath = "File\\Word\\Person\\安全教育培训打印整套(瓦工).doc";
|
||||
}
|
||||
else if (person.WorkPostName == "渣土车司机")
|
||||
else if (person.WorkPostName.Contains("渣土车司机"))
|
||||
{
|
||||
initTemplatePath = "File\\Word\\Person\\安全教育培训打印整套(渣土车司机).doc";
|
||||
}
|
||||
else if (person.WorkPostName == "桩基")
|
||||
else if (person.WorkPostName.Contains("桩基工"))
|
||||
{
|
||||
initTemplatePath = "File\\Word\\Person\\安全教育培训打印整套(桩基).doc";
|
||||
}
|
||||
else if (person.WorkPostName == "装配、灌浆工")
|
||||
else if (person.WorkPostName.Contains("装配灌浆工"))
|
||||
{
|
||||
initTemplatePath = "File\\Word\\Person\\安全教育培训打印整套(装配、灌浆工).doc";
|
||||
}
|
||||
else if (person.WorkPostName == "班组管理员")
|
||||
else if (person.WorkPostName.Contains("班组管理员"))
|
||||
{
|
||||
initTemplatePath = "File\\Word\\Person\\安全教育培训打印整套(班组管理员).doc";
|
||||
}
|
||||
@@ -906,8 +907,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
|
||||
File.Copy(uploadfilepath, newUrl);
|
||||
AsposeWordHelper helper = new AsposeWordHelper();
|
||||
helper.OpenTempelte(newUrl); //打开模板文件
|
||||
|
||||
string projectName = Funs.DB.Base_Project.First(z => z.ProjectId == person.ProjectId).ProjectName;
|
||||
string projectName = Funs.DB.Base_Project.First(z => z.ProjectId == this.CurrUser.LoginProjectId).ProjectName;
|
||||
string name = person.PersonName;
|
||||
string time = DateTime.Now.ToString("yyyy-MM-dd");
|
||||
string sex = string.IsNullOrEmpty(person.Sex) ? "" : person.Sex == "1" ? "男" : "女";
|
||||
@@ -939,7 +939,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
|
||||
from TestPlan in gTestPlan.DefaultIfEmpty()
|
||||
join user in Funs.DB.Sys_User on TestPlan.PlanManId equals user.UserId into gUser
|
||||
from user in gUser.DefaultIfEmpty()
|
||||
where x.TestManId == person.PersonId
|
||||
where x.TestManId == person.PersonId && x.TestScores >= 70 && x.ProjectId == CurrUser.LoginProjectId
|
||||
orderby x.TestEndTime descending
|
||||
select new
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user