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

202306131、新增项目级消息待办页面功能。2、新增项目单位是否同步实名制设置功能。3、优化考试合格自动生成卡号功能。

Browse Source
This commit is contained in:
杨红卫
2023-06-13 16:30:08 +08:00
parent 3c887b46d1
commit 7a2a8ffb93
37 changed files with 805 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/ZHGL/RealName/SynchroSetService.cs
+7 -5
View File
@@ -762,7 +762,7 @@ namespace BLL
&& x.UnitType != null
&& (proCode == null || y.ContractNo == proCode)
&& u.CollCropCode != null && u.CollCropCode != ""
&& z.JTproCode != null
&& z.JTproCode != null && x.IsSynchro == true
select new
{
unitId = x.UnitId,
@@ -900,7 +900,7 @@ namespace BLL
where z.ProCode != null && !x.RealNamePushTime.HasValue && x.TeamTypeId != null
&& (proCode == null || y.ContractNo == proCode)
&& u.CollCropCode != null && u.CollCropCode != ""
&& z.JTproCode != null
&& z.JTproCode != null && p.IsSynchro == true
&& p.UnitType != Const.ProjectUnitType_3 && p.UnitType != Const.ProjectUnitType_4
select new
{
@@ -997,7 +997,7 @@ namespace BLL
&& y.ContractNo == proCode && v.TeamId.HasValue
&& ((type == Const.BtnModify && !x.RealNameUpdateTime.HasValue && x.RealNameAddTime.HasValue)
|| (type != Const.BtnModify && !x.RealNameAddTime.HasValue && x.States == Const.State_1 && Persons.HeadImage.Length > 0))
&& p.UnitType != Const.ProjectUnitType_3 && p.UnitType != Const.ProjectUnitType_4
&& p.UnitType != Const.ProjectUnitType_3 && p.UnitType != Const.ProjectUnitType_4 && p.IsSynchro == true
&& z.JTproCode != null
select new
{
@@ -1517,12 +1517,13 @@ 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
join pu in Funs.DB.Project_ProjectUnit on new { x.UnitId, x.ProjectId } equals new { pu.UnitId, pu.ProjectId }
where x.IdcardNumber != null && x.ChangeTime.HasValue
&& (proCode == null || x.ProCode == proCode)
&& v.TeamId.HasValue && r.TeamId.HasValue
&& p.States == Const.State_1
&& !x.RealNamePushTime.HasValue
&& z.JTproCode != null
&& z.JTproCode != null && pu.IsSynchro == true
orderby x.ChangeTime descending
select new
{
@@ -1735,7 +1736,8 @@ namespace BLL
join z in db.RealName_Project on y.ContractNo equals z.ProCode
join v in db.ProjectData_TeamGroup on x.TeamGroupId equals v.TeamGroupId
join w in db.Base_WorkPost on x.WorkPostId equals w.WorkPostId
where personList.Contains(x.PersonId) && z.JTproCode != null
join p in db.Project_ProjectUnit on new { x.UnitId, x.ProjectId } equals new { p.UnitId, p.ProjectId }
where personList.Contains(x.PersonId) && z.JTproCode != null && p.IsSynchro == true
select new
{
name = x.PersonName,