Quellcode durchsuchen

新增宜宾IYB接口

tangjiang vor 7 Monaten
Ursprung
Commit
935cbae4ba

+ 6 - 0
src/DataSharing.Application/Receivers/ProvinceReceiver.cs

@@ -197,6 +197,7 @@ namespace DataSharing.Application.Receivers
                     HandleState = dto.Status >= EOrderStatus.Filed ? "办理完成" : "办理中",
                     StartTime = dto.StartTime,
                     CallId = dto.CallId,
+                    FullAddress = dto.FullAddress,
                     FileJson = _mapper.Map<List<FileJson>>(dto.FileJson)
                 };
 
@@ -233,6 +234,7 @@ namespace DataSharing.Application.Receivers
                         dataOrderNew.StartTime = dto.StartTime;
                         dataOrderNew.CallId = dto.CallId;
                         dataOrderNew.ActualHandleTime = dto.ActualHandleTime;
+                        dataOrderNew.FullAddress = dto.FullAddress;
                         dataOrderNew.FileJson = _mapper.Map<List<FileJson>>(dto.FileJson);
                         await _dsOrderRepository.UpdateAsync(dataOrderNew, cancellationToken);
                     }
@@ -263,6 +265,7 @@ namespace DataSharing.Application.Receivers
                 dataOrder.StartTime = dto.StartTime;
                 dataOrder.CallId = dto.CallId;
                 dataOrder.ActualHandleTime = dto.ActualHandleTime;
+                dataOrder.FullAddress = dto.FullAddress;
                 dataOrder.FileJson = _mapper.Map<List<FileJson>>(dto.FileJson);
 
                 await _dsOrderRepository.UpdateAsync(dataOrder, cancellationToken);
@@ -459,6 +462,7 @@ namespace DataSharing.Application.Receivers
                 dataOrder.Source = dto.Order.Source.ToString();
                 dataOrder.CaseSource = dto.Order.SourceChannel;
                 dataOrder.CaseSourceCode = dto.Order.SourceChannelCode;
+                dataOrder.FullAddress= dto.Order.FullAddress;
                 await _dsOrderRepository.UpdateAsync(dataOrder, cancellationToken);
             }
             else
@@ -497,6 +501,7 @@ namespace DataSharing.Application.Receivers
                     ActualHandleTime = order.ActualHandleTime,
                     StartTime = order.StartTime,
                     CallId = order.CallId,
+                    FullAddress = order.FullAddress,
                     FileJson = _mapper.Map<List<FileJson>>(order.FileJson)
                 };
 
@@ -518,6 +523,7 @@ namespace DataSharing.Application.Receivers
                         dataOrderNew.ActualHandleTime = dto.Order.ActualHandleTime;
                         dataOrderNew.AllDuration = dto.Order.AllDuration;
                         dataOrderNew.ExpiredTime = dto.Order.ExpiredTime;
+                        dataOrderNew.FullAddress = dto.Order.FullAddress;
                         await _dsOrderRepository.UpdateAsync(dataOrderNew, cancellationToken);
                     }
                 }

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

@@ -85,7 +85,7 @@ namespace DataSharing.Host.Controllers.YiBin
             {
                 List<WriteOrderResponseDto> responseDtos = new()
                 {
-                    new WriteOrderResponseDto() { AcceptCode = "", AcceptPwd = "", msg = "密钥错误", Code = "-900" }
+                    new WriteOrderResponseDto() { AcceptCode = "", AcceptPwd = "", Msg = "密钥错误", Code = "-900" }
                 };
 
                 return OpenResponse.Ok(ConvergenceMediaDeResponse<List<WriteOrderResponseDto>>.Failed(responseDtos, "0", "密钥错误"));
@@ -97,7 +97,7 @@ namespace DataSharing.Host.Controllers.YiBin
             {
                 List<WriteOrderResponseDto> responseDtos = new()
                 {
-                    new WriteOrderResponseDto() { AcceptCode = "", AcceptPwd = "", msg = strResult, Code = "0" }
+                    new WriteOrderResponseDto() { AcceptCode = "", AcceptPwd = "", Msg = strResult, Code = "0" }
                 };
                 return OpenResponse.Ok(ConvergenceMediaDeResponse<List<WriteOrderResponseDto>>.Failed(responseDtos, "0", description: strResult));
             }
@@ -228,7 +228,7 @@ namespace DataSharing.Host.Controllers.YiBin
                 await _dsReceiveMediaDataRepository.UpdateAsync(dsReceiveMediaData, HttpContext.RequestAborted);
                 List<WriteOrderResponseDto> responseDtos = new()
                 {
-                    new WriteOrderResponseDto() { AcceptCode = result.result.no, AcceptPwd = result.result.password, msg = "写信成功", Code = "1" }
+                    new WriteOrderResponseDto() { AcceptCode = result.result.no, AcceptPwd = result.result.password, Msg = "写信成功", Code = "1" }
                 };
                 return OpenResponse.Ok(ConvergenceMediaDeResponse<List<WriteOrderResponseDto>>.Success(responseDtos, "您已成功提交数据!"));
             }
