2026.04.10

This commit is contained in:
2026-04-10 14:35:57 +08:00
parent 8a61b56389
commit 1b324edf2a
39 changed files with 1787 additions and 104 deletions
@@ -109,6 +109,7 @@ namespace BLL
IsSafetyMonitoring = x.IsSafetyMonitoring,
ProvinceCode = x.ProvinceCode,
IsCardNoOK = x.IsCardNoOK,
IsTrain = x.IsTrain,
AttachFileId1 = att1.AttachFileId,
ToKeyId1 = att1.ToKeyId,
AttachSource1 = att1.AttachSource,
@@ -133,6 +134,7 @@ namespace BLL
PostType = wp.PostType, //岗位诶类型
IsHsse = wp.IsHsse, //岗位是否是安管人员
IsCQMS = wp.IsCQMS, //岗位是否是质量管理
IsCQMSCheck = wp.IsCQMSCheck,
TeamGroupName = tg.TeamGroupName,
WorkAreaName = APIDataShareSyncService.GetWorkAreaNames(x.WorkAreaId, projectId)
}).ToList();
@@ -372,7 +374,7 @@ namespace BLL
TeamGroupId = APIDataShareSyncService.GetTeamGroupId(item.TeamGroupName, projectId, unitId),
WorkAreaId = APIDataShareSyncService.getWorkAreaId(item.WorkAreaName, projectId),
WorkPostId = APIDataShareSyncService.getWorkPostId(item.WorkPostName, item.PostType,
item.IsHsse.ToString(), item.IsCQMS.ToString()),
item.IsHsse.ToString(), item.IsCQMS.ToString(),item.IsCQMSCheck.ToString()),
InTime = item.InTime,
OutTime = item.OutTime,
OutResult = item.OutResult,
@@ -412,7 +414,8 @@ namespace BLL
CountryCode = item.CountryCode,
IsSafetyMonitoring = item.IsSafetyMonitoring,
ProvinceCode = item.ProvinceCode,
IsCardNoOK = item.IsCardNoOK
IsCardNoOK = item.IsCardNoOK,
IsTrain = item.IsTrain,
};
db.SitePerson_Person.InsertOnSubmit(newModel);
@@ -430,7 +433,7 @@ namespace BLL
model.UnitId = unitId;
model.TeamGroupId = APIDataShareSyncService.GetTeamGroupId(item.TeamGroupName, projectId, unitId);
model.WorkAreaId = APIDataShareSyncService.getWorkAreaId(item.WorkAreaName, projectId);
model.WorkPostId = APIDataShareSyncService.getWorkPostId(item.WorkPostName, item.PostType, item.IsHsse.ToString(), item.IsCQMS.ToString());
model.WorkPostId = APIDataShareSyncService.getWorkPostId(item.WorkPostName, item.PostType, item.IsHsse.ToString(), item.IsCQMS.ToString(),item.IsCQMSCheck.ToString());
model.InTime = item.InTime;
model.OutTime = item.OutTime;
model.OutResult = item.OutResult;