lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.104.102.122:3000/lpf/SGGL_SHJ

Browse Source
This commit is contained in:
李鹏飞
2026-06-11 11:02:08 +08:00
parent 201443e437 5b1607187e
commit ffd9fb7e29
12 changed files with 578 additions and 830 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/BaseInfo/PostTitleService.cs
+20
View File
@@ -117,6 +117,26 @@ namespace BLL
return PostTitleName;
}
/// <summary>
/// 根据职称ID得到职称名称
/// </summary>
/// <param name="PostTitleId"></param>
/// <returns></returns>
public static string getPostTitleNameById(Model.SGGLDB db, string PostTitleId)
{
string PostTitleName = string.Empty;
if (!string.IsNullOrEmpty(PostTitleId))
{
var q = db.Base_PostTitle.FirstOrDefault(e => e.PostTitleId == PostTitleId);
if (q != null)
{
PostTitleName = q.PostTitleName;
}
}
return PostTitleName;
}
#endregion
#region 表下拉框
SGGL/BLL/BaseInfo/WorkPostService.cs
+28
View File
@@ -309,6 +309,34 @@ namespace BLL
return workPostName;
}
/// <summary>
/// 根据多岗位ID得到岗位名称字符串
/// </summary>
/// <param name="bigType"></param>
/// <returns></returns>
public static string getWorkPostNamesWorkPostIds(Model.SGGLDB db, object workPostIds)
{
string workPostName = string.Empty;
if (workPostIds != null)
{
string[] ids = workPostIds.ToString().Split(',');
foreach (string id in ids)
{
var q = db.Base_WorkPost.FirstOrDefault(e => e.WorkPostId == id);
if (q != null)
{
workPostName += q.WorkPostName + ",";
}
}
if (workPostName != string.Empty)
{
workPostName = workPostName.Substring(0, workPostName.Length - 1); ;
}
}
return workPostName;
}
#endregion
}
}
SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs
+2
View File
@@ -841,7 +841,9 @@ namespace BLL
Isprint = "0",
States = person.States,
IsSafetyMonitoring = person.IsSafetyMonitoring,
WelderCode = person.WelderCode,
IsCQMSCheck = person.IsCQMSCheck,
IsWeldAudit = true,
};
if (newPerson.WorkPostId == Const.WorkPost_Welder)
SGGL/BLL/Person/Person_ShuntService.cs
+52 -12
View File
@@ -15,15 +15,7 @@ namespace BLL
get;
set;
}
/// <summary>
/// 定义变量
/// </summary>
private static IQueryable<Model.Person_Persons> getDataLists = from x in Funs.DB.Person_Persons
where x.PersonId != Const.sysglyId && x.PersonId != Const.hfnbdId && x.UnitId == Const.UnitId_SEDIN
&& x.DepartId == Const.Depart_constructionId
&& x.CurrentProjectId == null && (!x.IsOffice.HasValue || x.IsOffice == false)
select x;
/// <summary>
/// 数据列表
@@ -38,7 +30,12 @@ namespace BLL
/// <returns></returns>
public static IEnumerable getListData(string workPostId, string postTitleId, string name, string certificateId, Grid Grid1)
{
IQueryable<Model.Person_Persons> getDataList = getDataLists;
Model.SGGLDB db = Funs.DB;
IQueryable<Model.Person_Persons> getDataList = from x in db.Person_Persons
where x.PersonId != Const.sysglyId && x.PersonId != Const.hfnbdId && x.UnitId == Const.UnitId_SEDIN
&& x.DepartId == Const.Depart_constructionId
&& x.CurrentProjectId == null && (!x.IsOffice.HasValue || x.IsOffice == false)
select x;
if (!string.IsNullOrEmpty(workPostId) && workPostId != Const._Null)
{
getDataList = getDataList.Where(e => e.WorkPostId == workPostId);
@@ -62,8 +59,8 @@ namespace BLL
{
return null;
}
getDataList = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
return from x in getDataList
var queryData = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize).ToList();
return from x in queryData
select new
{
x.PersonId,
@@ -118,12 +115,55 @@ namespace BLL
}
}
/// <summary>
///
/// </summary>
/// <param name="ProjectId"></param>
/// <param name="PersonId"></param>
/// <returns></returns>
public static string getCurrentProjectName(Model.SGGLDB db, string PersonId)
{
var getItem = (from x in db.SitePerson_PersonItem
where x.PersonId == PersonId
orderby x.InTime descending
select x).FirstOrDefault();
if (getItem != null)
{
string name = string.Empty;
var project = db.Base_Project.FirstOrDefault(e => e.ProjectId == getItem.ProjectId);
if (project != null)
{
name = project.ShortName;
}
return name;
}
else
{
return null;
}
}
/// <summary>
///
/// </summary>
/// <param name="WorkPostId"></param>
/// <param name="PersonId"></param>
/// <returns></returns>
public static string getCurrentProjectWorkPostName(Model.SGGLDB db, string PersonId)
{
var getItem = (from x in db.SitePerson_PersonItem
where x.PersonId == PersonId
orderby x.InTime descending
select x).FirstOrDefault();
if (getItem != null)
{
return WorkPostService.getWorkPostNamesWorkPostIds(db, getItem.WorkPostId);
}
else
{
return null;
}
}
public static string getCurrentProjectWorkPostName(string PersonId)
{
var getItem = (from x in Funs.DB.SitePerson_PersonItem
SGGL/BLL/SysManage/RoleService.cs
+28
View File
@@ -151,6 +151,34 @@
return roleName;
}
/// <summary>
/// 得到角色名称字符串
/// </summary>
/// <param name="bigType"></param>
/// <returns></returns>
public static string getRoleNamesRoleIds(Model.SGGLDB db, object roleIds)
{
string roleName = string.Empty;
if (roleIds != null)
{
string[] roles = roleIds.ToString().Split(',');
foreach (string roleId in roles)
{
var q = db.Sys_Role.FirstOrDefault(x => x.RoleId == roleId);
if (q != null && !roleName.Contains(q.RoleName))
{
roleName += q.RoleName + ",";
}
}
if (roleName != string.Empty)
{
roleName = roleName.Substring(0, roleName.Length - 1); ;
}
}
return roleName;
}
/// <summary>
/// 角色下拉框
/// </summary>