tangjiang il y a 7 mois
Parent
commit
8aed932f85

+ 6 - 4
src/DataSharing.Host/Controllers/YiBin/ConvergenceMediaController.cs

@@ -480,7 +480,7 @@ namespace DataSharing.Host.Controllers.YiBin
                 PageSize = dto.PageSize
             };
 
-            var result = await _fwClient.RequestNoTokenAsync<HotlineClientDataSharingResponse<PagedDto<OrderDto>>>("api/v1/DataSharing/get_order_list_publish",
+            var result = await _fwClient.RequestNoTokenAsync<HotlineClientDataSharingResponse<PagedDto<PublishDto>>>("api/v1/DataSharing/get_order_list_publish",
                "Post", System.Text.Json.JsonSerializer.Serialize(getOrder));
             int nPageCount = 0;
             List<GetOrderMediaDataListDto> listData = [];
@@ -503,7 +503,8 @@ namespace DataSharing.Host.Controllers.YiBin
                             AddDate = item.CreationTime.ToString("yyyy-MM-dd HH:mm:ss"),
                             FromName = item.SourceChannel,
                             PurTypeName = item.AcceptType,
-                            ResultState = item.Status >= EOrderStatus.Filed ? "办理完成" : "办理中"
+                            ResultState = item.Status >= EOrderStatus.Filed ? "办理完成" : "办理中",
+                            PubDate = item.PublishTime.HasValue == true ? item.PublishTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
                         });
                     }
                 }
@@ -1031,7 +1032,7 @@ namespace DataSharing.Host.Controllers.YiBin
                 AreaCode = areaCode
             };
 
-            var result = await _fwClient.RequestNoTokenAsync<HotlineClientDataSharingResponse<PagedDto<OrderDto>>>("api/v1/DataSharing/get_order_list_publish",
+            var result = await _fwClient.RequestNoTokenAsync<HotlineClientDataSharingResponse<PagedDto<PublishDto>>>("api/v1/DataSharing/get_order_list_publish",
                "Post", System.Text.Json.JsonSerializer.Serialize(getOrder));
             int nPageCount = 0;
             List<GetOrderMediaDataListDto> listData = [];
@@ -1054,7 +1055,8 @@ namespace DataSharing.Host.Controllers.YiBin
                             AddDate = item.CreationTime.ToString("yyyy-MM-dd HH:mm:ss"),
                             FromName = item.SourceChannel,
                             PurTypeName = item.AcceptType,
-                            ResultState = item.Status >= EOrderStatus.Filed ? "办理完成" : "办理中"
+                            ResultState = item.Status >= EOrderStatus.Filed ? "办理完成" : "办理中",
+                            PubDate = item.PublishTime.HasValue == true ? item.PublishTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
                         });
                     }
                 }

+ 5 - 2
src/DataSharing.Host/Controllers/YiBin/WllzYBController.cs

@@ -113,10 +113,11 @@ namespace DataSharing.Host.Controllers.YiBin
                 IdentityType = Hotline.Share.Enums.Order.EIdentityType.Citizen,
                 Transpond = false,
                 IsEnforcementOrder = false,
-                SourceChannel = "网络理政—市民中心大厅",
-                SourceChannelCode = "WLLZ",
+                SourceChannel = accountDto.PlatformSourceName,
+                SourceChannelCode = accountDto.PlatformSource,
                 ExternalId = Guid.NewGuid().ToString()
             };
+            
 
             //调用工单创建接口
             var result = await _fwClient.RequestNoTokenAsync<HotlineClientResponse>("api/v1/Order/add-anonymous", "Post", System.Text.Json.JsonSerializer.Serialize(data));
@@ -195,5 +196,7 @@ namespace DataSharing.Host.Controllers.YiBin
             }
             return OpenResponse.Ok(OtherPlatformsDeResponse<List<WllzOrderInfoReturnDto>>.Success(returnDtos));
         }
+
+
     }
 }

+ 6 - 0
src/DataSharing.Share/Dtos/YiBin/ConvergenceMedia/GetOrderMediaDataDto.cs

@@ -72,5 +72,11 @@ namespace DataSharing.Share.Dtos.YiBin.ConvergenceMedia
         /// </summary>
         [JsonPropertyName("ResultState")]
         public string ResultState { get; set; }
+
+        /// <summary>
+        /// 发布时间
+        /// </summary>
+        [JsonPropertyName("PubDate")]
+        public string? PubDate { get; set; }
     }
 }

+ 1 - 1
src/DataSharing/DataSharing.csproj

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