Merge branch 'test' of http://110.188.24.182:10023/Fengwo/hotline into test

src/Hotline.Api/Controllers/ExportData/ExportDataController.cs

@@ -0,0 +1,23 @@
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Hotline.Api.Controllers.ExportData;
+
+[ApiController]
+[Microsoft.AspNetCore.Mvc.Route("{*path:regex(.*export_data$)}")]
+public class ExportDataController : BaseController
+{
+    [HttpGet]
+    public IActionResult HandleExport()
+    {
+        // 处理 GET 请求
+        return Ok("This is a GET export request.");
+    }
+
+    [HttpPost]
+    public IActionResult HandleExportPost()
+    {
+        // 处理 POST 请求
+        return Ok("This is a POST export request.");
+    }
+}

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

@@ -23,6 +23,7 @@ using Hotline.Tools;
 using Mapster;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using SharpCompress.Compressors.Xz;
 using SqlSugar;
 using SqlSugar.Extensions;
 using System.ComponentModel.DataAnnotations;
@@ -389,6 +390,19 @@ public class SnapshotController : BaseController
                 WorkAddress = order.Address,
                 CreatedTime = order.CreationTime,
                 WorkType = snapshot.JobType.ObjToInt(),
+                Source = 1,
+                WorkTimeStart = snapshot.StartWorkTime.Value,
+                WorkTimeStop = snapshot.EndWorkTime.Value,
+                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();
 

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

@@ -81,6 +81,31 @@ public class OrderDeclareItemsOutDto
     /// 场所类别编码
     /// </summary>
     public string PlaceType { get; set; }
+
+    /// <summary>
+    /// 办结类型，0 不合规，1 合规，2 人工完结（误报，核查取消等情况）
+    /// </summary>
+    public int Compliance { get; set; }
+
+    /// <summary>
+    /// 检查时间
+    /// </summary>
+    public DateTime CheckTime { get; set; }
+
+    /// <summary>
+    /// 核查人姓名
+    /// </summary>
+    public string CheckUser { get; set; }
+
+    /// <summary>
+    /// 核查人所属部门
+    /// </summary>
+    public string CheckDept { get; set; }
+
+    /// <summary>
+    /// 核查人联系电话
+    /// </summary>
+    public string CheckPhone { get; set; }
 }
 
 public class OrderDeclareItemsInDto

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

@@ -105,7 +105,7 @@ public class AddSnapshotOrderInDto : Position
     /// <summary>
     /// 作业类型
     /// </summary>
-    public string? JobType { get; set; }
+    public EJobType? JobType { get; set; }
 
     /// <summary>
     /// 经营单位类别