@@ -236,7 +236,7 @@ namespace DataSharing.Host.Controllers.YiBin
             {
                 List<WriteOrderResponseDto> responseDtos = new()
                 {
-                  new WriteOrderResponseDto() { AcceptCode = "", AcceptPwd = "", msg = "接口调用失败", Code = "0" }
+                  new WriteOrderResponseDto() { AcceptCode = "", AcceptPwd = "", Msg = "接口调用失败", Code = "0" }
                 };
                 return OpenResponse.Ok(ConvergenceMediaDeResponse<List<WriteOrderResponseDto>>.Failed(responseDtos, "0", description: "接口调用失败!"));
             }
@@ -656,10 +656,10 @@ namespace DataSharing.Host.Controllers.YiBin
                 case "5":
                     break;
                 case "6":
-                    dto.CType = "4";
+                    dto.CType = "6";
                     break;
                 default:
-                    dto.CType = "4";
+                    dto.CType = "6";
                     break;
             }
 
@@ -736,6 +736,200 @@ namespace DataSharing.Host.Controllers.YiBin
             return OpenResponse.Ok(ConvergenceMediaDeResponse<List<MediaArticleDetailsDto>>.Success(dataDto, "成功"));
         }
 
+        /// <summary>
+        ///  7.今日统计
+        /// </summary>
+        /// <param name="Code"></param>
+        /// <returns></returns>
+        [AllowAnonymous]
+        [HttpPost("GetDayCount")]
+        public async Task<OpenResponse> GetDayCount([FromForm] string Code)
+        {
+            //验证密钥
+            var accountDto = await _dsUserTokenInfoService.CheckAccountAsync(Code, HttpContext.RequestAborted);
+            if (accountDto is null || accountDto.IsCheckAccount == false)
+            {
+                List<ConvergenceMediaDeResponse<string>> convergenceMediaDes = new() {
+                new()
+                {
+                    msg = "密钥错误",
+                    code = "-900",
+                    data = ""
+                } };
+
+                return OpenResponse.Ok(ConvergenceMediaDeResponse<List<ConvergenceMediaDeResponse<string>>>.Failed(convergenceMediaDes, "0", "失败"));
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        ///  3.1、工单查询
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost("GetOrderDetailByFlowID")]
+        [AllowAnonymous]
+        public async Task<OpenResponse> GetOrderDetailByFlowID([FromForm] IYBReceiveDto dto)
+        {
+            //验证密钥
+            var accountDto = await _dsUserTokenInfoService.CheckAccountAsync(dto.Code, HttpContext.RequestAborted);
+            if (accountDto is null || accountDto.IsCheckAccount == false)
+            {
+                List<ConvergenceMediaDeResponse<string>> convergenceMediaDes = new() {
+                new()
+                {
+                    msg = "密钥错误",
+                    code = "-900",
+                    data = ""
+                } };
+
+                return OpenResponse.Ok(ConvergenceMediaDeResponse<List<ConvergenceMediaDeResponse<string>>>.Failed(convergenceMediaDes, "0", "失败"));
+            }
+
+            //验证数据
+            string strResult = dto.Validate();
+            if (!string.IsNullOrEmpty(strResult))
+                return OpenResponse.Ok(ConvergenceMediaDeResponse<List<ReturnData>>.Failed(ReturnData.ReturnDataInfo(strResult), "0", "失败"));
+
+            //查询数据
+            var items = await _dataOrderRepository
+             .Queryable()
+             .Where(p => p.OrderNo == dto.AcceptCode)
+             .Where(p => p.Id == dto.FlowID)
+              .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,
+                  PubDate = it.PublishDate
+              })
+              .ToListAsync();
+
+            if (items == null || items.Count == 0)
+                return OpenResponse.Ok(ConvergenceMediaDeResponse<List<ReturnData>>.Failed(ReturnData.ReturnDataInfo("编号、密码错误!"), "0", "失败"));
+            else
+                return OpenResponse.Ok(ConvergenceMediaDeResponse<IReadOnlyList<MediaOrderDetailDataDto>>.Success(_mapper.Map<IReadOnlyList<MediaOrderDetailDataDto>>(items), "成功"));
+
+        }
+
+        /// <summary>
+        ///  3.2、工单查询
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost("GetOrderDetailByFlowID2")]
+        [AllowAnonymous]
+        public async Task<OpenResponse> GetOrderDetailByFlowID2([FromForm] IYBReceiveBaseDto dto)
+        {
+            //验证密钥
+            var accountDto = await _dsUserTokenInfoService.CheckAccountAsync(dto.Code, HttpContext.RequestAborted);
+            if (accountDto is null || accountDto.IsCheckAccount == false)
+            {
+                List<ConvergenceMediaDeResponse<string>> convergenceMediaDes = new() {
+                new()
+                {
+                    msg = "密钥错误",
+                    code = "-900",
+                    data = ""
+                } };
+
+                return OpenResponse.Ok(ConvergenceMediaDeResponse<List<ConvergenceMediaDeResponse<string>>>.Failed(convergenceMediaDes, "0", "失败"));
+            }
+
+            //验证数据
+            string strResult = dto.Validate();
+            if (!string.IsNullOrEmpty(strResult))
+                return OpenResponse.Ok(ConvergenceMediaDeResponse<List<ReturnData>>.Failed(ReturnData.ReturnDataInfo(strResult), "0", "失败"));
+
+            //查询数据
+            var items = await _dataOrderRepository
+             .Queryable()
+             .Where(p => p.OrderNo == dto.AcceptCode)
+              .Select(it => new
+              {
+                  FlowID = it.Id,
+                  FlowCode = it.OrderNo,
+                  FlowTitle = it.Title,
+                  FlowAddDate = it.CaseDate,
+                  FlowPurTypeName = it.CaseType,
+                  FlowConTypeName = it.HotspotName,
+                  FlowRSFlagName = it.HandleState,
+                  FlowLKName = it.FromName,
+                  FlowContent = it.Content,
+                  Address = it.FullAddress
+              })
+              .ToListAsync();
+
+            if (items == null || items.Count == 0)
+                return OpenResponse.Ok(ConvergenceMediaDeResponse<List<ReturnData>>.Failed(ReturnData.ReturnDataInfo("编号、密码错误!"), "0", "失败"));
+            else
+                return OpenResponse.Ok(ConvergenceMediaDeResponse<IReadOnlyList<MediaOrderDetailDataDto>>.Success(_mapper.Map<IReadOnlyList<MediaOrderDetailDataDto>>(items), "成功"));
+
+        }
+
+        /// <summary>
+        /// 附件详情地址
+        /// </summary>
+        [HttpPost("GetFileAll")]
+        [AllowAnonymous]
+        public async Task<OpenResponse> GetFileAll([FromForm] IYBGetFilesDto dto)
+        {
+            //验证密钥
+            var accountDto = await _dsUserTokenInfoService.CheckAccountAsync(dto.Code, HttpContext.RequestAborted);
+            if (accountDto is null || accountDto.IsCheckAccount == false)
+            {
+                List<ConvergenceMediaDeResponse<string>> convergenceMediaDes = new() {
+                new()
+                {
+                    msg = "密钥错误",
+                    code = "-900",
+                    data = ""
+                } };
+
+                return OpenResponse.Ok(ConvergenceMediaDeResponse<List<ConvergenceMediaDeResponse<string>>>.Failed(convergenceMediaDes, "0", "失败"));
+            }
+
+            //验证数据
+            string strResult = dto.Validate();
+            if (!string.IsNullOrEmpty(strResult))
+                return OpenResponse.Ok(ConvergenceMediaDeResponse<List<ReturnData>>.Failed(ReturnData.ReturnDataInfo(strResult), "0", "失败"));
+
+            //查询数据
+            var data = await _dataOrderRepository.GetAsync(p => p.OrderId == dto.FlowID, HttpContext.RequestAborted);
+
+
+            if (data == null)
+                return OpenResponse.Ok(ConvergenceMediaDeResponse<List<ReturnData>>.Failed(ReturnData.ReturnDataInfo("编号错误!"), "0", "失败"));
+            else
+            {
+                var businessFile = _channelConfigurationManager.GetConfigurationBusinessFile();
+                var baseUrl = businessFile.BaseUrl.Remove(businessFile.BaseUrl.Length - 1);
+                List<GetFiles> getFiles = [];
+                if (data.FileJson != null && data.FileJson.Count > 0)
+                {
+                    foreach (var item in data.FileJson)
+                    {
+                        GetFiles files = new()
+                        {
+                            FileID = item.FileId,
+                            FileName = item.FileName + "." + item.FileType,
+                            FileContent = baseUrl + item.Path
+                        };
+                        getFiles.Add(files);
+                    }
+                }
+                return OpenResponse.Ok(ConvergenceMediaDeResponse<IReadOnlyList<GetFiles>>.Success(_mapper.Map<List<GetFiles>>(getFiles), "成功"));
+            }
+        }
+
         #region 私有方法-将文件转化为文件流
 
         /// <summary>

+ 1 - 1
src/DataSharing.Host/Controllers/YiBin/WllzYBController.cs

@@ -17,7 +17,7 @@ namespace DataSharing.Host.Controllers.YiBin
     /// <summary>
     /// 网络理政
     /// </summary>
-    public class WllzYBController : BaseDataController
+    public class WllzYBController : BaseController
     {
         private readonly IMapper _mapper;
         private readonly IMediator _mediator;

+ 3 - 3
src/DataSharing.Host/Controllers/YiBin/ZhYBController.cs

@@ -17,7 +17,7 @@ namespace DataSharing.Host.Controllers.YiBin
     /// <summary>
     /// 智慧宜宾
     /// </summary>
-    public class ZhYBController : BaseDataController
+    public class ZhYBController : BaseController
     {
         private readonly IMapper _mapper;
         private readonly IMediator _mediator;
@@ -218,8 +218,8 @@ namespace DataSharing.Host.Controllers.YiBin
 
             GetFlowDetailReturnDto getFlowDetailReturn = new()
             {
-                state = data.HandleState == "办理完成" ? "1" : "0",
-                content = data.ActualOpinion,
+                State = data.HandleState == "办理完成" ? "1" : "0",
+                Content = data.ActualOpinion,
                 AcceptName = data.ActualHandleOrgName,
                 AcceptUser = data.ActualHandlerName,
                 AcceptDate = data.ActualHandleTime

+ 1 - 1
src/DataSharing.Host/Controllers/YiBin/ZzptYBController.cs

@@ -17,7 +17,7 @@ namespace DataSharing.Host.Controllers.YiBin
     /// <summary>
     /// 综治平台
     /// </summary>
-    public class ZzptYBController : BaseDataController
+    public class ZzptYBController : BaseController
     {
         private readonly IMapper _mapper;
         private readonly IMediator _mediator;

+ 11 - 1
src/DataSharing.Share/Dtos/YiBin/ConvergenceMedia/GetNoticeReceiveDataDto.cs

@@ -1,4 +1,6 @@
-namespace DataSharing.Share.Dtos.YiBin.ConvergenceMedia
+using System.Text.Json.Serialization;
+
+namespace DataSharing.Share.Dtos.YiBin.ConvergenceMedia
 {
     /// <summary>
     /// 新闻列表
@@ -8,11 +10,13 @@
         /// <summary>
         /// 总页数
         /// </summary>
+        [JsonPropertyName("PageCount")]
         public int PageCount { get; set; } = 0;
 
         /// <summary>
         /// 数据
         /// </summary>
+        [JsonPropertyName("data")]
         public IReadOnlyList<GetNoticeReceiveDataListDto> data { get; set; }
     }
 
@@ -21,31 +25,37 @@
         /// <summary>
         /// 索引
         /// </summary>
+        [JsonPropertyName("Page")]
         public string Page { get; set; }
 
         /// <summary>
         /// 新闻ID标识
         /// </summary>
+        [JsonPropertyName("NoticeID")]
         public string NoticeID { get; set; }
 
         /// <summary>
         /// 新闻分类
         /// </summary>
+        [JsonPropertyName("NoticeTypeName")]
         public string NoticeTypeName { get; set; }
 
         /// <summary>
         /// 新闻标题
         /// </summary>
+        [JsonPropertyName("NoticeTitle")]
         public string NoticeTitle { get; set; }
 
         /// <summary>
         /// 发布部门
         /// </summary>
+        [JsonPropertyName("NoticeBMName")]
         public string NoticeBMName { get; set; }
 
         /// <summary>
         /// 发布时间
         /// </summary>
+        [JsonPropertyName("NoticeCreateDate")]
         public DateTime? NoticeCreateDate { get; set; }
     }
 }

+ 6 - 1
src/DataSharing.Share/Dtos/YiBin/ConvergenceMedia/GetOrderByRunDataDto.cs

@@ -1,20 +1,25 @@
-namespace DataSharing.Share.Dtos.YiBin.ConvergenceMedia
+using System.Text.Json.Serialization;
+
+namespace DataSharing.Share.Dtos.YiBin.ConvergenceMedia
 {
     public class GetOrderByRunDataDto
     {
         /// <summary>
         /// 办理部门
         /// </summary>
+        [JsonPropertyName("BMName")]
         public string BMName { get; set; }
 
         /// <summary>
         /// 到期时间
         /// </summary>
+        [JsonPropertyName("TTime")]
         public DateTime? TTime { get; set; }
 
         /// <summary>
         /// 办理时间
         /// </summary>
+        [JsonPropertyName("DisposeDate")]
         public DateTime? DisposeDate { get; set; }
     }
 }

+ 13 - 1
src/DataSharing.Share/Dtos/YiBin/ConvergenceMedia/GetOrderMediaDataDto.cs

@@ -1,4 +1,6 @@
-namespace DataSharing.Share.Dtos.YiBin.ConvergenceMedia
+using System.Text.Json.Serialization;
+
+namespace DataSharing.Share.Dtos.YiBin.ConvergenceMedia
 {
     /// <summary>
     /// 工单列表数据
@@ -8,11 +10,13 @@
         /// <summary>
         /// 总页数
         /// </summary>
+        [JsonPropertyName("PageCount")]
         public int PageCount { get; set; } = 0;
 
         /// <summary>
         /// 数据
         /// </summary>
+        [JsonPropertyName("data")]
         public IReadOnlyList<GetOrderMediaDataListDto> data { get; set; }
     }
 
@@ -24,41 +28,49 @@
         /// <summary>
         /// 索引
         /// </summary>
+        [JsonPropertyName("RowID")]
         public string RowID { get; set; }
 
         /// <summary>
         /// 标识
         /// </summary>
+        [JsonPropertyName("FlowID")]
         public string FlowID { get; set; }
 
         /// <summary>
         /// 工单编号
         /// </summary>
+        [JsonPropertyName("Code")]
         public string Code { get; set; }
 
         /// <summary>
         /// 工单标题
         /// </summary>
+        [JsonPropertyName("Title")]
         public string Title { get; set; }
 
         /// <summary>
         /// 保存时间
         /// </summary>
+        [JsonPropertyName("AddDate")]
         public string AddDate { get; set; }
 
         /// <summary>
         /// 工单来源
         /// </summary>
+        [JsonPropertyName("FromName")]
         public string FromName { get; set; }
 
         /// <summary>
         /// 受理类型
         /// </summary>
+        [JsonPropertyName("PurTypeName")]
         public string PurTypeName { get; set; }
 
         /// <summary>
         /// 办理状态
         /// </summary>
+        [JsonPropertyName("ResultState")]
         public string ResultState { get; set; }
     }
 }

