11
This commit is contained in:
@@ -1003,7 +1003,7 @@ namespace BLL
|
||||
join pu in Funs.DB.Project_ProjectUnit on new { x.UnitId, x.ProjectId } equals new { pu.UnitId, pu.ProjectId }
|
||||
join w in Funs.DB.Base_WorkPost on x.WorkPostId equals w.WorkPostId
|
||||
where (identityCard == null || x.IdentityCard == identityCard)
|
||||
&& y.ContractNo == proCode && v.TeamId.HasValue
|
||||
&& y.ContractNo == proCode && v.TeamId.HasValue
|
||||
&& ((type == Const.BtnModify && !x.RealNameUpdateTime.HasValue && x.RealNameAddTime.HasValue)
|
||||
|| (type != Const.BtnModify && !x.RealNameAddTime.HasValue && x.IsUsed && !x.OutTime.HasValue
|
||||
&& x.HeadImage != null && x.HeadImage.Length > 0))
|
||||
@@ -1297,8 +1297,9 @@ namespace BLL
|
||||
join z in Funs.DB.RealName_Project on x.ProCode equals z.ProCode
|
||||
join v in Funs.DB.ProjectData_TeamGroup on p.TeamGroupId equals v.TeamGroupId
|
||||
join r in Funs.DB.RealName_CollTeam on v.TeamId equals r.TeamId
|
||||
where x.IdcardNumber != null && x.ChangeTime.HasValue
|
||||
&& (proCode == null || x.ProCode == proCode)
|
||||
join u in Funs.DB.Project_ProjectUnit on new { p.ProjectId, p.UnitId } equals new { u.ProjectId, u.UnitId }
|
||||
where u.IsSynchro == true && x.IdcardNumber != null && x.ChangeTime.HasValue
|
||||
&& (proCode == null || x.ProCode == proCode)
|
||||
&& v.TeamId.HasValue && p.HeadImage != null && r.TeamId.HasValue
|
||||
&& p.IsCardNoOK == true && (!p.OutTime.HasValue || p.OutTime > x.ChangeTime)
|
||||
&& z.JTproCode != null && !x.RealNamePushTime.HasValue
|
||||
@@ -1332,9 +1333,9 @@ namespace BLL
|
||||
{ "token", getaccess_token(proCode) }
|
||||
};
|
||||
|
||||
addTeam(getData.Select(x => x.TeamGroupId).Distinct().ToList(), newToken);
|
||||
getTeam(proCode, newToken);
|
||||
addPerson(getData.Select(x => x.PersonId).Distinct().ToList(), newToken);
|
||||
//addTeam(getData.Select(x => x.TeamGroupId).Distinct().ToList(), newToken);
|
||||
//getTeam(proCode, newToken);
|
||||
//addPerson(getData.Select(x => x.PersonId).Distinct().ToList(), newToken);
|
||||
|
||||
pushContent = JsonConvert.SerializeObject(listObject);
|
||||
var returndata = BLL.APIGetHttpService.OutsideHttp(url, "POST", null, newToken, pushContent);
|
||||
|
||||
Reference in New Issue
Block a user