lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20210520

Browse Source
This commit is contained in:
杨红卫
2021-05-20 17:16:01 +08:00
parent f901e87a6e
commit e7cb804684
219 changed files with 17315 additions and 1571 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/API/APIBaseInfoService.cs
+1 -1
View File
@@ -39,7 +39,7 @@ namespace BLL
{
BaseInfoId = x.ProjectId,
BaseInfoCode = x.ProjectCode,
BaseInfoName = x.ProjectName
BaseInfoName = x.ProjectName
}
).ToList();
return getDataLists;
SGGL/BLL/API/APIPersonService.cs
+24 -21
View File
@@ -1551,29 +1551,32 @@ namespace BLL
/// <returns></returns>
public static List<Model.PersonInOutItem> getPersonInOutLists(string projectId, string unitId, DateTime startTimeD, DateTime endTimeD)
{
var personInOuts = from x in Funs.DB.SitePerson_PersonInOut
join y in Funs.DB.SitePerson_Person on x.PersonId equals y.PersonId
where x.ProjectId == projectId && x.ChangeTime >= startTimeD && x.ChangeTime <= endTimeD
select new Model.PersonInOutItem
{
PersonId = x.PersonId,
PersonName = y.PersonName,
ProjectId = x.ProjectId,
UnitId = y.UnitId,
UnitName = Funs.DB.Base_Unit.First(z => z.UnitId == y.UnitId).UnitName,
WorkPostId = y.WorkPostId,
WorkPostName = Funs.DB.Base_WorkPost.First(z => z.WorkPostId == y.WorkPostId).WorkPostName,
IsIn = x.IsIn,
IsInName = x.IsIn == true ? "进场" : "出场",
ChangeTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ChangeTime),
ChangeTimeD = x.ChangeTime,
};
if (!string.IsNullOrEmpty(unitId))
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
personInOuts = personInOuts.Where(x => x.UnitId == unitId);
}
var personInOuts = from x in db.SitePerson_PersonInOut
join y in db.SitePerson_Person on x.PersonId equals y.PersonId
where x.ProjectId == projectId && x.ChangeTime >= startTimeD && x.ChangeTime <= endTimeD
select new Model.PersonInOutItem
{
PersonId = x.PersonId,
PersonName = y.PersonName,
ProjectId = x.ProjectId,
UnitId = y.UnitId,
UnitName = db.Base_Unit.First(z => z.UnitId == y.UnitId).UnitName,
WorkPostId = y.WorkPostId,
WorkPostName = db.Base_WorkPost.First(z => z.WorkPostId == y.WorkPostId).WorkPostName,
IsIn = x.IsIn,
IsInName = x.IsIn == true ? "进场" : "出场",
ChangeTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ChangeTime),
ChangeTimeD = x.ChangeTime,
};
if (!string.IsNullOrEmpty(unitId))
{
personInOuts = personInOuts.Where(x => x.UnitId == unitId);
}
return personInOuts.ToList();
return personInOuts.ToList();
}
}
#endregion
SGGL/BLL/API/APIUserService.cs
+63
View File
@@ -265,5 +265,68 @@ namespace BLL
}
}
}
/// <summary>
/// 根据单位类型获取用户信息
/// </summary>
/// <param name="projectId"></param>
/// <param name="userIds"></param>
/// <param name="strParam"></param>
/// <returns></returns>
public static List<Model.UserItem> getUserByProjectIdUserIdsQuery(string projectId, string userIds, string strParam)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
List<Model.UserItem> getDataList = new List<Model.UserItem>();
List<string> userList = Funs.GetStrListByStr(userIds, ',');
if (userList.Count() > 0)
{
var getDataLists = (from x in db.Sys_User
join y in db.Project_ProjectUser on x.UserId equals y.UserId
where y.ProjectId == projectId
select new Model.UserItem
{
UserId = x.UserId,
Account = x.Account,
UserCode = x.UserCode,
Password = x.Password,
UserName = x.UserName,
RoleId = y.RoleId,
RoleName = RoleService.getRoleNamesRoleIds(y.RoleId),
UnitId = y.UnitId,
UnitName = db.Base_Unit.First(z => z.UnitId == y.UnitId).UnitName,
LoginProjectId = y.ProjectId,
LoginProjectName = db.Base_Project.First(z => z.ProjectId == y.ProjectId).ProjectName,
IdentityCard = x.IdentityCard,
Email = x.Email,
Telephone = x.Telephone,
IsOffice = x.IsOffice,
SignatureUrl = x.SignatureUrl.Replace('\\', '/'),
});
if (!string.IsNullOrEmpty(strParam))
{
getDataLists = getDataLists.Where(x => x.UserName.Contains(strParam));
}
string unitId = Const.UnitId_CWCEC;
var unitList = (from x in db.Sys_User where userList.Contains(x.UserId) select x.UnitId).Distinct().ToList();
if (unitList.Count() == 1)
{
unitId = unitList.FirstOrDefault();
getDataList = getDataLists.Where(x => x.UnitId == unitId).ToList();
}
else if (!unitList.Contains(unitId))
{
getDataList = getDataLists.Where(x => unitList.Contains(x.UnitId)).ToList();
}
else
{
getDataList = getDataLists.Where(x => x.UnitId == unitId).ToList();
}
}
return getDataList.OrderBy(x => x.UnitName).ThenBy(x => x.UserName).ToList();
}
}
}
}