src/DataSharing.Host/Controllers/YiBin/ConvergenceMediaController.cs

@@ -286,16 +286,18 @@ namespace DataSharing.Host.Controllers.YiBin
             };
             GetOrderList orderList = new()
             {
-                SourceChannelCode = GetChannelCode(accountDto.PlatformSource),
+                SourceChannelCode ="YTW",// GetChannelCode(accountDto.PlatformSource),
                 No = dto.AcceptCode,
                 Title = dto.Title,
                 Mobile = dto.Mobile,
                 AcceptTypeCode = acceptTypeCode,
-                StartTime = string.IsNullOrEmpty(dto.StartDate) == false ? null : Convert.ToDateTime(dto.StartDate),
-                EndTime = string.IsNullOrEmpty(dto.EndDate) == false ? null : Convert.ToDateTime(dto.EndDate).AddDays(1)
+                StartTime = string.IsNullOrEmpty(dto.StartDate) == true ? null : Convert.ToDateTime(dto.StartDate),
+                EndTime = string.IsNullOrEmpty(dto.EndDate) == true ? null : Convert.ToDateTime(dto.EndDate).AddDays(1),
+                PageIndex=dto.CurrentPage,
+                PageSize=dto.PageSize
             };
 
-            var result = await _fwClient.RequestNoTokenAsync<HotlineClientDataResponse<PagedDto<OrderDto>>>("api/v1/DataSharing/get_order_list_own",
+            var result = await _fwClient.RequestNoTokenAsync<HotlineClientDataSharingResponse<PagedDto<OrderDto>>>("api/v1/DataSharing/get_order_list_own",
                 "Post", System.Text.Json.JsonSerializer.Serialize(orderList));
             int nPageCount = 0;
             List<GetOrderMediaDataListDto> listData = [];
@@ -304,13 +306,14 @@ namespace DataSharing.Host.Controllers.YiBin
                 if (result.result.Items != null && result.result.Items.Count > 0)
                 {
                     //计算总页数
-                    nPageCount = Convert.ToInt32(Math.Ceiling(Convert.ToDouble(result.result.Total) / dto.PageSize.Value));
-
+                    nPageCount = Convert.ToInt32(Math.Ceiling(Convert.ToDouble(result.result.Total) / dto.PageSize));
+                    int rowID = 0;
                     foreach (var item in result.result.Items)
                     {
+                        rowID++;
                         listData.Add(new GetOrderMediaDataListDto()
                         {
-                            RowID = ((dto.CurrentPage - 1) * dto.PageSize) + 1 + "",
+                            RowID = ((dto.CurrentPage - 1) * dto.PageSize) + rowID + "",
                             FlowID = item.Id,
                             Code = item.No,
                             Title = item.Title,
@@ -368,48 +371,40 @@ namespace DataSharing.Host.Controllers.YiBin
             {
                 No = dto.AcceptCode,
                 Password = dto.AcceptPwd,
-                SourceChannelCode = GetChannelCode(accountDto.PlatformSource)
+              // SourceChannelCode = GetChannelCode(accountDto.PlatformSource)
             };
-            //var result = await _fwClient.RequestNoTokenAsync<HotlineClientDataResponse<OrderDto>>("api/v1/DataSharing/get_order_detail_by_no_pwd",
-            //    "Post", System.Text.Json.JsonSerializer.Serialize(getOrder));
-            //if (result != null && result.code == 0)
-            //{
-            //    if (result.result != null)
-            //    {
-            //        MediaOrderDetailDataDto detailDataDto = new()
-            //        {
-            //            FlowID
-            //        };
-            //    }
-            //}
+            var result = await _fwClient.RequestNoTokenAsync<HotlineClientDataSharingResponse<OrderDto>>("api/v1/DataSharing/get_order_detail_by_no_pwd",
+                "Post", System.Text.Json.JsonSerializer.Serialize(getOrder));
+            List<MediaOrderDetailDataDto> items = new();
+            if (result != null && result.code == 0)
+            {
+                if (result.result != null)
+                {
+                    var item = result.result;
+                    items.Add(new()
+                    {
+                        FlowID = item.Id,
+                        FlowCode = item.No,
+                        FlowTitle = item.Title,
+                        FlowFromName = item.SourceChannel,
+                        FlowPurTypeName = item.AcceptType,
+                        FlowConTypeName = item.HotspotName,
+                        FlowAddDate = item.CreationTime.ToString("yyyy-MM-dd HH:mm:ss"),
+                        FlowLKName = item.FromName,
+                        FlowBMName = item.ActualHandleOrgName,
+                        FlowRSFlagName = item.Status >= EOrderStatus.Filed ? "办理完成" : "办理中",
+                        FlowContent = item.Content,
+                        FlowResult = item.ActualOpinion,
+                    });
+                }
+            }
+
 
-            //查询数据
-            var items = await _dataOrderRepository
-     .Queryable()
-     .Where(p => p.OrderNo == dto.AcceptCode)
-     .Where(p => p.Password == dto.AcceptPwd)
-     .Where(p => p.Source == accountDto.PlatformSource)
-      .Select(it => new
-      {
-          FlowID = it.Id,
-          FlowCode = it.OrderNo,
-          FlowTitle = it.Title,
-          FlowFromName = it.CaseSource,
-          FlowPurTypeName = it.CaseType,
-          FlowConTypeName = it.HotspotName,
-          FlowAddDate = it.CaseDate,
-          FlowLKName = it.FromName,
-          FlowBMName = it.ActualHandleOrgName,
-          FlowRSFlagName = it.HandleState,
-          FlowContent = it.Content,
-          FlowResult = it.ActualOpinion,
-      })
-      .ToListAsync();
 
             if (items == null || items.Count == 0)
-                return OpenResponse.Ok(ConvergenceMediaDeResponse<List<ReturnData>>.Failed(ReturnData.ReturnDataInfo("信件受理中！"), "0", "失败"));
+                return OpenResponse.Ok(ConvergenceMediaDeResponse<List<ReturnData>>.Failed(ReturnData.ReturnDataInfo("编号、密码错误！"), "0", "失败"));
             else
-                return OpenResponse.Ok(ConvergenceMediaDeResponse<IReadOnlyList<MediaOrderDetailDataDto>>.Success(_mapper.Map<IReadOnlyList<MediaOrderDetailDataDto>>(items), "成功"));
+                return OpenResponse.Ok(ConvergenceMediaDeResponse<IReadOnlyList<MediaOrderDetailDataDto>>.Success(items, "成功"));
 
         }
 

src/DataSharing.Host/config/appsettings.Development.json

@@ -74,9 +74,9 @@
 
     //业务系统推送工单
     "HotlineClient": {
-      "AddressUrl": "http://localhost:50100/",
+     //"AddressUrl": "http://localhost:50100/",
       //"AddressUrl": "http://110.188.24.28:50300/"
-      //"AddressUrl": "http://open.hotline.12345lm.cn/"
+      "AddressUrl": "http://open.hotline.12345lm.cn/"
     },
 
     //业务系统附件上传配置

src/DataSharing.Share/Dtos/HotlineSetting/HotlineClientDataSharingResponse.cs

@@ -0,0 +1,14 @@
+namespace DataSharing.Share.Dtos.HotlineSetting
+{
+    public class HotlineClientDataSharingResponse<Tdata>
+    {
+        public Tdata result { get; set; }
+
+        public int code { get; set; }
+
+        public string message { get; set; }
+
+        public string error { get; set; }
+    }
+
+}

src/DataSharing.Share/Dtos/HotlineSetting/HotlineClientResponse.cs

@@ -1,12 +1,5 @@
 namespace DataSharing.Share.Dtos.HotlineSetting
 {
-    public class HotlineClientDataResponse<TData>
-    {
-        public TData result { get; set; }
-        public int code { get; set; }
-        public string message { get; set; }
-        public string error { get; set; }
-    }
 
     public class HotlineClientResponse
     {

src/DataSharing.Share/Dtos/YiBin/ConvergenceMedia/GetOrderMediaReceiveDto.cs

@@ -43,11 +43,11 @@
         /// <summary>
         /// 当前页
         /// </summary>
-        public int? CurrentPage { get; set; } = 1;
+        public int CurrentPage { get; set; } = 1;
 
         /// <summary>
         /// 查询每页大小（每页最大20条）
         /// </summary>
-        public int? PageSize { get; set; } = 10;
+        public int PageSize { get; set; } = 10;
     }
 }

src/DataSharing.Share/Dtos/YiBin/ConvergenceMedia/MediaOrderDetailDataDto.cs

@@ -73,8 +73,8 @@ namespace DataSharing.Share.Dtos.YiBin.ConvergenceMedia
         /// <summary>
         /// 处理结果
         /// </summary>
-        [JsonPropertyName("FlowResultg")]
-        public string FlowResultg { get; set; }
+        [JsonPropertyName("FlowResult")]
+        public string FlowResult { get; set; }
 
         /// <summary>
         /// 发布时间

src/DataSharing/BaseHttpInvoker.cs

@@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Http;
 using System.Net.Http.Headers;
 using System.Net.Http.Json;
 using System.Text;
+using System.Text.Json;
 using XF.Domain.Dependency;
 using XF.Domain.Exceptions;
 
@@ -74,8 +75,12 @@ public class BaseHttpInvoker : IHttpInvoker, IScopeDependency
         {
             throw new UserFriendlyException("暂不支持该请求方式");
         }
-
-        return System.Text.Json.JsonSerializer.Deserialize<TResponse>(rsp);
+        var options = new JsonSerializerOptions
+        {
+            PropertyNameCaseInsensitive = true
+        };
+        return JsonSerializer.Deserialize<TResponse>(rsp, options);
+        //  return System.Text.Json.JsonSerializer.Deserialize<TResponse>(rsp);
     }
 
     public async Task<TokenResponse> GetTokenAsync(ClientCredentialsTokenRequest request, CancellationToken cancellationToken)