+ 5 - 1
src/DataSharing.Share/Dtos/YiBin/ConvergenceMedia/GetPurTypeReportDataDto.cs

@@ -1,15 +1,19 @@
-namespace DataSharing.Share.Dtos.YiBin.ConvergenceMedia
+using System.Text.Json.Serialization;
+
+namespace DataSharing.Share.Dtos.YiBin.ConvergenceMedia
 {
     public class GetPurTypeReportDataDto
     {
         /// <summary>
         /// 受理分类名称
         /// </summary>
+        [JsonPropertyName("PurTypeName")]
         public string PurTypeName { get; set; }
 
         /// <summary>
         /// 总数
         /// </summary>
+        [JsonPropertyName("Count")]
         public int Count { get; set; }
     }
 }

+ 10 - 1
src/DataSharing.Share/Dtos/YiBin/ConvergenceMedia/MediaArticleDetailsDto.cs

@@ -1,40 +1,49 @@
-namespace DataSharing.Share.Dtos.YiBin.ConvergenceMedia
+using System.Text.Json.Serialization;
+
+namespace DataSharing.Share.Dtos.YiBin.ConvergenceMedia
 {
     public class MediaArticleDetailsDto
     {
         /// <summary>
         /// 公告ID
         /// </summary>
+        [JsonPropertyName("NoticeID")]
         public string NoticeID { get; set; }
 
         /// <summary>
         /// 分类名称
         /// </summary>
+        [JsonPropertyName("NoticeTypeName")]
         public string NoticeTypeName { get; set; }
 
         /// <summary>
         /// 标题
         /// </summary>
+        [JsonPropertyName("NoticeTitle")]
         public string NoticeTitle { get; set; }
 
         /// <summary>
         /// 发布部门
         /// </summary>
+        [JsonPropertyName("NoticeBMName")]
         public string NoticeBMName { get; set; }
 
         /// <summary>
         /// 创建时间
         /// </summary>
+        [JsonPropertyName("NoticeCreateDate")]
         public DateTime? NoticeCreateDate { get; set; }
 
         /// <summary>
         /// 阅读次数
         /// </summary>
+        [JsonPropertyName("NoticeRCount")]
         public int NoticeRCount { get; set; }
 
         /// <summary>
         /// 内容
         /// </summary>
+        [JsonPropertyName("NoticeContent")]
         public string NoticeContent { get; set; }
     }
 }

