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

代码无效引用清理，试压包资料界面看板修改

Browse Source
This commit is contained in:
李鹏飞
2025-10-10 14:33:21 +08:00
parent 87fb529521
commit 55b798135c
933 changed files with 5897 additions and 7541 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/Person/Person_ShuntService.cs
+11 -12
View File
@@ -1,8 +1,6 @@
using FineUIPro;
using NPOI.SS.Formula.Functions;
using System.Collections;
using System.Linq;
using Model;
namespace BLL
{
@@ -23,7 +21,7 @@ namespace BLL
/// </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.DepartId == Const.Depart_constructionId
&& x.CurrentProjectId == null && (!x.IsOffice.HasValue || x.IsOffice == false)
select x;
@@ -38,9 +36,9 @@ namespace BLL
/// <param name="isPost"></param>
/// <param name="Grid1"></param>
/// <returns></returns>
public static IEnumerable getListData(string workPostId, string postTitleId, string name, string certificateId, Grid Grid1)
public static IEnumerable getListData(string workPostId, string postTitleId, string name, string certificateId, Grid Grid1)
{
IQueryable<Model.Person_Persons> getDataList = getDataLists;
IQueryable<Model.Person_Persons> getDataList = getDataLists;
if (!string.IsNullOrEmpty(workPostId) && workPostId != Const._Null)
{
getDataList = getDataList.Where(e => e.WorkPostId == workPostId);
@@ -49,7 +47,7 @@ namespace BLL
{
getDataList = getDataList.Where(e => e.PostTitleId == postTitleId);
}
if (!string.IsNullOrEmpty(name))
{
getDataList = getDataList.Where(e => e.PersonName.Contains(name));
@@ -58,7 +56,7 @@ namespace BLL
{
getDataList = getDataList.Where(e => e.CertificateId.Contains(certificateId));
}
count = getDataList.Count();
if (count == 0)
{
@@ -75,7 +73,7 @@ namespace BLL
x.IdentityCard,
Sex = x.Sex ?? "1",
x.Birthday,
x.UnitId,
x.UnitId,
x.DepartId,
x.WorkPostId,
WorkPostName = WorkPostService.getWorkPostNamesWorkPostIds(x.WorkPostId),
@@ -88,7 +86,7 @@ namespace BLL
x.CurrentProjectId,
LastProjectName = getCurrentProjectName(x.PersonId),
x.CurrentProjectWorkPostId,
LastWorkPostName = getCurrentProjectWorkPostName(x.PersonId),
LastWorkPostName = getCurrentProjectWorkPostName(x.PersonId),
IsPost = x.IsPost ?? true,
IsPostName = x.IsPost == false ? "否" : "是",
x.SignatureUrl,
@@ -106,9 +104,10 @@ namespace BLL
/// <returns></returns>
public static string getCurrentProjectName(string PersonId)
{
var getItem = (from x in Funs.DB.SitePerson_PersonItem where x.PersonId == PersonId
orderby x.InTime descending
select x).FirstOrDefault();
var getItem = (from x in Funs.DB.SitePerson_PersonItem
where x.PersonId == PersonId
orderby x.InTime descending
select x).FirstOrDefault();
if (getItem != null)
{
return ProjectService.GetShortNameByProjectId(getItem.ProjectId);