wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
何美荣 2025-11-03 18:08:47 +08:00
parent 7a12f77e45
commit 93a1f78a75
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordSummaryController.cs
View File

@ -670,7 +670,7 @@ namespace APT.SK.WebApi.Controllers.Api
{ {
result.Nav_CheckRecordDetails = result.Nav_CheckRecordDetails.ToList();//Where(c => c.Nav_CheckRecordDetailUsers != null && c.Nav_CheckRecordDetailUsers.FirstOrDefault(m => m.USER_ID == loginUserId)?.USER_ID == loginUserId).ToList(); result.Nav_CheckRecordDetails = result.Nav_CheckRecordDetails.ToList();//Where(c => c.Nav_CheckRecordDetailUsers != null && c.Nav_CheckRecordDetailUsers.FirstOrDefault(m => m.USER_ID == loginUserId)?.USER_ID == loginUserId).ToList();
} }
result?.Nav_CheckRecordDetails?.OrderBy(m => m.RISK_AREA_ID).ThenByDescending(n => (int)n.MARK).ToList(); result?.Nav_CheckRecordDetails?.OrderByDescending(t=>t.CHECK_RESULT).ThenBy(m => m.RISK_AREA_ID).ThenByDescending(n => (int)n.MARK).ToList();
return result; return result;
}); });
} }
@ -757,7 +757,7 @@ namespace APT.SK.WebApi.Controllers.Api
item.Nav_CheckRecordDetailUsers = userTemps; item.Nav_CheckRecordDetailUsers = userTemps;
} }
result.Nav_CheckRecordDetails = details; result.Nav_CheckRecordDetails = details.OrderByDescending(t=>t.CHECK_RESULT).ToList();
} }
} }
return result; return result;
@ -795,7 +795,7 @@ namespace APT.SK.WebApi.Controllers.Api
detail.Nav_CheckRecordDetailUsers = userTemps.OrderByDescending(t => t.ISMAINCHECK).ToList(); detail.Nav_CheckRecordDetailUsers = userTemps.OrderByDescending(t => t.ISMAINCHECK).ToList();
} }
} }
result.Nav_CheckRecordDetails = details.OrderBy(m => m.RISK_AREA_ID).ThenByDescending(n => (int)n.MARK).ToList(); result.Nav_CheckRecordDetails = details.OrderByDescending(t=>t.CHECK_RESULT).ThenBy(m => m.RISK_AREA_ID).ThenByDescending(n => (int)n.MARK).ToList();
} }
return result; return result;
}); });