+ 39 - 1
src/DataSharing.Share/Dtos/YiBin/ConvergenceMedia/MediaOrderDetailDataDto.cs

@@ -1,70 +1,108 @@
-namespace DataSharing.Share.Dtos.YiBin.ConvergenceMedia
+using System.Text.Json.Serialization;
+
+namespace DataSharing.Share.Dtos.YiBin.ConvergenceMedia
 {
     public class MediaOrderDetailDataDto
     {
         /// <summary>
         /// 标识
         /// </summary>
+        [JsonPropertyName("FlowID")]
         public string FlowID { get; set; }
 
         /// <summary>
         /// 工单编号
         /// </summary>
+        [JsonPropertyName("FlowCode")]
         public string FlowCode { get; set; }
 
         /// <summary>
         /// 工单标题
         /// </summary>
+        [JsonPropertyName("FlowTitle")]
         public string FlowTitle { get; set; }
 
         /// <summary>
         /// 工单来源
         /// </summary>
+        [JsonPropertyName("FlowFromName")]
         public string FlowFromName { get; set; }
 
         /// <summary>
         /// 受理类型
         /// </summary>
+        [JsonPropertyName("FlowPurTypeName")]
         public string FlowPurTypeName { get; set; }
 
         /// <summary>
         /// 热点类型
         /// </summary>
+        [JsonPropertyName("FlowConTypeName")]
         public string FlowConTypeName { get; set; }
 
         /// <summary>
         /// 保存时间
         /// </summary>
+        [JsonPropertyName("FlowAddDate")]
         public string FlowAddDate { get; set; }
 
         /// <summary>
         /// 联系人
         /// </summary>
+        [JsonPropertyName("FlowLKName")]
         public string FlowLKName { get; set; }
 
         /// <summary>
         /// 办理部门
         /// </summary>
+        [JsonPropertyName("FlowBMName")]
         public string FlowBMName { get; set; }
 
         /// <summary>
         /// 办理状态
         /// </summary>
+        [JsonPropertyName("FlowRSFlagName")]
         public string FlowRSFlagName { get; set; }
 
         /// <summary>
         /// 受理内容
         /// </summary>
+        [JsonPropertyName("FlowContent")]
         public string FlowContent { get; set; }
 
         /// <summary>
         /// 处理结果
         /// </summary>
+        [JsonPropertyName("FlowResultg")]
         public string FlowResultg { get; set; }
+
+        /// <summary>
+        /// 发布时间
+        /// </summary>
+        [JsonPropertyName("PubDate")]
+        public DateTime? PubDate { get; set; }
+
+        /// <summary>
+        /// 受理地址
+        /// </summary>
+        [JsonPropertyName("Address")]
+        public string? Address { get; set; }
     }
 
     public class MediaOrderDetailDataDtoList
     {
         public IReadOnlyList<MediaOrderDetailDataDto> Data { get; set; }
     }
+
+    public class GetFiles
+    {
+        [JsonPropertyName("FileID")]
+        public string? FileID { get; set; }
+
+        [JsonPropertyName("FileName")]
+        public string? FileName { get; set; }
+
+        [JsonPropertyName("fileContent")]
+        public string? FileContent { get; set; }
+    }
 }

