修改省对接

OpenAuth.App/ServiceApp/DroneDocking/DroneDockApp.cs

@@ -360,11 +360,17 @@ namespace OpenAuth.App.ServiceApp.DroneDocking
 
             //序列化返回数据并处理
             var task = JsonSerializer.Deserialize<AirPortTaskReq>(data);
+
+            string ids = "";
+            foreach(var item in task.deviceid)
+            {
+
+            }
             
             //task数据生成
             DroneDocktask dt= new DroneDocktask();
             dt.id=Guid.NewGuid().ToString();
-            dt.deviceid=task.deviceid.ToString();
+            dt.deviceid= string.Join(",", task.deviceid);
             dt.bizidname=task.bizidname.ToString();
             dt.taskid = task.taskid;
             dt.taskname = task.taskname;
@@ -778,7 +784,7 @@ namespace OpenAuth.App.ServiceApp.DroneDocking
         {
             RefAsync<int> totalCount = 0;
             var info = await base.Repository.AsQueryable()
-            .WhereIF(!string.IsNullOrEmpty(keyWord), t => t.taskname.Contains(keyWord))
+            .WhereIF(!string.IsNullOrEmpty(keyWord), t => t.taskname.Contains(keyWord)||t.bizidname.Contains(keyWord))
             .Select(t=>new DroneDockRes
             {
                 id= t.id,
@@ -789,7 +795,7 @@ namespace OpenAuth.App.ServiceApp.DroneDocking
                 datacode= t.datacode,
                 deviceid= t.deviceid,
                 taskid= t.taskid,
-                tasklist=SqlFunc.Subqueryable<DroneDocktaskdetail>().Where(r=>r.id==t.taskid).ToList()
+                tasklist=SqlFunc.Subqueryable<DroneDocktaskdetail>().Where(r=>r.taskid==t.id).ToList()
             })
             .ToPageListAsync(page, limit, totalCount);
             return new Response<PageInfo<List<DroneDockRes>>>
@@ -828,7 +834,7 @@ namespace OpenAuth.App.ServiceApp.DroneDocking
                 {
                     res.taskExecuteTime =Convert.ToDateTime(flighttaskinfo.ExecuteTime).ToString("yyyy-MM-dd HH:mm:ss");
                     res.waylineName=flighttaskinfo.TaskAirLineName;
-                    res.flightTaskType=flighttaskinfo.TaskType;
+                    res.flightTaskType=Convert.ToInt32(flighttaskinfo.FlightTaskType);
                     switch (flighttaskinfo.Status)
                     {
                         case 0: