Merge branch 'feature/snapshot' into test

src/Hotline.Api/Controllers/Snapshot/SnapshotController.cs

@@ -387,13 +387,13 @@ public class SnapshotController : BaseController
             .Where(m => m.IndustryType == EIndustryType.Declare)
             .Select(m => m.Id)
             .ToListAsync();
-        var result = await _orderSnapshotRepository.Queryable()
+        var query = _orderSnapshotRepository.Queryable()
             .LeftJoin<Order>((snapshot, order) => order.Id == snapshot.Id)
             .Where((snapshot, order) => industryId.Contains(snapshot.IndustryId))
             .WhereIF(dto.JsonData.AcceptContent.Tyep == 2, (snapshot, order) => order.CreationTime.Date == disposeDate.Date)
             .WhereIF(dto.JsonData.AcceptContent.Tyep == 1, (snapshot, order) => order.FiledTime != null && order.FiledTime.Value.Date == disposeDate.Date)
             .Select((snapshot, order) => new OrderDeclareItemsOutDto
-            { 
+            {
                 AreaCode = order.AreaCode,
                 AreaName = order.County,
                 EventType = 0,
@@ -401,29 +401,29 @@ public class SnapshotController : BaseController
                 CreatedTime = order.CreationTime,
                 WorkType = snapshot.JobType.Value,
                 Source = 1,
-                WorkTimeStart = snapshot.StartWorkTime.Value,
-                WorkTimeStop = snapshot.EndWorkTime.Value,
+                WorkTimeStart = snapshot.StartWorkTime,
+                WorkTimeStop = snapshot.EndWorkTime,
                 OnsiteSituateDescription = order.Content,
                 Name = order.FromName,
                 Phone = order.FromPhone,
                 EventId = order.No,
                 PlaceType = snapshot.Workplace,
                 Compliance = 1,
-                //CheckTime = snapshot.CheckTime,
-                //CheckUser = snapshot.CheckUser,
-                //CheckDept = snapshot.CheckDept,
-                //CheckPhone = snapshot.CheckPhone,
-            })
-            .ToListAsync();
+                CheckTime = order.RealCommunicationTime,
+                CheckUser = order.RealHandlerName,
+                CheckDept = order.FileUserOrgName,
+                CheckPhone = order.RealHandlerPhone,
+                LatLon = order.Latitude.ToString() + "," + order.Longitude.ToString(),
+                Title = order.Title,
+                CompanyType = snapshot.CompanyName,
+                OperationPlace = snapshot.WorkplaceName
+            });
+        var result = await query.ToListAsync();
 
 
         return OpenResponse.Ok(new List<WebPortalDeResponse<List<OrderDeclareItemsOutDto>>>()
         {
-            new() { code = "1", msg = "ok", data =
-                [
-                    new OrderDeclareItemsOutDto()
-                ]
-            }
+            new() { code = "1", msg = "ok", data = result }
         });
     }
 

src/Hotline.Api/config/appsettings.Development.json

@@ -68,13 +68,13 @@
     }
   },
   "ConnectionStrings": {
-    "Hotline": "PORT=5432;DATABASE=hotline;HOST=110.188.24.182;PASSWORD=fengwo11!!;USER ID=dev;"
+    "Hotline": "PORT=5432;DATABASE=hotline_dev;HOST=110.188.24.182;PASSWORD=fengwo11!!;USER ID=dev;"
   },
   "Cache": {
     "Host": "110.188.24.182",
     "Port": 50179,
     "Password": "fengwo123!$!$",
-    "Database": 3 //test:3, dev:5
+    "Database": 5 //test:3, dev:5
   },
   "Swagger": true,
   "AccLog":  false,

src/Hotline.Share/Dtos/Snapshot/OrderDeclareDto.cs

@@ -35,6 +35,8 @@ public class OrderDeclareItemsOutDto
     /// </summary>
     public DateTime CreatedTime { get; set; }
 
+    public string CompanyType {get;set; }
+
     /// <summary>
     /// 作业类别
     /// 0 电焊 1 气割 2 其它
@@ -50,12 +52,12 @@ public class OrderDeclareItemsOutDto
     /// <summary>
     /// 作业开始时间
     /// </summary>
-    public DateTime WorkTimeStart { get; set; }
+    public DateTime? WorkTimeStart { get; set; }
 
     /// <summary>
     /// 作业结束时间
     /// </summary>
-    public DateTime WorkTimeStop { get; set; }
+    public DateTime? WorkTimeStop { get; set; }
 
     /// <summary>
     /// 现场描述情况内容
@@ -90,22 +92,33 @@ public class OrderDeclareItemsOutDto
     /// <summary>
     /// 检查时间
     /// </summary>
-    public DateTime CheckTime { get; set; }
+    public DateTime? CheckTime { get; set; }
 
     /// <summary>
     /// 核查人姓名
     /// </summary>
-    public string CheckUser { get; set; }
+    public string? CheckUser { get; set; }
 
     /// <summary>
     /// 核查人所属部门
     /// </summary>
-    public string CheckDept { get; set; }
+    public string? CheckDept { get; set; }
 
     /// <summary>
     /// 核查人联系电话
     /// </summary>
-    public string CheckPhone { get; set; }
+    public string? CheckPhone { get; set; }
+
+    /// <summary>
+    /// 经纬度
+    /// </summary>
+    public string LatLon { get; set; }
+
+    /// <summary>
+    /// 标题
+    /// </summary>
+    public string Title { get; set; }
+    public string? OperationPlace { get; set; }
 }
 
 public class OrderDeclareItemsInDto