+ 45 - 0
src/DataSharing.Share/Dtos/YiBin/ConvergenceMedia/MediaOrderDetailReceiveDto.cs

@@ -23,4 +23,49 @@
         [VRequired]
         public string AcceptPwd { get; set; }
     }
+
+    public class IYBReceiveBaseDto
+    {
+        /// <summary>
+        /// 密钥
+        /// </summary>
+        [MDisplayName("密钥")]
+        [VRequired]
+        public string Code { get; set; }
+
+        /// <summary>
+        /// 工单编号
+        /// </summary>
+        [MDisplayName("工单编号")]
+        [VRequired]
+        public string AcceptCode { get; set; }
+    }
+
+    public class IYBReceiveDto: IYBReceiveBaseDto
+    {
+        /// <summary>
+        /// 工单ID
+        /// </summary>
+        [MDisplayName("工单ID")]
+        [VRequired]
+        public string FlowID { get; set; }
+
+    }
+
+    public class IYBGetFilesDto
+    {
+        /// <summary>
+        /// 密钥
+        /// </summary>
+        [MDisplayName("密钥")]
+        [VRequired]
+        public string Code { get; set; }
+
+        /// <summary>
+        /// 工单ID
+        /// </summary>
+        [MDisplayName("工单ID")]
+        [VRequired]
+        public string FlowID { get; set; }
+    }
 }

