GetJzFileInfo修改接口返回数据逻辑，添加排序

24Hour/Controllers/Common/LawyerArchivesUnAuthorizeController.cs

@@ -1,4 +1,5 @@
 using AutoMapper;
+using com.sun.xml.@internal.bind.v2.runtime.unmarshaller;
 using Elight.Entity;
 using Elight.Entity.APPDto.Lawyer;
 using Elight.Entity.AppMode.Lawyer;
@@ -63,27 +64,56 @@ namespace _24Hour.Controllers.Common
         public async Task<Result> GetJzFileInfo(IEnumerable<string> jzids)
         {
             var result = new Result();
-            var list = await _db.Queryable<JZJBXX>()
+            try
-                .Includes(x => x.jzml, q => q.jzwj)
-                .Where(x => jzids.Contains(x.Id))
-                .ToListAsync();
-            var dtos = mapper.Map<List<JZJBXXDto>>(list);
-            var listdata = dtos.Select(x => new
             {
-                jzid = x.Id,
+                var jzinfo = await _db.Queryable<JZJBXX>()
-                files = x.jzml.OrderBy(x => x.mlsxh)
+               .Includes(x => x.jzml.OrderBy(x => x.mlsxh).ToList())
-                         .SelectMany(e => e.jzwj.OrderBy(x => x.wjsxh))
+               .Includes(x => x.jzml, x => x.jzwj.OrderBy(x => x.wjsxh).ToList())
-                         .Select((q) => new
+               .In(x => x.Id, jzids).ToListAsync();
-                         {
+                if (jzinfo != null)
-                             order = q.wjsxh,
+                {
-                             fileid = q.Id,
+                    var a = mapper.Map<List<JZJBXXDto>>(jzinfo);
-                             filepath = q.jpgwjlj
+                    var data = a.Select(jzinfo => new
-                         }).OrderBy(x => x.order)
+                    {
-            }).ToList();
+                        id = jzinfo.Id,
+                        files = jzinfo?.jzml?.Where(x => x.fmlbh == null)
+                        .OrderBy(x => x.mlsxh)
+                        .Select(juan =>
+                        {
+                            return jzinfo.jzml.Where(ml => ml.fmlbh == juan.mlbh)
+                            .OrderBy(sx => sx.mlsxh)
+                            .SelectMany(x => x.jzwj.OrderBy(q => q.wjsxh).ToList())
+                            .Select(r=>new {
+                                order = r.wjsxh,
+                                fileid = r.Id,
+                                filepath = r.jpgwjlj
+                            }).ToList();
+                        })
+                    });
+                    var resultdata = data.Select(e => new
+                    {
+                        jzid = e.id,
+                        files = e?.files?.SelectMany(q => q).ToList()
+                    }).ToList();
 
-            result.result = listdata;
+                    result.result = resultdata;
-            result.IsSucceed = true;
+                    result.IsSucceed = true;
-            return result;
+                    return result;
+                }
+                else
+                {
+                    result.IsSucceed = false;
+                    return result;
+                }
+;
+            }
+            catch (Exception ex)
+            {
+                logger.LogError(ex, "获取卷宗文件失败");
+                result.Message = ex.Message;
+                result.IsSucceed = false;
+                return result;
+            }
         }
         /// <summary>
         /// 上传一体机的文件缓存状态