diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/LeaderWellRecordController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/LeaderWellRecordController.cs index f1c985e..b741eb6 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/LeaderWellRecordController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/LeaderWellRecordController.cs @@ -110,10 +110,12 @@ namespace APT.FO.WebApi.Controllers entity.Nav_Users = null; if (users != null && users.Any()) { - foreach (var item in users) + foreach (var use in users) { + T_FO_LEADER_WELL_RECORD_USER item = new T_FO_LEADER_WELL_RECORD_USER(); item.ORG_ID = entity.ORG_ID; item.LEADER_WELL_RECORD_ID = entity.ID; + item.USER_ID = use.USER_ID; item.Nav_User = null; if (item.USER_ID == loginUserId) { @@ -129,10 +131,12 @@ namespace APT.FO.WebApi.Controllers } if (afterUsers != null && afterUsers.Any()) { - foreach (var item in afterUsers) + foreach (var after in afterUsers) { + T_FO_LEADER_WELL_RECORD_AFTERUSER item = new T_FO_LEADER_WELL_RECORD_AFTERUSER(); item.ORG_ID = entity.ORG_ID; item.LEADER_WELL_RECORD_ID = entity.ID; + item.AFTER_USER_ID = after.AFTER_USER_ID; item.Nav_AfterUser = null; afterUserList.Add(item); } @@ -149,20 +153,24 @@ namespace APT.FO.WebApi.Controllers { if (item.Nav_DetailFiles != null && item.Nav_DetailFiles.Any()) { - foreach (var item2 in item.Nav_DetailFiles) + foreach (var file in item.Nav_DetailFiles) { + T_FO_LEADER_WELL_RECORD_DETAIL_FILE item2 = new T_FO_LEADER_WELL_RECORD_DETAIL_FILE(); item2.ORG_ID = entity.ORG_ID; item2.LEADER_WELL_RECORD_DETAIL_ID = item.ID; item2.Nav_ImgFile = null; + item2.IMG_FILE_ID = file.IMG_FILE_ID; detailFileList.Add(item2); } } if (item.Nav_DetailAreas != null && item.Nav_DetailAreas.Any()) { - foreach (var item2 in item.Nav_DetailAreas) + foreach (var area in item.Nav_DetailAreas) { + T_FO_LEADER_WELL_RECORD_DETAIL_AREA item2 = new T_FO_LEADER_WELL_RECORD_DETAIL_AREA(); item2.ORG_ID = entity.ORG_ID; item2.LEADER_WELL_RECORD_DETAIL_ID = item.ID; + item2.AREA_ID = area.AREA_ID; item2.Nav_Area = null; detailAreaList.Add(item2); } @@ -230,10 +238,12 @@ namespace APT.FO.WebApi.Controllers entity.Nav_Files = null; if (files != null && files.Any()) { - foreach (var item in files) + foreach (var file in files) { + T_FO_LEADER_WELL_RECORD_FILE item = new T_FO_LEADER_WELL_RECORD_FILE(); item.ORG_ID = entity.ORG_ID; item.LEADER_WELL_RECORD_ID = entity.ID; + item.IMG_FILE_ID = file.IMG_FILE_ID; item.Nav_ImgFile = null; fileList.Add(item); }