合并

OpenAuth.App/ServiceApp/DroneDocking/DroneDockApp.cs

@@ -1252,21 +1252,35 @@ namespace OpenAuth.App.ServiceApp.DroneDocking
         {
             RefAsync<int> totalCount = 0;
             var info = await base.Repository.AsQueryable()
-                .WhereIF(!string.IsNullOrEmpty(keyWord),
-                    t => t.taskname.Contains(keyWord) || t.bizidname.Contains(keyWord))
-                .Select(t => new DroneDockRes
+            .WhereIF(!string.IsNullOrEmpty(keyWord), t => t.taskname.Contains(keyWord)||t.bizidname.Contains(keyWord))
+            .Select(t=>new DroneDockRes
+            {
+                id= t.id,
+                bizidname= t.bizidname,
+                taskname= t.taskname,
+                createtime= t.createtime,
+                state= t.state,
+                datacode= t.datacode,
+                deviceid= t.deviceid,
+                taskid= t.taskid,
+                tasklist = SqlFunc.Subqueryable<DroneDocktaskdetail>().Where(r => r.taskid == t.id).LeftJoin<LasaTask>((r, s) => r.flighttaskid == s.FlightId).ToList((r,s)=> new DetailRes
                 {
-                    id = t.id,
-                    bizidname = t.bizidname,
-                    taskname = t.taskname,
-                    createtime = t.createtime,
-                    state = t.state,
-                    datacode = t.datacode,
-                    deviceid = t.deviceid,
-                    taskid = t.taskid,
-                    tasklist = SqlFunc.Subqueryable<DroneDocktaskdetail>().Where(r => r.taskid == t.id).ToList()
+                    id = r.id,
+                    bsm=r.bsm,
+                    Status=s.Status,
+                    bz=r.bz,
+                    dkbh=r.dkbh,
+                    dkfw=r.dkfw,
+                    dklx=r.dklx,
+                    dkmc=r.dkmc,
+                    dkmj=r.dkmj,
+                    flighttaskid=r.flighttaskid,
+                    taskid=r.taskid,
+                    xzqdm=r.xzqdm,
+                    zdkbh=r.zdkbh
                 })
-                .ToPageListAsync(page, limit, totalCount);
+            })
+            .ToPageListAsync(page, limit, totalCount);
             return new Response<PageInfo<List<DroneDockRes>>>
             {
                 Result = new PageInfo<List<DroneDockRes>>

OpenAuth.App/ServiceApp/DroneDocking/Response/DroneDockRes.cs

@@ -51,7 +51,85 @@ namespace OpenAuth.App.ServiceApp.DroneDocking.Response
         public int state { get; set; }
 
         public DateTime? createtime { get; set; }
-        public List<DroneDocktaskdetail> tasklist { get; set; }
+        public List<DetailRes> tasklist { get; set; }
+    }
+
+    public class DetailRes
+    {
+        public string id { get; set; }
+
+        /// <summary>
+        /// Desc:图斑标识码
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public string bsm { get; set; }
+
+        /// <summary>
+        /// Desc:县级行政区代码
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public string xzqdm { get; set; }
+
+        /// <summary>
+        /// Desc:地块编号
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public string dkbh { get; set; }
+
+        /// <summary>
+        /// Desc:地块类型
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public string dklx { get; set; }
+
+        /// <summary>
+        /// Desc:子地块编号
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public string zdkbh { get; set; }
+
+        /// <summary>
+        /// Desc:地块名称
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public string dkmc { get; set; }
+
+        /// <summary>
+        /// Desc:地块面积
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public decimal? dkmj { get; set; }
+
+        /// <summary>
+        /// Desc:地块范围，cgcs2000的经纬度坐标，wkt格式
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public string dkfw { get; set; }
+
+        /// <summary>
+        /// Desc:备注
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public string bz { get; set; }
+
+        /// <summary>
+        /// Desc:任务id，对应任务表id
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public string taskid { get; set; }
+        //飞行任务id
+        public string flighttaskid { get; set; }
+        public int? Status { get; set; }
     }