领导带班下井
This commit is contained in:
parent
78ffc02766
commit
eb6c7513b7
@ -153,13 +153,28 @@ namespace APT.FO.WebApi.Controllers
|
||||
foreach (var item in details)
|
||||
{
|
||||
T_FO_LEADER_WELL_RECORD_DETAIL de = new T_FO_LEADER_WELL_RECORD_DETAIL();
|
||||
de.ORG_ID = entity.ORG_ID;
|
||||
de.LEADER_WELL_RECORD_ID = entity.ID;
|
||||
de.START_DATE = item.START_DATE;
|
||||
de.END_DATE = item.END_DATE;
|
||||
de.USER_ID = item.USER_ID;
|
||||
de.DESCRIPTION = item.DESCRIPTION;
|
||||
de.QUESTION = item.QUESTION;
|
||||
de.MEASURE = item.MEASURE;
|
||||
de.ITEM = item.ITEM;
|
||||
de.PLACE = item.PLACE;
|
||||
if (de.USER_ID == loginUserId)
|
||||
{
|
||||
item.USER_DEAL_STATUS = MS.Domain.Enums.FOUserShiftStatusEnum.已处理;
|
||||
}
|
||||
detailList.Add(item);
|
||||
if (item.Nav_DetailFiles != null && item.Nav_DetailFiles.Any())
|
||||
{
|
||||
foreach (var file in item.Nav_DetailFiles.Where(t=>!t.IS_DELETED))
|
||||
{
|
||||
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.LEADER_WELL_RECORD_DETAIL_ID = de.ID;
|
||||
item2.Nav_ImgFile = null;
|
||||
item2.IMG_FILE_ID = file.IMG_FILE_ID;
|
||||
detailFileList.Add(item2);
|
||||
@ -171,7 +186,7 @@ namespace APT.FO.WebApi.Controllers
|
||||
{
|
||||
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.LEADER_WELL_RECORD_DETAIL_ID = de.ID;
|
||||
item2.AREA_ID = area.AREA_ID;
|
||||
item2.Nav_Area = null;
|
||||
detailAreaList.Add(item2);
|
||||
@ -222,21 +237,7 @@ namespace APT.FO.WebApi.Controllers
|
||||
// detailAfterUserList.Add(item2);
|
||||
// }
|
||||
//}
|
||||
de.ORG_ID = entity.ORG_ID;
|
||||
de.LEADER_WELL_RECORD_ID = entity.ID;
|
||||
de.START_DATE = item.START_DATE;
|
||||
de.END_DATE= item.END_DATE;
|
||||
de.USER_ID = item.USER_ID;
|
||||
de.DESCRIPTION = item.DESCRIPTION;
|
||||
de.QUESTION = item.QUESTION;
|
||||
de.MEASURE = item.MEASURE;
|
||||
de.ITEM = item.ITEM;
|
||||
de.PLACE = item.PLACE;
|
||||
if (de.USER_ID == loginUserId)
|
||||
{
|
||||
item.USER_DEAL_STATUS = MS.Domain.Enums.FOUserShiftStatusEnum.已处理;
|
||||
}
|
||||
detailList.Add(item);
|
||||
|
||||
}
|
||||
}
|
||||
var files = entity.Nav_Files;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user