|
@@ -653,21 +653,20 @@ namespace OASystem.API.OAMethodLib
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
- var usersData = await _teamRateRep._sqlSugar
|
|
|
- .Queryable<Sys_Users>()
|
|
|
- .LeftJoin<Sys_Department>((su, sd) => su.DepId == sd.Id && sd.IsDel == 0)
|
|
|
- .LeftJoin<Sys_JobPost>((su, sd, sjp) => su.JobPostId == sjp.Id && sjp.IsDel == 0)
|
|
|
- .Where(su => su.IsDel == 0)
|
|
|
- .Select((su, sd, sjp) => new
|
|
|
- {
|
|
|
- su.DepId,
|
|
|
- sd.DepName,
|
|
|
- su.JobPostId,
|
|
|
- sjp.JobName,
|
|
|
- su.Id,
|
|
|
- su.CnName
|
|
|
- })
|
|
|
- .ToListAsync();
|
|
|
+ var usersData = await _teamRateRep._sqlSugar.Queryable<Sys_Users>()
|
|
|
+ .LeftJoin<Sys_Department>((su, sd) => su.DepId == sd.Id && sd.IsDel == 0)
|
|
|
+ .LeftJoin<Sys_JobPost>((su, sd, sjp) => su.JobPostId == sjp.Id && sjp.IsDel == 0)
|
|
|
+ .Where(su => su.IsDel == 0)
|
|
|
+ .Select((su, sd, sjp) => new
|
|
|
+ {
|
|
|
+ su.DepId,
|
|
|
+ sd.DepName,
|
|
|
+ su.JobPostId,
|
|
|
+ sjp.JobName,
|
|
|
+ su.Id,
|
|
|
+ su.CnName
|
|
|
+ })
|
|
|
+ .ToListAsync();
|
|
|
|
|
|
/*
|
|
|
* 76 酒店预订 --> 国交部门 酒店,主管 岗位
|
|
@@ -710,52 +709,52 @@ namespace OASystem.API.OAMethodLib
|
|
|
);
|
|
|
|
|
|
//79 车/导游地接 --> 国交部门(7) OP(28)、主管(22) 岗位
|
|
|
- groupsTaskAssignments.AddRange(
|
|
|
- usersData.Where(it => it.DepId == 7 && (it.JobPostId == 22 || it.JobPostId == 28))
|
|
|
- .Select(it => new Grp_GroupsTaskAssignment()
|
|
|
- {
|
|
|
- DIId = diId,
|
|
|
- CTId = 79,
|
|
|
- UId = it.Id,
|
|
|
- CreateUserId = userId
|
|
|
- }).ToList()
|
|
|
- );
|
|
|
+ //groupsTaskAssignments.AddRange(
|
|
|
+ // usersData.Where(it => it.DepId == 7 && (it.JobPostId == 22 || it.JobPostId == 28))
|
|
|
+ // .Select(it => new Grp_GroupsTaskAssignment()
|
|
|
+ // {
|
|
|
+ // DIId = diId,
|
|
|
+ // CTId = 79,
|
|
|
+ // UId = it.Id,
|
|
|
+ // CreateUserId = userId
|
|
|
+ // }).ToList()
|
|
|
+ //);
|
|
|
|
|
|
//81 邀请/公务活动 --> 国交部门(7) 商邀(27) 岗位
|
|
|
- groupsTaskAssignments.AddRange(
|
|
|
- usersData.Where(it => it.DepId == 7 && it.JobPostId == 27)
|
|
|
- .Select(it => new Grp_GroupsTaskAssignment()
|
|
|
- {
|
|
|
- DIId = diId,
|
|
|
- CTId = 81,
|
|
|
- UId = it.Id,
|
|
|
- CreateUserId = userId
|
|
|
- }).ToList()
|
|
|
- );
|
|
|
+ //groupsTaskAssignments.AddRange(
|
|
|
+ // usersData.Where(it => it.DepId == 7 && it.JobPostId == 27)
|
|
|
+ // .Select(it => new Grp_GroupsTaskAssignment()
|
|
|
+ // {
|
|
|
+ // DIId = diId,
|
|
|
+ // CTId = 81,
|
|
|
+ // UId = it.Id,
|
|
|
+ // CreateUserId = userId
|
|
|
+ // }).ToList()
|
|
|
+ //);
|
|
|
|
|
|
//2024年8月26日16点27分 “邀请公务活动分配给王鸽(UserID:149)”
|
|
|
- groupsTaskAssignments.Add(
|
|
|
- new Grp_GroupsTaskAssignment()
|
|
|
- {
|
|
|
- DIId = diId,
|
|
|
- CTId = 81,
|
|
|
- UId = 149,
|
|
|
- CreateUserId = userId
|
|
|
- }
|
|
|
- );
|
|
|
+ //groupsTaskAssignments.Add(
|
|
|
+ // new Grp_GroupsTaskAssignment()
|
|
|
+ // {
|
|
|
+ // DIId = diId,
|
|
|
+ // CTId = 81,
|
|
|
+ // UId = 149,
|
|
|
+ // CreateUserId = userId
|
|
|
+ // }
|
|
|
+ //);
|
|
|
|
|
|
//80 签证 --> 国交部门(7) 签证(26) 岗位
|
|
|
- groupsTaskAssignments.AddRange(
|
|
|
- usersData
|
|
|
- .Where(it => it.DepId == 7 && it.JobPostId == 26)
|
|
|
- .Select(it => new Grp_GroupsTaskAssignment()
|
|
|
- {
|
|
|
- DIId = diId,
|
|
|
- CTId = 80,
|
|
|
- UId = it.Id,
|
|
|
- CreateUserId = userId
|
|
|
- }).ToList()
|
|
|
- );
|
|
|
+ //groupsTaskAssignments.AddRange(
|
|
|
+ // usersData
|
|
|
+ // .Where(it => it.DepId == 7 && it.JobPostId == 26)
|
|
|
+ // .Select(it => new Grp_GroupsTaskAssignment()
|
|
|
+ // {
|
|
|
+ // DIId = diId,
|
|
|
+ // CTId = 80,
|
|
|
+ // UId = it.Id,
|
|
|
+ // CreateUserId = userId
|
|
|
+ // }).ToList()
|
|
|
+ //);
|
|
|
|
|
|
//82 团组客户保险 --> 国交部(7) 经理(32),主管(22) 岗位
|
|
|
//2024-06-25 默认将保险权限分配给签证岗。 签证(26) 岗位
|