qinchaoyue 4 сар өмнө
parent
commit
f3cf5fbb62

+ 5 - 0
src/Hotline.Application/Snapshot/IndustryApplication.cs

@@ -64,6 +64,7 @@ public class IndustryApplication : IIndustryApplication, IScopeDependency
         var query = _industryRepository.Queryable()
             .WhereIF(dto.Name.NotNullOrEmpty(), m => m.Name.Contains(dto.Name))
             .WhereIF(dto.ApproveOrgName.NotNullOrEmpty(), m => m.ApproveOrgName.Contains(dto.ApproveOrgName))
+            .OrderByDescending(m => m.CreationTime)
             .Select<IndustryItemsOutDto>();
         
 
@@ -118,6 +119,7 @@ public class IndustryApplication : IIndustryApplication, IScopeDependency
             .LeftJoin<Industry>((c, i) => c.IndustryId == i.Id)
             .WhereIF(dto.IndustryName.NotNullOrEmpty(), (c, i) => i.Name.Contains(dto.IndustryName))
             .WhereIF(dto.CaseName.NotNullOrEmpty(), (c, i) => c.Name.Contains(dto.CaseName))
+            .OrderByDescending(m => m.CreationTime)
             .Select<IndustryCaseItemOutDto>((c, i) => 
             new IndustryCaseItemOutDto {
                 Id = c.Id,
@@ -173,6 +175,7 @@ public class IndustryApplication : IIndustryApplication, IScopeDependency
         var query = _snapshotSMSTemplateRepository.Queryable()
             .LeftJoin<Industry>((s, i) => s.IndustryId == i.Id)
             .WhereIF(dto.IndustryName.NotNullOrEmpty(), (s, i) => i.Name.Contains(dto.IndustryName))
+            .OrderByDescending((s, i) => s.DisplayOrder)
             .Select<SnapshotSMSTemplateItemsOutDto>();
         return query;
     }
@@ -231,6 +234,7 @@ public class IndustryApplication : IIndustryApplication, IScopeDependency
             .WhereIF(dto.Name.NotNullOrEmpty(), m => m.Name.Contains(dto.Name!))
             .WhereIF(dto.SystemAreaName.NotNullOrEmpty(), m => m.SystemAreaName.Contains(dto.SystemAreaName!))
             .WhereIF(dto.PhoneNumber.NotNullOrEmpty(), m => m.PhoneNumber.Contains(dto.PhoneNumber!))
+            .OrderByDescending(m => m.CreationTime)
             .Select<PractitionerItemsOutDto>();
 
         return query;
@@ -298,6 +302,7 @@ public class IndustryApplication : IIndustryApplication, IScopeDependency
         var query = _volunteerRepository.Queryable()
             .WhereIF(dto.Name.NotNullOrEmpty(), m => m.Name.Contains(dto.Name))
             .WhereIF(dto.PhoneNumber.NotNullOrEmpty(), m => m.PhoneNumber.Contains(dto.PhoneNumber))
+            .OrderByDescending(m => m.CreationTime)
             .Select<VolunteerItemsOutDto>();
         return query;
     }