+ 8 - 2
src/DataSharing.Share/Dtos/YiBin/ConvergenceMedia/WriteOrderResponseDto.cs

@@ -1,25 +1,31 @@
-namespace DataSharing.Share.Dtos.YiBin.ConvergenceMedia
+using System.Text.Json.Serialization;
+
+namespace DataSharing.Share.Dtos.YiBin.ConvergenceMedia
 {
     public class WriteOrderResponseDto
     {
         /// <summary>
         /// 状态
         /// </summary>
+        [JsonPropertyName("Code")]
         public string Code { get; set; }
 
         /// <summary>
         /// 消息
         /// </summary>
-        public string msg { get; set; }
+        [JsonPropertyName("msg")]
+        public string Msg { get; set; }
 
         /// <summary>
         /// 受理编号
         /// </summary>
+        [JsonPropertyName("AcceptCode")]
         public string AcceptCode { get; set; }
 
         /// <summary>
         /// 受理密码
         /// </summary>
+        [JsonPropertyName("AcceptPwd")]
         public string AcceptPwd { get; set; }
     }
 }

+ 25 - 3
src/DataSharing.Share/Dtos/YiBin/ZzptPlatformsYB/AcceptTypeListDto.cs

@@ -1,15 +1,19 @@
-namespace DataSharing.Share.Dtos.YiBin.ZzptPlatformsYB
+using System.Text.Json.Serialization;
+
+namespace DataSharing.Share.Dtos.YiBin.ZzptPlatformsYB
 {
     public class AcceptTypeListDto
     {
         /// <summary>
         /// 
         /// </summary>
+        [JsonPropertyName("Name")]
         public string Name { get; set; }
 
         /// <summary>
         /// 
         /// </summary>
+        [JsonPropertyName("Value")]
         public string Value { get; set; }
     }
 
@@ -18,8 +22,10 @@
     /// </summary>
     public class WriteInfoReturnDto
     {
+        [JsonPropertyName("LetterCode")]
         public string LetterCode { get; set; }
 
+        [JsonPropertyName("LetterPwd")]
         public string LetterPwd { get; set; }
     }
 
@@ -31,31 +37,37 @@
         /// <summary>
         /// 办理部门
         /// </summary>
+        [JsonPropertyName("AcceptName")]
         public string AcceptName { get; set; }
 
         /// <summary>
         /// 办理人
         /// </summary>
+        [JsonPropertyName("AcceptUser")]
         public string AcceptUser { get; set; }
 
         /// <summary>
         /// 办理意见
         /// </summary>
+        [JsonPropertyName("AcceptContent")]
         public string AcceptContent { get; set; }
 
         /// <summary>
         /// 办理状态
         /// </summary>
+        [JsonPropertyName("AcceptState")]
         public string AcceptState { get; set; }
 
         /// <summary>
         /// 办理时间
         /// </summary>
+        [JsonPropertyName("AcceptDate")]
         public string AcceptDate { get; set; }
 
         /// <summary>
         /// 是否完结
         /// </summary>
+        [JsonPropertyName("AcceptEnd")]
         public string AcceptEnd { get; set; }
     }
 
