Merge branch 'feature/updatecitychange' into feature/luzhou110

src/DataSharing.Host/Controllers/Police110/PoliceDCJTController.cs

@@ -175,7 +175,14 @@ namespace DataSharing.Host.Controllers.Police110
                             AcceptType = "咨询",
                             AcceptTypeCode = "10"
                         };
-
+                       
+                        if (!string.IsNullOrEmpty(orderDto.AreaCode))
+                        {
+                            if (orderDto.AreaCode == "510399")
+                                orderDto.AreaCode = "519800";
+                            if(orderDto.AreaCode.Length>6)
+                                orderDto.AreaCode=orderDto.AreaCode.Substring(0,6);
+                        }
                         orderDto.FromGender = chainAlarm.FromGender switch
                         {
                             "0" => EGender.Female,

src/DataSharing.ZiGong/ZiGongSendTaskDataService.cs

@@ -91,6 +91,7 @@ namespace DataSharing.ZiGong
                         Title = order.Title,
                         CreationTime = order.CreationTime.ToString("yyyy-MM-dd HH:mm:ss"),
                         Status = order.StatusText,
+                        Content= order.Content,
                         Visits = null
                     };
                     var request = JsonSerializer.Serialize(smartCitySystem, new JsonSerializerOptions

src/DataSharing/DataSharing.csproj

@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="FluentValidation" Version="11.6.0" />
-    <PackageReference Include="Hotline.Share" Version="1.0.117" />
+    <PackageReference Include="Hotline.Share" Version="1.0.118" />
     <PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
     <PackageReference Include="Quartz.Jobs" Version="3.8.0" />
     <PackageReference Include="RestSharp" Version="110.2.0" />

src/DataSharing/Province/ProvinceService.cs

@@ -1333,6 +1333,7 @@ namespace DataSharing.Province
                                     Title = dto.Order.Title,
                                     CreationTime = dto.Order.CreationTime.ToString("yyyy-MM-dd HH:mm:ss"),
                                     Status = dto.Order.StatusText,
+                                    Content = dto.Order.Content,
                                     Visits = null
                                 };
                                 List<VisitInfo> visitInfos = new();

src/DataSharing/ZiGong/SmartCitySystem.cs

@@ -30,6 +30,11 @@
         /// </summary>
         public string Status { get; set; }
 
+        /// <summary>
+        /// 工单内容
+        /// </summary>
+        public string Content { get; set; }
+
         /// <summary>
         /// 回访信息
         /// </summary>