diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordSummaryController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordSummaryController.cs index 991acf4..aa44e5d 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordSummaryController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordSummaryController.cs @@ -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?.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; }); } @@ -757,7 +757,7 @@ namespace APT.SK.WebApi.Controllers.Api item.Nav_CheckRecordDetailUsers = userTemps; } - result.Nav_CheckRecordDetails = details; + result.Nav_CheckRecordDetails = details.OrderByDescending(t=>t.CHECK_RESULT).ToList(); } } return result; @@ -795,7 +795,7 @@ namespace APT.SK.WebApi.Controllers.Api 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; });