@@ -67,26 +79,31 @@
         /// <summary>
         /// 办理状态 0办理中  1已完成
         /// </summary>
-        public string state { get; set; }
+        [JsonPropertyName("state")]
+        public string State { get; set; }
 
         /// <summary>
         /// 办理结果内容
         /// </summary>
-        public string content { get; set; }
+        [JsonPropertyName("content")]
+        public string Content { get; set; }
 
         /// <summary>
         /// 办理部门
         /// </summary>
+        [JsonPropertyName("AcceptName")]
         public string AcceptName { get; set; }
 
         /// <summary>
         /// 办理用户
         /// </summary>
+        [JsonPropertyName("AcceptUser")]
         public string AcceptUser { get; set; }
 
         /// <summary>
         /// 办理时间
         /// </summary>
+        [JsonPropertyName("AcceptDate")]
         public DateTime? AcceptDate { get; set; }
     }
 
@@ -98,26 +115,31 @@
         /// <summary>
         /// 工单编号
         /// </summary>
+        [JsonPropertyName("Code")]
         public string Code { get; set; }
 
         /// <summary>
         /// 办理状态
         /// </summary>
+        [JsonPropertyName("State")]
         public string State { get; set; }
 
         /// <summary>
         /// 办理结果
         /// </summary>
+        [JsonPropertyName("Ccontent")]
         public string Ccontent { get; set; }
 
         /// <summary>
         /// 办理部门
         /// </summary>
+        [JsonPropertyName("AcceptName")]
         public string AcceptName { get; set; }
 
         /// <summary>
         /// 办理时间
         /// </summary>
+        [JsonPropertyName("AcceptDate")]
         public string AcceptDate { get; set; }
     }
 }

+ 6 - 1
src/DataSharing/RawData/DsOrder.cs

@@ -244,9 +244,14 @@ namespace DataSharing.RawData
         public EVisitTypeState VisitTypeState { get; set; } = EVisitTypeState.UnVisit;
 
         /// <summary>
-        /// 附件
+        /// 受理地址
         /// </summary>
+        [SugarColumn(ColumnDescription = "受理地址", IsNullable = true)]
+        public string? FullAddress { get; set; }
 
+        /// <summary>
+        /// 附件
+        /// </summary>
         [SugarColumn(ColumnDataType = "json", IsJson = true, IsNullable = true)]
         public List<Hotline.Share.Dtos.File.FileJson>? FileJson { get; set; }