Merge branch 'master' of http://110.188.24.182:10023/Fengwo/hotline

src/Hotline.Api/Controllers/DataSharing/ProvinceController.cs

@@ -26,20 +26,7 @@ namespace Hotline.Api.Controllers.DataSharing
     {
         #region 注入
         private readonly IMapper _mapper;
-        private readonly ICapPublisher _capPublisher;
         private readonly IMediator _mediator;
-        private readonly IRepository<DsReceiveCaseInfo> _receiveCaseInfoRepository;
-        private readonly IRepository<DsGetCaseBackResult> _getCaseBackResultRepository;
-        private readonly IRepository<DsDelayCaseResult> _delayCaseResultRepository;
-        private readonly IRepository<DsSupplyCaseInfo> _supplyCaseInfoRepository;
-        private readonly IRepository<DsRevokeCaseInfo> _revokeCaseInfoRepository;
-        private readonly IRepository<DsRemindCaseInfo> _remindCaseInfoRepository;
-        private readonly IRepository<DsSendWarnInfo> _sendWarnInfoRepository;
-        private readonly IRepository<DsSendSuperviseInfo> _sendSuperviseInfoRepository;
-        private readonly IRepository<DsScreenCaseResultReceive> _screenCaseResultReceiveRepository;
-        private readonly IRepository<DsSendCaseEvlResult> _sendCaseEvlResultRepository;
-        private readonly IRepository<DsGetCaseReultSend> _getCaseReultSendRepository;
-        private readonly IRepository<DsGetVisitInfoSend> _getVisitInfoSendRepository;
         private readonly IRepository<DsFormEnvironMent> _formEnvironMentRepository;
         private readonly IRepository<DsFormTraffic> _formTrafficRepository;
         private readonly IRepository<DsFormExpressWay> _formExpressWayRepository;
@@ -55,27 +42,14 @@ namespace Hotline.Api.Controllers.DataSharing
         private readonly IRepository<DsSendCaseInfo> _sendCaseInfoRepository;
         private readonly IRepository<DsGetCaseBackApply> _getCaseBackApplyRepository;
         private readonly IChannelConfigurationManager _channelConfigurationManager;
-        private readonly IHttpClientFactory _httpClientFactory;
+        private readonly IRepository<DsReceiveProvinceData> _dsReceiveProvinceDataRepository;
 
 
         /// <summary>
         /// 
         /// </summary>
         /// <param name="mapper"></param>
-        /// <param name="capPublisher"></param>
         /// <param name="mediator"></param>
-        /// <param name="receiveCaseInfoRepository"></param>
-        /// <param name="getCaseBackResultRepository"></param>
-        /// <param name="delayCaseResultRepository"></param>
-        /// <param name="supplyCaseInfoRepository"></param>
-        /// <param name="revokeCaseInfoRepository"></param>
-        /// <param name="remindCaseInfoRepository"></param>
-        /// <param name="sendWarnInfoRepository"></param>
-        /// <param name="sendSuperviseInfoRepository"></param>
-        /// <param name="screenCaseResultReceiveRepository"></param>
-        /// <param name="sendCaseEvlResultRepository"></param>
-        /// <param name="getCaseReultSendRepository"></param>
-        /// <param name="getVisitInfoSendRepository"></param>
         /// <param name="formEnvironMentRepository"></param>
         /// <param name="formTrafficRepository"></param>
         /// <param name="formExpressWayRepository"></param>
@@ -91,21 +65,9 @@ namespace Hotline.Api.Controllers.DataSharing
         /// <param name="sendCaseInfoRepository"></param>
         /// <param name="getCaseBackApplyRepository"></param>
         /// <param name="channelConfigurationManager"></param>
+        /// <param name="dsReceiveProvinceDataRepository"></param>
         public ProvinceController(IMapper mapper,
-          ICapPublisher capPublisher,
            IMediator mediator,
-          IRepository<DsReceiveCaseInfo> receiveCaseInfoRepository,
-          IRepository<DsGetCaseBackResult> getCaseBackResultRepository,
-          IRepository<DsDelayCaseResult> delayCaseResultRepository,
-          IRepository<DsSupplyCaseInfo> supplyCaseInfoRepository,
-          IRepository<DsRevokeCaseInfo> revokeCaseInfoRepository,
-          IRepository<DsRemindCaseInfo> remindCaseInfoRepository,
-          IRepository<DsSendWarnInfo> sendWarnInfoRepository,
-          IRepository<DsSendSuperviseInfo> sendSuperviseInfoRepository,
-          IRepository<DsScreenCaseResultReceive> screenCaseResultReceiveRepository,
-          IRepository<DsSendCaseEvlResult> sendCaseEvlResultRepository,
-          IRepository<DsGetCaseReultSend> getCaseReultSendRepository,
-          IRepository<DsGetVisitInfoSend> getVisitInfoSendRepository,
           IRepository<DsFormEnvironMent> formEnvironMentRepository,
           IRepository<DsFormTraffic> formTrafficRepository,
           IRepository<DsFormExpressWay> formExpressWayRepository,
@@ -121,23 +83,10 @@ namespace Hotline.Api.Controllers.DataSharing
           IRepository<DsSendCaseInfo> sendCaseInfoRepository,
           IRepository<DsGetCaseBackApply> getCaseBackApplyRepository,
           IChannelConfigurationManager channelConfigurationManager,
-          IHttpClientFactory httpClientFactory)
+         IRepository<DsReceiveProvinceData> dsReceiveProvinceDataRepository)
         {
             _mapper = mapper;
-            _capPublisher = capPublisher;
             _mediator = mediator;
-            _receiveCaseInfoRepository = receiveCaseInfoRepository;
-            _getCaseBackResultRepository = getCaseBackResultRepository;
-            _delayCaseResultRepository = delayCaseResultRepository;
-            _supplyCaseInfoRepository = supplyCaseInfoRepository;
-            _revokeCaseInfoRepository = revokeCaseInfoRepository;
-            _remindCaseInfoRepository = remindCaseInfoRepository;
-            _sendWarnInfoRepository = sendWarnInfoRepository;
-            _sendSuperviseInfoRepository = sendSuperviseInfoRepository;
-            _screenCaseResultReceiveRepository = screenCaseResultReceiveRepository;
-            _sendCaseEvlResultRepository = sendCaseEvlResultRepository;
-            _getCaseReultSendRepository = getCaseReultSendRepository;
-            _getVisitInfoSendRepository = getVisitInfoSendRepository;
             _formEnvironMentRepository = formEnvironMentRepository;
             _formTrafficRepository = formTrafficRepository;
             _formExpressWayRepository = formExpressWayRepository;
@@ -153,7 +102,7 @@ namespace Hotline.Api.Controllers.DataSharing
             _sendCaseInfoRepository = sendCaseInfoRepository;
             _getCaseBackApplyRepository = getCaseBackApplyRepository;
             _channelConfigurationManager = channelConfigurationManager;
-            _httpClientFactory = httpClientFactory;
+            _dsReceiveProvinceDataRepository = dsReceiveProvinceDataRepository;
         }
         #endregion
 
@@ -178,10 +127,8 @@ namespace Hotline.Api.Controllers.DataSharing
                 return OpenResponse.Ok(Reponse.Failed(strResult));
 
             //转换数据
-            var dto = _mapper.Map<DsReceiveCaseInfo>(receiveCaseInfo.paras);
-
-            //添加数据
-            var id = await _receiveCaseInfoRepository.AddAsync(dto, HttpContext.RequestAborted);
+            var dto = receiveCaseInfo.paras;
+            var id = await InitReceiveProvinceData(dto.CaseSerial, dto.CliengGuid, "receive_case_info", System.Text.Json.JsonSerializer.Serialize(dto));
 
             //处理组装数据，推送数据
             var data = _mapper.Map<AddOrderDto>(dto);
@@ -252,9 +199,6 @@ namespace Hotline.Api.Controllers.DataSharing
                 var result = await _mediator.Send(new ReceiveOrderNotify { AddOrderDto = data }, HttpContext.RequestAborted);
                 if (result != null && !string.IsNullOrEmpty(result.Id))
                 {
-                    dto.Id = id;
-                    dto.OrderId = result.Id;
-                    await _receiveCaseInfoRepository.UpdateAsync(dto, HttpContext.RequestAborted);
                     return OpenResponse.Ok(Reponse.Success("您已成功提交数据！"));
                 }
                 else
@@ -283,14 +227,14 @@ namespace Hotline.Api.Controllers.DataSharing
                 OpenResponse.Ok(Reponse.Failed(strResult));
 
             //转换数据
-            var dto = _mapper.Map<DsGetCaseBackResult>(receiveBackResult.paras);
+            var dto = receiveBackResult.paras;
 
             var data = await _getCaseBackApplyRepository.GetAsync(p => p.CaseSerial == dto.CaseSerial, HttpContext.RequestAborted);
             if (data == null)
                 return OpenResponse.Ok(Reponse.Failed("接口调用失败！"));
 
             //添加数据
-            var id = await _getCaseBackResultRepository.AddAsync(dto, HttpContext.RequestAborted);
+            var id = await InitReceiveProvinceData(dto.CaseSerial, dto.CliengGuid, "get_case_back_result", System.Text.Json.JsonSerializer.Serialize(dto));
 
             if (!string.IsNullOrEmpty(id))
             {
@@ -300,7 +244,7 @@ namespace Hotline.Api.Controllers.DataSharing
                     {
                         Id = data.OrderSendBackId,
                         Reason = dto.BackReason,
-                        Result = dto.Result == true ? 1 : 0
+                        Result = dto.Result == "1" ? 1 : 0
                     }
                 }, HttpContext.RequestAborted);
                 return OpenResponse.Ok(Reponse.Success("您已成功提交数据！"));
@@ -327,11 +271,10 @@ namespace Hotline.Api.Controllers.DataSharing
                 return OpenResponse.Ok(Reponse.Failed(strResult));
 
             //转换数据
-            var dto = _mapper.Map<DsSendSuperviseInfo>(receiveSendSuperviseInfo.paras);
+            var dto = receiveSendSuperviseInfo.paras;
 
             //添加数据
-            var id = await _sendSuperviseInfoRepository.AddAsync(dto, HttpContext.RequestAborted);
-
+            var id = await InitReceiveProvinceData(dto.CaseSerial, dto.CliengGuid, "send_supervise_info", System.Text.Json.JsonSerializer.Serialize(dto));
             if (!string.IsNullOrEmpty(id))
             {
                 //向业务系统推送消息
@@ -361,10 +304,10 @@ namespace Hotline.Api.Controllers.DataSharing
                 return OpenResponse.Ok(Reponse.Failed(strResult));
 
             //转换数据
-            var dto = _mapper.Map<DsRemindCaseInfo>(receiveRemindCaseInfo.paras);
-            dto.Direction = "2";
+            var dto = receiveRemindCaseInfo.paras;
             //添加数据
-            var id = await _remindCaseInfoRepository.AddAsync(dto, HttpContext.RequestAborted);
+            var id = await InitReceiveProvinceData(dto.CaseSerial, dto.CliengGuid, "remind_case_info", System.Text.Json.JsonSerializer.Serialize(dto));
+            //  var id = await _remindCaseInfoRepository.AddAsync(dto, HttpContext.RequestAborted);
 
             if (!string.IsNullOrEmpty(id))
             {
@@ -395,10 +338,10 @@ namespace Hotline.Api.Controllers.DataSharing
                 return OpenResponse.Ok(Reponse.Failed(strResult));
 
             //转换数据
-            var dto = _mapper.Map<DsScreenCaseResultReceive>(receiveScreenCaseResultReceive.paras);
+            var dto = receiveScreenCaseResultReceive.paras;
 
             //添加数据
-            var id = await _screenCaseResultReceiveRepository.AddAsync(dto, HttpContext.RequestAborted);
+            var id = await InitReceiveProvinceData(dto.CaseSerial, dto.CliengGuid, "screen_case_result_receive", System.Text.Json.JsonSerializer.Serialize(dto));
 
             if (!string.IsNullOrEmpty(id))
             {
@@ -428,10 +371,10 @@ namespace Hotline.Api.Controllers.DataSharing
                 return OpenResponse.Ok(Reponse.Failed(strResult));
 
             //转换数据
-            var dto = _mapper.Map<DsDelayCaseResult>(receiveDelayCaseResult.paras);
+            var dto = receiveDelayCaseResult.paras;
 
             //添加数据
-            var id = await _delayCaseResultRepository.AddAsync(dto, HttpContext.RequestAborted);
+            var id = await InitReceiveProvinceData(dto.CaseSerial, dto.CliengGuid, "delay_case_result_receive", System.Text.Json.JsonSerializer.Serialize(dto));
 
             if (!string.IsNullOrEmpty(id))
             {
@@ -461,11 +404,10 @@ namespace Hotline.Api.Controllers.DataSharing
                 return OpenResponse.Ok(Reponse.Failed(strResult));
 
             //转换数据
-            var dto = _mapper.Map<DsSupplyCaseInfo>(receiveSupplyCaseInfo.paras);
+            var dto = receiveSupplyCaseInfo.paras;
 
             //添加数据
-            var id = await _supplyCaseInfoRepository.AddAsync(dto, HttpContext.RequestAborted);
-
+            var id = await InitReceiveProvinceData(dto.CaseSerial, dto.CliengGuid, "supply_case_info_receive", System.Text.Json.JsonSerializer.Serialize(dto));
 
             if (!string.IsNullOrEmpty(id))
             {
@@ -496,10 +438,9 @@ namespace Hotline.Api.Controllers.DataSharing
                 return OpenResponse.Ok(Reponse.Failed(strResult));
 
             //转换数据
-            var dto = _mapper.Map<DsRevokeCaseInfo>(receiveRevokeCaseInfo.paras);
-            dto.Direction = "2";
+            var dto = receiveRevokeCaseInfo.paras;
             //添加数据
-            var id = await _revokeCaseInfoRepository.AddAsync(dto, HttpContext.RequestAborted);
+            var id = await InitReceiveProvinceData(dto.CaseSerial, dto.CliengGuid, "revoke_case_info", System.Text.Json.JsonSerializer.Serialize(dto));
 
             if (!string.IsNullOrEmpty(id))
             {
@@ -529,10 +470,10 @@ namespace Hotline.Api.Controllers.DataSharing
                 return OpenResponse.Ok(Reponse.Failed(strResult));
 
             //转换数据
-            var dto = _mapper.Map<DsSendWarnInfo>(receiveSendWarnInfo.paras);
+            var dto =receiveSendWarnInfo.paras;
 
             //添加数据
-            var id = await _sendWarnInfoRepository.AddAsync(dto, HttpContext.RequestAborted);
+            var id = await InitReceiveProvinceData(dto.CaseSerial, null, "send_warn_info", System.Text.Json.JsonSerializer.Serialize(dto));
 
             if (!string.IsNullOrEmpty(id))
             {
@@ -562,10 +503,10 @@ namespace Hotline.Api.Controllers.DataSharing
                 return OpenResponse.Ok(Reponse.Failed(strResult));
 
             //转换数据
-            var dto = _mapper.Map<DsSendCaseEvlResult>(receiveSendCaseEvlResult.paras);
+            var dto = receiveSendCaseEvlResult.paras;
 
             //添加数据
-            var id = await _sendCaseEvlResultRepository.AddAsync(dto, HttpContext.RequestAborted);
+            var id = await InitReceiveProvinceData(dto.CaseSerial, null, "send_case_evl_result", System.Text.Json.JsonSerializer.Serialize(dto));
 
             if (!string.IsNullOrEmpty(id))
             {
@@ -595,10 +536,10 @@ namespace Hotline.Api.Controllers.DataSharing
                 return OpenResponse.Ok(Reponse.Failed(strResult));
 
             //转换数据
-            var dto = _mapper.Map<DsGetCaseReultSend>(receiveGetCaseReultSend.paras);
+            var dto =receiveGetCaseReultSend.paras;
 
             //添加数据
-            var id = await _getCaseReultSendRepository.AddAsync(dto, HttpContext.RequestAborted);
+            var id = await InitReceiveProvinceData(dto.CaseSerial, dto.CliengGuid, "get_case_result_send", System.Text.Json.JsonSerializer.Serialize(dto));
 
             if (!string.IsNullOrEmpty(id))
             {
@@ -637,10 +578,10 @@ namespace Hotline.Api.Controllers.DataSharing
                 return OpenResponse.Ok(Reponse.Failed(strResult));
 
             //转换数据
-            var dto = _mapper.Map<DsGetVisitInfoSend>(receiveGetVisitInfoSend.paras);
+            var dto = receiveGetVisitInfoSend.paras;
 
             //添加数据
-            var id = await _getVisitInfoSendRepository.AddAsync(dto, HttpContext.RequestAborted);
+            var id = await InitReceiveProvinceData(dto.CaseSerial, dto.CliengGuid, "get_visit_info_send", System.Text.Json.JsonSerializer.Serialize(dto));
 
             if (!string.IsNullOrEmpty(id))
             {
@@ -671,18 +612,8 @@ namespace Hotline.Api.Controllers.DataSharing
                 return OpenResponse.Ok(Reponse.Failed(strResult));
 
             var data = receiveCaseExtendsRequest.paras;
-
-            //扩展主表信息
-            DsReceiveCaseExtends receiveCaseExtends = new()
-            {
-                CaseSerial = data.CaseSerial,
-                FormType = data.FormType,
-                SyncState = "1",
-                Direction = "2"
-            };
-            var id = await _receiveCaseExtendsRepository.AddAsync(receiveCaseExtends, HttpContext.RequestAborted);
-            if (!string.IsNullOrEmpty(id))
-                return OpenResponse.Ok(Reponse.Failed("数据提交失败"));
+            //添加数据
+            var id = await InitReceiveProvinceData(data.CaseSerial, null, "receive_case_extends", System.Text.Json.JsonSerializer.Serialize(data));
 
             OrderExtensionDto orderExtension = new()
             {
@@ -694,92 +625,52 @@ namespace Hotline.Api.Controllers.DataSharing
             {
                 case "yl"://医疗表单
                     //转换数据
-                    var dtoyl = _mapper.Map<DsFormMedical>(data.FormMedical);
-                    dtoyl.RCEId = id;
-                    //添加数据
-                    await _formMedicalRepository.AddAsync(dtoyl, HttpContext.RequestAborted);
-                    orderExtension = _mapper.Map<OrderExtensionDto>(dtoyl);
+                    orderExtension = _mapper.Map<OrderExtensionDto>(data.FormMedical);
                     orderExtension.OrderType = "医疗服务中心受理单";
                     break;
                 case "zwfw"://四川政务服务网技术工单
                     //转换数据
-                    var dtozwfw = _mapper.Map<DsFormNetWorktec>(data.FormNetWorktec);
-                    dtozwfw.RCEId = id;
-                    //添加数据
-                    await _formNetWorktecRepository.AddAsync(dtozwfw, HttpContext.RequestAborted);
-                    orderExtension = _mapper.Map<OrderExtensionDto>(dtozwfw);
+                    orderExtension = _mapper.Map<OrderExtensionDto>(data.FormNetWorktec);
                     orderExtension.OrderType = "四川政务服务网技术中心受理单";
                     break;
                 case "th"://电视购物及商铺购买退换货工单
                     //转换数据
-                    var dtoth = _mapper.Map<DsFormReturnexChange>(data.FormReturnexChange);
-                    dtoth.RCEId = id;
-                    //添加数据
-                    await _formReturnexChangeRepository.AddAsync(dtoth, HttpContext.RequestAborted);
-                    orderExtension = _mapper.Map<OrderExtensionDto>(dtoth);
+                    orderExtension = _mapper.Map<OrderExtensionDto>(data.FormReturnexChange);
                     orderExtension.OrderType = "电视购物及商铺购买退换货中心受理单";
                     break;
                 case "gsgl"://高速公路工单
                     //转换数据
-                    var dtogsgl = _mapper.Map<DsFormExpressWay>(data.FormExpressWay);
-                    dtogsgl.RCEId = id;
-                    //添加数据
-                    await _formExpressWayRepository.AddAsync(dtogsgl, HttpContext.RequestAborted);
-                    orderExtension = _mapper.Map<OrderExtensionDto>(dtogsgl);
+                    orderExtension = _mapper.Map<OrderExtensionDto>(data.FormExpressWay);
                     orderExtension.OrderType = "高速公路投诉中心受理单";
                     break;
                 case "xjgg"://电视台虚假广告工单
                     //转换数据
-                    var dtoxjgg = _mapper.Map<DsFormShamPub>(data.FormShamPub);
-                    dtoxjgg.RCEId = id;
-                    //添加数据
-                    await _formShamPubRepository.AddAsync(dtoxjgg, HttpContext.RequestAborted);
-                    orderExtension = _mapper.Map<OrderExtensionDto>(dtoxjgg);
+                    orderExtension = _mapper.Map<OrderExtensionDto>(data.FormShamPub);
                     orderExtension.OrderType = "电视台虚假广告中心受理单";
                     break;
                 case "swfwsq"://12366热线诉求交办
                     //转换数据
-                    var dtoswfwsq = _mapper.Map<DsFormTaxationComplaint>(data.FormTaxationComplaint);
-                    dtoswfwsq.RCEId = id;
-                    //添加数据
-                    await _formTaxationComplaintRepository.AddAsync(dtoswfwsq, HttpContext.RequestAborted);
-                    orderExtension = _mapper.Map<OrderExtensionDto>(dtoswfwsq);
+                    orderExtension = _mapper.Map<OrderExtensionDto>(data.FormTaxationComplaint);
                     orderExtension.OrderType = "四川省12366热线诉求交办单";
                     break;
                 case "swfwzx"://12366热线咨询交办
                     //转换数据
-                    var dtoswfwzx = _mapper.Map<DsFormTaxationConsulting>(data.FormTaxationConsulting);
-                    dtoswfwzx.RCEId = id;
-                    //添加数据
-                    await _formTaxationConsultingRepository.AddAsync(dtoswfwzx, HttpContext.RequestAborted);
-                    orderExtension = _mapper.Map<OrderExtensionDto>(dtoswfwzx);
+                    orderExtension = _mapper.Map<OrderExtensionDto>(data.FormTaxationConsulting);
                     orderExtension.OrderType = "四川省12366热线咨询交办单";
                     break;
                 case "jtfwjd"://12328服务监督
                     //转换数据
-                    var dtojtfwjd = _mapper.Map<DsFormTraffic>(data.FormTraffic);
-                    dtojtfwjd.RCEId = id;
-                    //添加数据
-                    await _formTrafficRepository.AddAsync(dtojtfwjd, HttpContext.RequestAborted);
-                    orderExtension = _mapper.Map<OrderExtensionDto>(dtojtfwjd);
+                    orderExtension = _mapper.Map<OrderExtensionDto>(data.FormTraffic);
                     orderExtension.OrderType = "12328服务监督中心受理单";
                     break;
                 case "yzxf"://邮政业消费者申诉
                     //转换数据
-                    var dtoyzxf = _mapper.Map<DsFormPost>(data.FormPost);
-                    dtoyzxf.RCEId = id;
-                    //添加数据
-                    await _formPostRepository.AddAsync(dtoyzxf, HttpContext.RequestAborted);
-                    orderExtension = _mapper.Map<OrderExtensionDto>(dtoyzxf);
+                    orderExtension = _mapper.Map<OrderExtensionDto>(data.FormPost);
                     orderExtension.OrderType = "邮政业消费者申诉受理单";
                     break;
                 case "hbjb"://环保举报业务
                     //转换数据
-                    var dtohbjb = _mapper.Map<DsFormEnvironMent>(data.FormEnvironMent);
-                    dtohbjb.RCEId = id;
-                    //添加数据
-                    await _formEnvironMentRepository.AddAsync(dtohbjb, HttpContext.RequestAborted);
-                    orderExtension = _mapper.Map<OrderExtensionDto>(dtohbjb);
+                    orderExtension = _mapper.Map<OrderExtensionDto>(data.FormEnvironMent);
                     orderExtension.OrderType = "环保举报业务受理单";
                     break;
                 case "scjgj"://12315个性化表单
@@ -787,7 +678,7 @@ namespace Hotline.Api.Controllers.DataSharing
                 default:
                     break;
             }
-
+        
             if (!string.IsNullOrEmpty(id))
             {
                 //向业务系统推送消息
@@ -870,7 +761,7 @@ namespace Hotline.Api.Controllers.DataSharing
         public async Task<OpenResponse> GetCaseMaterialInfotest([FromForm] string @params, List<IFormFile> files)
         {
             return OpenResponse.Ok(Reponse.Failed("数据解析失败"));
-          //  return OpenResponse.Ok("ok");
+            //  return OpenResponse.Ok("ok");
             //var businessFile = _channelConfigurationManager.GetConfigurationBusinessFile();
 
             //string result = "";
@@ -972,6 +863,26 @@ namespace Hotline.Api.Controllers.DataSharing
         }
 
         #region 私有方法
+        /// <summary>
+        /// 将数据写入表格
+        /// </summary>
+        /// <param name="CaseSerial">工单编号</param>
+        /// <param name="CliengGuid">材料标识</param>
+        /// <param name="ServiceInterface">接口名称</param>
+        /// <param name="ReceiveData">数据</param>
+        /// <returns></returns>
+        public async Task<string> InitReceiveProvinceData(string CaseSerial, string CliengGuid, string ServiceInterface, string ReceiveData)
+        {
+            DsReceiveProvinceData dsReceive = new DsReceiveProvinceData()
+            {
+                CaseSerial = CaseSerial,
+                CliengGuid = CliengGuid,
+                ServiceInterface = ServiceInterface,
+                ReceiveData = ReceiveData
+            };
+            return await _dsReceiveProvinceDataRepository.AddAsync(dsReceive, HttpContext.RequestAborted);
+        }
+
         /// <summary>
         /// 将文件流上传到附件服务器
         /// </summary>

src/Hotline.Application/Mappers/DataSharing/DsMapperConfigs.cs

@@ -6,6 +6,8 @@ using Hotline.DataSharing.Province.HuiJu.Send;
 using Hotline.DataSharing.Province.XieTong.Receive;
 using Hotline.DataSharing.Province.XieTong.Send;
 using Hotline.DataSharing.WebPortal;
+using Hotline.Share.Dtos.DataSharing.Province.Extend;
+using Hotline.Share.Dtos.DataSharing.Province.XieTong.Receive;
 using Hotline.Share.Dtos.Order;
 using Hotline.Share.Enums.CallCenter;
 using Hotline.Share.Enums.Order;
@@ -108,7 +110,7 @@ namespace Hotline.Application.Mappers.DataSharing
 
             //接收
             //工单交办
-            config.ForType<DsReceiveCaseInfo, AddOrderDto>()
+            config.ForType<ReceiveCaseInfoModel, AddOrderDto>()
            .Map(d => d.ProvinceNo, x => x.CaseSerial)
            .Map(d => d.Title, x => x.CaseTitle)
            //.Map(d => d.AcceptorName, x => x.CaseRegister)
@@ -398,7 +400,7 @@ namespace Hotline.Application.Mappers.DataSharing
             #region 协同扩展数据--拓展信息
 
             //医疗工单
-            config.ForType<DsFormMedical, OrderExtensionDto>()
+            config.ForType<FormMedicalInfo, OrderExtensionDto>()
             .Ignore(d => d.Id)
             .Map(d => d.MedName, x => x.MedicalName)
             .Map(d => d.MedAddress, x => x.MedicalAddr)
@@ -410,14 +412,14 @@ namespace Hotline.Application.Mappers.DataSharing
             ;
 
             //四川政务服务网技术工单
-            config.ForType<DsFormNetWorktec, OrderExtensionDto>()
+            config.ForType<FormNetWorktecInfo, OrderExtensionDto>()
             .Ignore(d => d.Id)
             .Map(d => d.ZwfwwAccount, x => x.ZwfwAccount)
             .Map(d => d.ZwfwwContact, x => x.LinkPeson)
             ;
 
             //电视购物及商铺购买退换货工单
-            config.ForType<DsFormReturnexChange, OrderExtensionDto>()
+            config.ForType<FormReturnexChangeInfo, OrderExtensionDto>()
             .Ignore(d => d.Id)
             .Map(d => d.ExchTv, x => x.SubjectName)
             .Map(d => d.ExchTradeTime, x => x.PurchaseTime)
@@ -430,7 +432,7 @@ namespace Hotline.Application.Mappers.DataSharing
             ;
 
             //高速公路工单
-            config.ForType<DsFormExpressWay, OrderExtensionDto>()
+            config.ForType<FormExpressWayInfo, OrderExtensionDto>()
             .Ignore(d => d.Id)
             .Map(d => d.ExpwyEntrance, x => x.InWay)
             .Map(d => d.ExpwyExit, x => x.OutWay)
@@ -439,7 +441,7 @@ namespace Hotline.Application.Mappers.DataSharing
             ;
 
             //电视台虚假广告工单
-            config.ForType<DsFormShamPub, OrderExtensionDto>()
+            config.ForType<FormShamPubInfo, OrderExtensionDto>()
             .Ignore(d => d.Id)
             .Map(d => d.AdTv, x => x.SubjectName)
             .Map(d => d.AdProduct, x => x.ProductName)
@@ -447,7 +449,7 @@ namespace Hotline.Application.Mappers.DataSharing
             ;
 
             //12366热线诉求交办
-            config.ForType<DsFormTaxationComplaint, OrderExtensionDto>()
+            config.ForType<FormTaxationComplaintInfo, OrderExtensionDto>()
             .Ignore(d => d.Id)
             .Map(d => d.Location12366Sq, x => x.TaxAuthority)
             .Map(d => d.Info12366Sq, x => x.ComplaintSubject)
@@ -455,21 +457,21 @@ namespace Hotline.Application.Mappers.DataSharing
             ;
 
             //12366热线咨询交办
-            config.ForType<DsFormTaxationConsulting, OrderExtensionDto>()
+            config.ForType<FormTaxationConsultingInfo, OrderExtensionDto>()
             .Ignore(d => d.Id)
             .Map(d => d.Location12366Zx, x => x.TaxAuthority)
             .Map(d => d.Info12366Zx, x => x.ComplaintSubject)
             ;
 
             //12328服务监督
-            config.ForType<DsFormTraffic, OrderExtensionDto>()
+            config.ForType<FormTrafficInfo, OrderExtensionDto>()
             .Ignore(d => d.Id)
             .Map(d => d.AcceptType12328, x => x.AcceptType)
             .Map(d => d.Client12328, x => x.Customer)
             ;
 
             //邮政业消费者申诉
-            config.ForType<DsFormPost, OrderExtensionDto>()
+            config.ForType<FormPostInfo, OrderExtensionDto>()
             .Ignore(d => d.Id)
             .Map(d => d.MailClaimantName, x => x.AppealName)
             .Map(d => d.MailClaimantPhone, x => x.AppealNum)
@@ -486,7 +488,7 @@ namespace Hotline.Application.Mappers.DataSharing
             ;
 
             //环保举报业务
-            config.ForType<DsFormEnvironMent, OrderExtensionDto>()
+            config.ForType<FormEnvironMentInfo, OrderExtensionDto>()
             .Ignore(d => d.Id)
             .Map(d => d.EpEmail, x => x.ComplaintMailBox)
             .Map(d => d.EpAddress, x => x.PostalAddress)
@@ -497,7 +499,7 @@ namespace Hotline.Application.Mappers.DataSharing
             ;
 
             //12315个性化表单--投诉、举报
-            config.ForType<DsFormMarket, OrderExtensionDto>()
+            config.ForType<FormMarketInfo, OrderExtensionDto>()
             .Ignore(d => d.Id)
             .Map(d => d.ComplainClassifyCode, x => x.ApplBasQue)
             .Map(d => d.ComplainClassify, x => x.ApplBasQueName)

src/Hotline/DataSharing/Province/Services/PusherProviderService.cs

@@ -285,7 +285,7 @@ namespace Hotline.DataSharing.Province.Services
                         await _submitCaseInfoRepository.UpdateAsync(item, cancellationToken);
 
                         //处理同步记录
-                        await UpdateWaitingPushData(item.Id, item.SyncState, JsonConvert.SerializeObject(response), cancellationToken: cancellationToken);
+                        await UpdateWaitingPushData(item.Id, item.SyncState, System.Text.Json.JsonSerializer.Serialize(response), cancellationToken: cancellationToken);
 
                     }
                 }
@@ -319,11 +319,11 @@ namespace Hotline.DataSharing.Province.Services
                 else
                     data.SyncState = "2";
 
-                data.ReturnResult = JsonConvert.SerializeObject(response);
+                data.ReturnResult = System.Text.Json.JsonSerializer.Serialize(response);
                 await _getVisitInfoReceiveRepository.UpdateAsync(data, cancellationToken);
 
                 //处理同步记录
-                await UpdateWaitingPushData(data.Id, data.SyncState, JsonConvert.SerializeObject(response), cancellationToken: cancellationToken);
+                await UpdateWaitingPushData(data.Id, data.SyncState, System.Text.Json.JsonSerializer.Serialize(response), cancellationToken: cancellationToken);
 
             }
         }
@@ -375,7 +375,7 @@ namespace Hotline.DataSharing.Province.Services
                         await _submitCaseRecordRepository.UpdateAsync(item, cancellationToken);
 
                         //处理同步记录
-                        await UpdateWaitingPushData(item.Id, item.SyncState, JsonConvert.SerializeObject(response), cancellationToken: cancellationToken);
+                        await UpdateWaitingPushData(item.Id, item.SyncState, System.Text.Json.JsonSerializer.Serialize(response), cancellationToken: cancellationToken);
 
                     }
                 }
@@ -388,7 +388,7 @@ namespace Hotline.DataSharing.Province.Services
             //    //else
             //    //    notification.DataOrder.SyncState = "2";
 
-            //    //notification.DataOrder.ReturnResult = Newtonsoft.Json.JsonConvert.SerializeObject(response);
+            //    //notification.DataOrder.ReturnResult =  System.Text.Json.JsonSerializer.Serialize(response);
             //    //await _submitCaseRecordRepository.UpdateAsync(notification.DataOrder);
             //}
         }
@@ -461,10 +461,10 @@ namespace Hotline.DataSharing.Province.Services
                         else
                             caseInfo.SyncState = "2";
 
-                        caseInfo.ReturnResult = Newtonsoft.Json.JsonConvert.SerializeObject(response);
+                        caseInfo.ReturnResult =  System.Text.Json.JsonSerializer.Serialize(response);
                         await _receiveCaseExtendsRepository.UpdateAsync(caseInfo, cancellationToken);
                         //处理同步记录
-                        await UpdateWaitingPushData(caseInfo.Id, caseInfo.SyncState, JsonConvert.SerializeObject(response), cancellationToken: cancellationToken);
+                        await UpdateWaitingPushData(caseInfo.Id, caseInfo.SyncState, System.Text.Json.JsonSerializer.Serialize(response), cancellationToken: cancellationToken);
 
                     }
                 }
@@ -497,10 +497,10 @@ namespace Hotline.DataSharing.Province.Services
                 else
                     dto.SyncState = "2";
 
-                dto.ReturnResult = JsonConvert.SerializeObject(response);
+                dto.ReturnResult = System.Text.Json.JsonSerializer.Serialize(response);
                 await _sendCaseInfoRepository.UpdateAsync(dto, cancellationToken);
                 //处理同步记录
-                await UpdateWaitingPushData(dto.Id, dto.SyncState, JsonConvert.SerializeObject(response), cancellationToken: cancellationToken);
+                await UpdateWaitingPushData(dto.Id, dto.SyncState, System.Text.Json.JsonSerializer.Serialize(response), cancellationToken: cancellationToken);
 
             }
         }
@@ -531,10 +531,10 @@ namespace Hotline.DataSharing.Province.Services
                 else
                     dto.SyncState = "2";
 
-                dto.ReturnResult = JsonConvert.SerializeObject(response);
+                dto.ReturnResult = System.Text.Json.JsonSerializer.Serialize(response);
                 await _getCaseProcessReceiveRepository.UpdateAsync(dto, cancellationToken);
                 //处理同步记录
-                await UpdateWaitingPushData(dto.Id, dto.SyncState, JsonConvert.SerializeObject(response), cancellationToken: cancellationToken);
+                await UpdateWaitingPushData(dto.Id, dto.SyncState, System.Text.Json.JsonSerializer.Serialize(response), cancellationToken: cancellationToken);
             }
         }
 
@@ -564,10 +564,10 @@ namespace Hotline.DataSharing.Province.Services
                 else
                     dto.SyncState = "2";
 
-                dto.ReturnResult = JsonConvert.SerializeObject(response);
+                dto.ReturnResult = System.Text.Json.JsonSerializer.Serialize(response);
                 await _getCaseBackApplyRepository.UpdateAsync(dto, cancellationToken);
                 //处理同步记录
-                await UpdateWaitingPushData(dto.Id, dto.SyncState, JsonConvert.SerializeObject(response), cancellationToken: cancellationToken);
+                await UpdateWaitingPushData(dto.Id, dto.SyncState, System.Text.Json.JsonSerializer.Serialize(response), cancellationToken: cancellationToken);
             }
         }
 
@@ -597,10 +597,10 @@ namespace Hotline.DataSharing.Province.Services
                 else
                     dto.SyncState = "2";
 
-                dto.ReturnResult = JsonConvert.SerializeObject(response);
+                dto.ReturnResult = System.Text.Json.JsonSerializer.Serialize(response);
                 await _sendSuperviseProcessInfoRepository.UpdateAsync(dto, cancellationToken);
                 //处理同步记录
-                await UpdateWaitingPushData(dto.Id, dto.SyncState, JsonConvert.SerializeObject(response), cancellationToken: cancellationToken);
+                await UpdateWaitingPushData(dto.Id, dto.SyncState, System.Text.Json.JsonSerializer.Serialize(response), cancellationToken: cancellationToken);
             }
         }
 
@@ -630,10 +630,10 @@ namespace Hotline.DataSharing.Province.Services
                 else
                     dto.SyncState = "2";
 
-                dto.ReturnResult = JsonConvert.SerializeObject(response);
+                dto.ReturnResult = System.Text.Json.JsonSerializer.Serialize(response);
                 await _sendSuperviseResultInfoRepository.UpdateAsync(dto, cancellationToken);
                 //处理同步记录
-                await UpdateWaitingPushData(dto.Id, dto.SyncState, JsonConvert.SerializeObject(response), cancellationToken: cancellationToken);
+                await UpdateWaitingPushData(dto.Id, dto.SyncState, System.Text.Json.JsonSerializer.Serialize(response), cancellationToken: cancellationToken);
             }
         }
 
@@ -664,10 +664,10 @@ namespace Hotline.DataSharing.Province.Services
                 else
                     dto.SyncState = "2";
 
-                dto.ReturnResult = JsonConvert.SerializeObject(response);
+                dto.ReturnResult = System.Text.Json.JsonSerializer.Serialize(response);
                 await _screenCaseInfoSendRepository.UpdateAsync(dto, cancellationToken);
                 //处理同步记录
-                await UpdateWaitingPushData(dto.Id, dto.SyncState, JsonConvert.SerializeObject(response), cancellationToken: cancellationToken);
+                await UpdateWaitingPushData(dto.Id, dto.SyncState, System.Text.Json.JsonSerializer.Serialize(response), cancellationToken: cancellationToken);
             }
         }
 
@@ -697,10 +697,10 @@ namespace Hotline.DataSharing.Province.Services
                 else
                     dto.SyncState = "2";
 
-                dto.ReturnResult = Newtonsoft.Json.JsonConvert.SerializeObject(response);
+                dto.ReturnResult =  System.Text.Json.JsonSerializer.Serialize(response);
                 await _remindCaseInfoRepository.UpdateAsync(dto, cancellationToken);
                 //处理同步记录
-                await UpdateWaitingPushData(dto.Id, dto.SyncState, JsonConvert.SerializeObject(response), cancellationToken: cancellationToken);
+                await UpdateWaitingPushData(dto.Id, dto.SyncState, System.Text.Json.JsonSerializer.Serialize(response), cancellationToken: cancellationToken);
             }
         }
 
@@ -730,10 +730,10 @@ namespace Hotline.DataSharing.Province.Services
                 else
                     dto.SyncState = "2";
 
-                dto.ReturnResult = Newtonsoft.Json.JsonConvert.SerializeObject(response);
+                dto.ReturnResult =  System.Text.Json.JsonSerializer.Serialize(response);
                 await _getKnowledgeInfoSendRepository.UpdateAsync(dto, cancellationToken);
                 //处理同步记录
-                await UpdateWaitingPushData(dto.Id, dto.SyncState, JsonConvert.SerializeObject(response), cancellationToken: cancellationToken);
+                await UpdateWaitingPushData(dto.Id, dto.SyncState, System.Text.Json.JsonSerializer.Serialize(response), cancellationToken: cancellationToken);
             }
         }
 
@@ -763,10 +763,10 @@ namespace Hotline.DataSharing.Province.Services
                 else
                     dto.SyncState = "2";
 
-                dto.ReturnResult = Newtonsoft.Json.JsonConvert.SerializeObject(response);
+                dto.ReturnResult =  System.Text.Json.JsonSerializer.Serialize(response);
                 await _getKnowledgeInfoUpdateRepository.UpdateAsync(dto, cancellationToken);
                 //处理同步记录
-                await UpdateWaitingPushData(dto.Id, dto.SyncState, JsonConvert.SerializeObject(response), cancellationToken: cancellationToken);
+                await UpdateWaitingPushData(dto.Id, dto.SyncState, System.Text.Json.JsonSerializer.Serialize(response), cancellationToken: cancellationToken);
             }
         }
 
@@ -798,10 +798,10 @@ namespace Hotline.DataSharing.Province.Services
                 else
                     dto.SyncState = "2";
 
-                dto.ReturnResult = Newtonsoft.Json.JsonConvert.SerializeObject(response);
+                dto.ReturnResult =  System.Text.Json.JsonSerializer.Serialize(response);
                 await _getKnowledgeInfoAbandonRepository.UpdateAsync(dto, cancellationToken);
                 //处理同步记录
-                await UpdateWaitingPushData(dto.Id, dto.SyncState, JsonConvert.SerializeObject(response), cancellationToken: cancellationToken);
+                await UpdateWaitingPushData(dto.Id, dto.SyncState, System.Text.Json.JsonSerializer.Serialize(response), cancellationToken: cancellationToken);
             }
         }
 
@@ -831,10 +831,10 @@ namespace Hotline.DataSharing.Province.Services
                 else
                     dto.SyncState = "2";
 
-                dto.ReturnResult = Newtonsoft.Json.JsonConvert.SerializeObject(response);
+                dto.ReturnResult =  System.Text.Json.JsonSerializer.Serialize(response);
                 await _sendRealTimeStatusRepository.UpdateAsync(dto, cancellationToken);
                 //处理同步记录
-                await UpdateWaitingPushData(dto.Id, dto.SyncState, JsonConvert.SerializeObject(response), cancellationToken: cancellationToken);
+                await UpdateWaitingPushData(dto.Id, dto.SyncState, System.Text.Json.JsonSerializer.Serialize(response), cancellationToken: cancellationToken);
             }
         }
 
@@ -864,10 +864,10 @@ namespace Hotline.DataSharing.Province.Services
                 else
                     dto.SyncState = "2";
 
-                dto.ReturnResult = Newtonsoft.Json.JsonConvert.SerializeObject(response);
+                dto.ReturnResult =  System.Text.Json.JsonSerializer.Serialize(response);
                 await _delayCaseInfoSendRepository.UpdateAsync(dto, cancellationToken);
                 //处理同步记录
-                await UpdateWaitingPushData(dto.Id, dto.SyncState, JsonConvert.SerializeObject(response), cancellationToken: cancellationToken);
+                await UpdateWaitingPushData(dto.Id, dto.SyncState, System.Text.Json.JsonSerializer.Serialize(response), cancellationToken: cancellationToken);
             }
         }
 
@@ -897,10 +897,10 @@ namespace Hotline.DataSharing.Province.Services
                 else
                     dto.SyncState = "2";
 
-                dto.ReturnResult = Newtonsoft.Json.JsonConvert.SerializeObject(response);
+                dto.ReturnResult =  System.Text.Json.JsonSerializer.Serialize(response);
                 await _zMHDCaseInfoPublicRepository.UpdateAsync(dto, cancellationToken);
                 //处理同步记录
-                await UpdateWaitingPushData(dto.Id, dto.SyncState, JsonConvert.SerializeObject(response), cancellationToken: cancellationToken);
+                await UpdateWaitingPushData(dto.Id, dto.SyncState, System.Text.Json.JsonSerializer.Serialize(response), cancellationToken: cancellationToken);
             }
         }
 
@@ -939,10 +939,10 @@ namespace Hotline.DataSharing.Province.Services
                 else
                     dto.SyncState = "2";
 
-                dto.ReturnResult = Newtonsoft.Json.JsonConvert.SerializeObject(response);
+                dto.ReturnResult =  System.Text.Json.JsonSerializer.Serialize(response);
                 await _submitCaseTotalRepository.UpdateAsync(dto, cancellationToken);
                 //处理同步记录
-                await UpdateWaitingPushData(dto.Id, dto.SyncState, JsonConvert.SerializeObject(response), cancellationToken: cancellationToken);
+                await UpdateWaitingPushData(dto.Id, dto.SyncState, System.Text.Json.JsonSerializer.Serialize(response), cancellationToken: cancellationToken);
             }
         }
 
@@ -972,10 +972,10 @@ namespace Hotline.DataSharing.Province.Services
                 else
                     dto.SyncState = "2";
 
-                dto.ReturnResult = Newtonsoft.Json.JsonConvert.SerializeObject(response);
+                dto.ReturnResult =  System.Text.Json.JsonSerializer.Serialize (response);
                 await _supplyCaseInfoSendRepository.UpdateAsync(dto, cancellationToken);
                 //处理同步记录
-                await UpdateWaitingPushData(dto.Id, dto.SyncState, JsonConvert.SerializeObject(response), cancellationToken: cancellationToken);
+                await UpdateWaitingPushData(dto.Id, dto.SyncState, System.Text.Json.JsonSerializer.Serialize (response), cancellationToken: cancellationToken);
             }
         }
 
@@ -1005,11 +1005,11 @@ namespace Hotline.DataSharing.Province.Services
                 else
                     dto.SyncState = "2";
 
-                dto.ReturnResult = Newtonsoft.Json.JsonConvert.SerializeObject(response);
+                dto.ReturnResult = System.Text.Json.JsonSerializer.Serialize (response);
                 await _revokeCaseInfoRepository.UpdateAsync(dto, cancellationToken);
 
                 //处理同步记录
-                await UpdateWaitingPushData(dto.Id, dto.SyncState, JsonConvert.SerializeObject(response), cancellationToken: cancellationToken);
+                await UpdateWaitingPushData(dto.Id, dto.SyncState, System.Text.Json.JsonSerializer.Serialize (response), cancellationToken: cancellationToken);
             }
         }
 
@@ -1064,7 +1064,7 @@ namespace Hotline.DataSharing.Province.Services
                         await _submitCaseProcessRepository.UpdateAsync(item, cancellationToken);
 
                         //处理同步记录
-                        await UpdateWaitingPushData(item.Id, item.SyncState, JsonConvert.SerializeObject(response), cancellationToken: cancellationToken);
+                        await UpdateWaitingPushData(item.Id, item.SyncState, System.Text.Json.JsonSerializer.Serialize(response), cancellationToken: cancellationToken);
                     }
                 }
             }
@@ -1132,7 +1132,7 @@ namespace Hotline.DataSharing.Province.Services
                     await _submitCaseResultRepository.UpdateAsync(item, cancellationToken);
 
                     //处理同步记录
-                    await UpdateWaitingPushData(item.Id, item.SyncState, JsonConvert.SerializeObject(response), cancellationToken: cancellationToken);
+                    await UpdateWaitingPushData(item.Id, item.SyncState, System.Text.Json.JsonSerializer.Serialize(response), cancellationToken: cancellationToken);
                 }
             }
         }
@@ -1198,7 +1198,7 @@ namespace Hotline.DataSharing.Province.Services
                     await _submitVisitInfoRepository.UpdateAsync(item, cancellationToken);
 
                     //处理同步记录
-                    await UpdateWaitingPushData(item.Id, item.SyncState, JsonConvert.SerializeObject(response), cancellationToken: cancellationToken);
+                    await UpdateWaitingPushData(item.Id, item.SyncState, System.Text.Json.JsonSerializer.Serialize(response), cancellationToken: cancellationToken);
                 }
             }
         }
@@ -1232,7 +1232,7 @@ namespace Hotline.DataSharing.Province.Services
                 await _getCaseMaterialInfoRepository.UpdateAsync(item, cancellationToken);
 
                 //处理同步记录
-                await UpdateWaitingPushData(item.Id, item.SyncState, JsonConvert.SerializeObject(result), cancellationToken: cancellationToken);
+                await UpdateWaitingPushData(item.Id, item.SyncState, System.Text.Json.JsonSerializer.Serialize(result), cancellationToken: cancellationToken);
             }
         }
 
@@ -1320,7 +1320,7 @@ namespace Hotline.DataSharing.Province.Services
 
                 Dictionary<string, object> dicParam = new()
                 {
-                    { "params", Newtonsoft.Json.JsonConvert.SerializeObject(model) } // 第一个接口参数，json格式字符串
+                    { "params",  System.Text.Json.JsonSerializer.Serialize(model) } // 第一个接口参数，json格式字符串
                 };
 
                 // 构造字典文件数据
@@ -1332,7 +1332,7 @@ namespace Hotline.DataSharing.Province.Services
                 // 上传附件
                 string strResult = CFormUpload.MultipartFormDataPost(strUrl, null, dicParam, strToken);
 
-                return Newtonsoft.Json.JsonConvert.DeserializeObject<ProvinceResponse>(strResult);
+                return  JsonConvert.DeserializeObject<ProvinceResponse>(strResult);
             }
             catch (Exception)
             {
@@ -1368,7 +1368,7 @@ namespace Hotline.DataSharing.Province.Services
                 //最新同步时间
                 waitingPushData.NewSyncProvinceTime = DateTime.Now;
                 waitingPushData.SyncState = SyncState;
-                waitingPushData.ReturnResult = JsonConvert.SerializeObject(result);
+                waitingPushData.ReturnResult = result;
                 await _waitingPushDataRepository.UpdateAsync(waitingPushData, cancellationToken: cancellationToken);
             }
         }

src/Hotline/DataSharing/Province/XieTong/Receive/DsDelayCaseResult.cs

@@ -1,79 +0,0 @@
-using SqlSugar;
-using System.ComponentModel;
-using XF.Domain.Repository;
-
-namespace Hotline.DataSharing.Province.XieTong.Receive
-{
-    /// <summary>
-    /// 服务工单延时审核结果
-    /// </summary>
-    [Description("服务工单延时审核结果")]
-    public class DsDelayCaseResult : CreationModificationEntity
-    {
-        /// <summary>
-        /// 审核结果
-        /// </summary>
-        [SugarColumn(ColumnDescription = "审核结果", ColumnDataType = "varchar(10)")]
-        public string AuditResult { get; set; }
-
-        /// <summary>
-        /// 审核意见
-        /// </summary>
-        [SugarColumn(ColumnDescription = "审核意见", ColumnDataType = "text")]
-        public string AuditOpinion { get; set; }
-
-        /// <summary>
-        /// 审核时间
-        /// </summary>
-        [SugarColumn(ColumnDescription = "审核时间")]
-        public DateTime? AuditTime { get; set; }
-
-        /// <summary>
-        /// 审核部门
-        /// </summary>
-        [SugarColumn(ColumnDescription = "审核部门", ColumnDataType = "varchar(200)")]
-        public string AuditOuname { get; set; }
-
-        /// <summary>
-        /// 审核人
-        /// </summary>
-        [SugarColumn(ColumnDescription = "审核人", ColumnDataType = "varchar(50)")]
-        public string AuditPerson { get; set; }
-
-        /// <summary>
-        /// 申请延期数量
-        /// </summary>
-        [SugarColumn(ColumnDescription = "申请延期数量")]
-        public int ApplyDelaynum { get; set; }
-
-        /// <summary>
-        /// 申请延期单位（工作日或工作小时）
-        /// </summary>
-        [SugarColumn(ColumnDescription = "申请延期单位（工作日或工作小时）")]
-        public int ApplyDelayunit { get; set; }
-
-        /// <summary>
-        /// 材料标识
-        /// </summary>
-        [SugarColumn(ColumnDescription = "材料标识", ColumnDataType = "varchar(50)")]
-        public string CliengGuid { get; set; }
-
-        /// <summary>
-        /// 服务工单编号  
-        /// </summary>
-        [SugarColumn(ColumnDescription = "服务工单编号", ColumnDataType = "varchar(50)")]
-        public string CaseSerial { get; set; }
-
-        /// <summary>
-        /// 行政区划代码
-        /// </summary>
-        [SugarColumn(ColumnDescription = "行政区划代码", ColumnDataType = "varchar(24)")]
-        public string AreaCode { get; set; }
-
-        /// <summary>
-        /// 同步状态 0：待同步；	  1：同步成功；	 2：同步失败；
-        /// </summary>
-        [SugarColumn(ColumnDescription = "同步状态", ColumnDataType = "varchar(1)", IsNullable = true)]
-        public string SyncState { get; set; } = "1";
-    }
-}

src/Hotline/DataSharing/Province/XieTong/Receive/DsGetCaseBackResult.cs

@@ -1,73 +0,0 @@
-using SqlSugar;
-using System.ComponentModel;
-using XF.Domain.Repository;
-
-namespace Hotline.DataSharing.Province.XieTong.Receive
-{
-    /// <summary>
-    /// 服务工单退回反馈
-    /// </summary>
-    [Description("服务工单退回反馈")]
-    public class DsGetCaseBackResult : CreationModificationEntity
-    {
-        /// <summary>
-        /// 办理操作
-        /// </summary>
-        [SugarColumn(ColumnDescription = "办理操作", ColumnDataType = "varchar(10)")]
-        public string BackType { get; set; }
-
-        /// <summary>
-        /// 办理单位
-        /// </summary>
-        [SugarColumn(ColumnDescription = "办理单位", ColumnDataType = "varchar(200)")]
-        public string DealDept { get; set; }
-
-        /// <summary>
-        /// 办理人员
-        /// </summary>
-        [SugarColumn(ColumnDescription = "办理人员", ColumnDataType = "varchar(200)")]
-        public string DealName { get; set; }
-
-        /// <summary>
-        /// 退回反馈时间
-        /// </summary>
-        [SugarColumn(ColumnDescription = "退回反馈时间")]
-        public DateTime? ApplyTime { get; set; }
-
-        /// <summary>
-        /// 是否同意退回
-        /// </summary>
-        [SugarColumn(ColumnDescription = "是否同意退回")]
-        public bool Result { get; set; }
-
-        /// <summary>
-        /// 退回原因
-        /// </summary>
-        [SugarColumn(ColumnDescription = "退回原因", ColumnDataType = "text")]
-        public string BackReason { get; set; }
-
-        /// <summary>
-        /// 材料标识
-        /// </summary>
-        [SugarColumn(ColumnDescription = "材料标识", ColumnDataType = "varchar(50)")]
-        public string CliengGuid { get; set; }
-
-        /// <summary>
-        /// 服务工单编号  
-        /// </summary>
-        [SugarColumn(ColumnDescription = "服务工单编号", ColumnDataType = "varchar(50)")]
-        public string CaseSerial { get; set; }
-
-        /// <summary>
-        /// 行政区划代码
-        /// </summary>
-        [SugarColumn(ColumnDescription = "行政区划代码", ColumnDataType = "varchar(24)")]
-        public string AreaCode { get; set; }
-
-        /// <summary>
-        /// 同步状态 0：待同步；	  1：同步成功；	 2：同步失败；
-        /// </summary>
-        [SugarColumn(ColumnDescription = "同步状态", ColumnDataType = "varchar(1)", IsNullable = true)]
-        public string SyncState { get; set; } = "1";
-    }
-}

src/Hotline/DataSharing/Province/XieTong/Receive/DsGetCaseReultSend.cs

@@ -1,133 +0,0 @@
-using SqlSugar;
-using System.ComponentModel;
-using XF.Domain.Repository;
-
-namespace Hotline.DataSharing.Province.XieTong.Receive
-{
-    /// <summary>
-    /// 上报工单处理结果/退回
-    /// </summary>
-    [Description("上报工单处理结果/退回")]
-    public class DsGetCaseReultSend : CreationModificationEntity
-    {
-        /// <summary>
-        /// 答复单位
-        /// </summary>
-        [SugarColumn(ColumnDescription = "答复单位", ColumnDataType = "varchar(200)")]
-        public string DeptName { get; set; }
-
-        /// <summary>
-        /// 答复时间
-        /// </summary>
-        [SugarColumn(ColumnDescription = "答复时间")]
-        public DateTime? FinishTime { get; set; }
-
-        /// <summary>
-        /// 答复人员
-        /// </summary>
-        [SugarColumn(ColumnDescription = "答复人员", ColumnDataType = "varchar(200)")]
-        public string FinishName { get; set; }
-
-        /// <summary>
-        /// 办理情况
-        /// </summary>
-        [SugarColumn(ColumnDescription = "办理情况", ColumnDataType = "text")]
-        public string FinishNote { get; set; }
-
-        /// <summary>
-        /// 办理操作
-        /// </summary>
-        [SugarColumn(ColumnDescription = "办理操作", ColumnDataType = "varchar(10)")]
-        public string FinishType { get; set; }
-
-        /// <summary>
-        /// 办理单位
-        /// </summary>
-        [SugarColumn(ColumnDescription = "办理单位", ColumnDataType = "varchar(200)")]
-        public string EndDept { get; set; }
-
-        /// <summary>
-        /// 办理人员
-        /// </summary>
-        [SugarColumn(ColumnDescription = "办理人员", ColumnDataType = "varchar(200)", IsNullable = true)]
-        public string EndName { get; set; }
-
-        /// <summary>
-        /// 联系时间
-        /// </summary>
-        [SugarColumn(ColumnDescription = "联系时间", IsNullable = true)]
-        public DateTime? ConcactTime { get; set; }
-
-        /// <summary>
-        /// 联系方式
-        /// </summary>
-        [SugarColumn(ColumnDescription = "联系方式", ColumnDataType = "varchar(50)")]
-        public string ConcactType { get; set; }
-
-        /// <summary>
-        /// 签收时间
-        /// </summary>
-        [SugarColumn(ColumnDescription = "签收时间")]
-        public DateTime? SignTime { get; set; }
-
-        /// <summary>
-        /// 反馈时间
-        /// </summary>
-        [SugarColumn(ColumnDescription = "反馈时间")]
-        public DateTime? FdBackTime { get; set; }
-
-        /// <summary>
-        /// 交办时间
-        /// </summary>
-        [SugarColumn(ColumnDescription = "交办时间")]
-        public DateTime? SendTime { get; set; }
-
-        /// <summary>
-        /// 反馈意见
-        /// </summary>
-        [SugarColumn(ColumnDescription = "反馈意见", ColumnDataType = "text")]
-        public string FdBack { get; set; }
-
-        /// <summary>
-        /// 办理时长
-        /// </summary>
-        [SugarColumn(ColumnDescription = "办理时长")]
-        public decimal? HandletimeLong { get; set; }
-
-        /// <summary>
-        /// 任务单关联 guid
-        /// </summary>
-        [SugarColumn(ColumnDescription = "任务单关联 guid", ColumnDataType = "varchar(50)", IsNullable = true)]
-        public string TrowGuid { get; set; }
-
-        /// <summary>
-        /// 退回类型
-        /// </summary>
-        [SugarColumn(ColumnDescription = "退回类型", ColumnDataType = "varchar(20)", IsNullable = true)]
-        public string BackType { get; set; }
-
-        /// <summary>
-        /// 材料标识
-        /// </summary>
-        [SugarColumn(ColumnDescription = "材料标识", ColumnDataType = "varchar(50)")]
-        public string CliengGuid { get; set; }
-
-        /// <summary>
-        /// 服务工单编号  
-        /// </summary>
-        [SugarColumn(ColumnDescription = "服务工单编号", ColumnDataType = "varchar(50)")]
-        public string CaseSerial { get; set; }
-
-        /// <summary>
-        /// 行政区划代码
-        /// </summary>
-        [SugarColumn(ColumnDescription = "行政区划代码", ColumnDataType = "varchar(24)")]
-        public string AreaCode { get; set; }
-
-        /// <summary>
-        /// 同步状态 0：待同步；	  1：同步成功；	 2：同步失败；
-        /// </summary>
-        [SugarColumn(ColumnDescription = "同步状态", ColumnDataType = "varchar(1)", IsNullable = true)]
-        public string SyncState { get; set; } = "1";
-    }
-}

src/Hotline/DataSharing/Province/XieTong/Receive/DsGetVisitInfoSend.cs

@@ -1,67 +0,0 @@
-using SqlSugar;
-using System.ComponentModel;
-using XF.Domain.Repository;
-
-namespace Hotline.DataSharing.Province.XieTong.Receive
-{
-    /// <summary>
-    /// 上报工单评价
-    /// </summary>
-    [Description("上报工单评价")]
-    public class DsGetVisitInfoSend : CreationModificationEntity
-    {
-        /// <summary>
-        /// 回访评价方式
-        /// </summary>
-        [SugarColumn(ColumnDescription = "回访评价方式", ColumnDataType = "varchar(50)")]
-        public string VisitType { get; set; }
-
-        /// <summary>
-        /// 回访人
-        /// </summary>
-        [SugarColumn(ColumnDescription = "回访人", ColumnDataType = "varchar(200)")]
-        public string VisitName { get; set; }
-
-        /// <summary>
-        /// 回访时间
-        /// </summary>
-        [SugarColumn(ColumnDescription = "回访时间")]
-        public DateTime? VisitTime { get; set; }
-
-        /// <summary>
-        /// 回访评价情况
-        /// </summary>
-        [SugarColumn(ColumnDescription = "回访评价情况", ColumnDataType = "varchar(1000)")]
-        public string VisitRemark { get; set; }
-
-        /// <summary>
-        /// 回访结果满意度
-        /// </summary>
-        [SugarColumn(ColumnDescription = "回访结果满意度", ColumnDataType = "varchar(4)")]
-        public string SubjectResultSatify { get; set; }
-
-        /// <summary>
-        /// 材料标识
-        /// </summary>
-        [SugarColumn(ColumnDescription = "材料标识", ColumnDataType = "varchar(50)")]
-        public string CliengGuid { get; set; }
-
-        /// <summary>
-        /// 服务工单编号  
-        /// </summary>
-        [SugarColumn(ColumnDescription = "服务工单编号", ColumnDataType = "varchar(50)")]
-        public string CaseSerial { get; set; }
-
-        /// <summary>
-        /// 行政区划代码
-        /// </summary>
-        [SugarColumn(ColumnDescription = "行政区划代码", ColumnDataType = "varchar(24)")]
-        public string AreaCode { get; set; }
-
-        /// <summary>
-        /// 同步状态 0：待同步；	  1：同步成功；	 2：同步失败；
-        /// </summary>
-        [SugarColumn(ColumnDescription = "同步状态", ColumnDataType = "varchar(1)", IsNullable = true)]
-        public string SyncState { get; set; } = "1";
-    }
-}

src/Hotline/DataSharing/Province/XieTong/Receive/DsReceiveCaseInfo.cs

@@ -1,235 +0,0 @@
-using SqlSugar;
-using System.ComponentModel;
-using XF.Domain.Repository;
-
-namespace Hotline.DataSharing.Province.XieTong.Receive
-{
-    /// <summary>
-    /// 服务工单交办
-    /// </summary>
-    [Description("服务工单交办")]
-    public class DsReceiveCaseInfo : CreationModificationEntity
-    {
-        /// <summary>
-        /// 业务系统工单id
-        /// </summary>
-        [SugarColumn(ColumnDescription = "业务系统工单id", ColumnDataType = "varchar(50)", IsNullable = true)]
-        public string? OrderId { get; set; }
-
-        /// <summary>
-        /// 服务工单标题
-        /// </summary>
-        [SugarColumn(ColumnDescription = "服务工单标题", ColumnDataType = "varchar(300)")]
-        public string CaseTitle { get; set; }
-
-        /// <summary>
-        /// 服务代表姓名
-        /// </summary>
-        [SugarColumn(ColumnDescription = "服务代表姓名", ColumnDataType = "varchar(200)")]
-        public string CaseRegister { get; set; }
-
-        /// <summary>
-        /// 服务代表工号
-        /// </summary>
-        [SugarColumn(ColumnDescription = "服务代表工号", ColumnDataType = "varchar(50)")]
-        public string CaseRegisterNo { get; set; }
-
-        /// <summary>
-        /// 登记时间
-        /// </summary>
-        [SugarColumn(ColumnDescription = "登记时间")]
-        public DateTime? CaseDate { get; set; }
-
-        /// <summary>
-        /// 诉求渠道
-        /// </summary>
-        [SugarColumn(ColumnDescription = "诉求渠道", ColumnDataType = "varchar(10)")]
-        public string CaseSource { get; set; }
-
-        /// <summary>
-        /// 联系电话
-        /// </summary>
-        [SugarColumn(ColumnDescription = "联系电话", ColumnDataType = "varchar(50)")]
-        public string PhoneNumber { get; set; }
-
-        /// <summary>
-        /// 服务对象名称
-        /// </summary>
-        [SugarColumn(ColumnDescription = "服务对象名称", ColumnDataType = "varchar(200)")]
-        public string AppLicantName { get; set; }
-
-        /// <summary>
-        /// 服务对象性别
-        /// </summary>
-        [SugarColumn(ColumnDescription = "服务对象性别", ColumnDataType = "varchar(1)")]
-        public string AppLicantSex { get; set; }
-
-        /// <summary>
-        /// 服务对象年龄范围
-        /// </summary>
-        [SugarColumn(ColumnDescription = "服务对象年龄范围", ColumnDataType = "varchar(4)", IsNullable = true)]
-        public string AppLicantAge { get; set; }
-
-        /// <summary>
-        /// 证件类型
-        /// </summary>
-        [SugarColumn(ColumnDescription = "证件类型", ColumnDataType = "varchar(4)", IsNullable = true)]
-        public string CertifiCateType { get; set; }
-
-        /// <summary>
-        /// 证件号码
-        /// </summary>
-        [SugarColumn(ColumnDescription = "证件号码", ColumnDataType = "varchar(50)", IsNullable = true)]
-        public string AppLicantId { get; set; }
-
-        /// <summary>
-        /// 诉求类型
-        /// </summary>
-        [SugarColumn(ColumnDescription = "诉求类型", ColumnDataType = "varchar(4)")]
-        public string CaseType { get; set; }
-
-        /// <summary>
-        /// 诉求归口
-        /// </summary>
-        [SugarColumn(ColumnDescription = "诉求归口", ColumnDataType = "varchar(50)")]
-        public string CaseAccord { get; set; }
-
-        /// <summary>
-        /// 诉求内容
-        /// </summary>
-        [SugarColumn(ColumnDescription = "诉求内容", ColumnDataType = "varchar(2000)")]
-        public string CaseContent { get; set; }
-
-        /// <summary>
-        /// 处理方式
-        /// </summary>
-        [SugarColumn(ColumnDescription = "处理方式", ColumnDataType = "varchar(4)")]
-        public string CaseProcessType { get; set; }
-
-        /// <summary>
-        /// 是否公开
-        /// </summary>
-        [SugarColumn(ColumnDescription = "是否公开", ColumnDataType = "varchar(4)")]
-        public string CaseIsPublic { get; set; }
-
-        /// <summary>
-        /// 是否保密
-        /// </summary>
-        [SugarColumn(ColumnDescription = "是否保密", ColumnDataType = "varchar(4)")]
-        public string CaseIsSecrect { get; set; }
-
-        /// <summary>
-        /// 是否回访
-        /// </summary>
-        [SugarColumn(ColumnDescription = "是否回访", ColumnDataType = "varchar(4)")]
-        public string CaseIsVisit { get; set; }
-
-        /// <summary>
-        /// 紧急程度
-        /// </summary>
-        [SugarColumn(ColumnDescription = "紧急程度", ColumnDataType = "varchar(4)")]
-        public string CaseIsUrgent { get; set; }
-
-        /// <summary>
-        /// 应签收时限
-        /// </summary>
-        [SugarColumn(ColumnDescription = "应签收时限", IsNullable = true)]
-        public DateTime? TSigntTmeBf { get; set; }
-
-        /// <summary>
-        /// 应办结时限
-        /// </summary>
-        [SugarColumn(ColumnDescription = "应办结时限", IsNullable = true)]
-        public DateTime? TfdBackTimeBf { get; set; }
-
-        /// <summary>
-        /// 应退回时限
-        /// </summary>
-        [SugarColumn(ColumnDescription = "应退回时限", IsNullable = true)]
-        public DateTime? TBackTimeBf { get; set; }
-
-        /// <summary>
-        /// 交办类型
-        /// </summary>
-        [SugarColumn(ColumnDescription = "交办类型", ColumnDataType = "varchar(4)")]
-        public string TaskType { get; set; }
-
-        /// <summary>
-        /// 经纬度
-        /// </summary>
-        [SugarColumn(ColumnDescription = "经纬度", ColumnDataType = "varchar(50)", IsNullable = true)]
-        public string CaseLngLat { get; set; }
-
-        /// <summary>
-        /// 诉求情感
-        /// </summary>
-        [SugarColumn(ColumnDescription = "诉求情感", ColumnDataType = "varchar(50)", IsNullable = true)]
-        public string CaseEmotion { get; set; }
-
-        /// <summary>
-        /// 诉求详细地址
-        /// </summary>
-        [SugarColumn(ColumnDescription = "诉求详细地址", ColumnDataType = "varchar(500)", IsNullable = true)]
-        public string CaseAddress { get; set; }
-
-        /// <summary>
-        ///事发时间
-        /// </summary>
-        [SugarColumn(ColumnDescription = "事发时间")]
-        public DateTime? EventDate { get; set; }
-
-        /// <summary>
-        /// 任务关联单guid
-        /// </summary>
-        [SugarColumn(ColumnDescription = "任务关联单guid", ColumnDataType = "varchar(50)", IsNullable = true)]
-        public string TrowGuid { get; set; }
-
-        /// <summary>
-        /// 建议类型 0：网站建议；1：网站建议；2：我要纠错
-        /// </summary>
-        [SugarColumn(ColumnDescription = "建议类型", ColumnDataType = "varchar(100)", IsNullable = true)]
-        public string AdviseType { get; set; }
-
-        /// <summary>
-        /// 建议部门
-        /// </summary>
-        [SugarColumn(ColumnDescription = "建议部门", ColumnDataType = "varchar(100)", IsNullable = true)]
-        public string AdviseDept { get; set; }
-
-        /// <summary>
-        /// 投诉类型
-        /// </summary>
-        [SugarColumn(ColumnDescription = "投诉类型", ColumnDataType = "varchar(100)", IsNullable = true)]
-        public string ComplainType { get; set; }
-
-        /// <summary>
-        /// 投诉部门
-        /// </summary>
-        [SugarColumn(ColumnDescription = "投诉部门", ColumnDataType = "varchar(100)", IsNullable = true)]
-        public string ComplainDept { get; set; }
-
-        /// <summary>
-        /// 材料标识
-        /// </summary>
-        [SugarColumn(ColumnDescription = "材料标识", ColumnDataType = "varchar(50)")]
-        public string CliengGuid { get; set; }
-
-        /// <summary>
-        /// 服务工单编号  
-        /// </summary>
-        [SugarColumn(ColumnDescription = "服务工单编号", ColumnDataType = "varchar(50)")]
-        public string CaseSerial { get; set; }
-
-        /// <summary>
-        /// 行政区划代码
-        /// </summary>
-        [SugarColumn(ColumnDescription = "行政区划代码", ColumnDataType = "varchar(24)")]
-        public string AreaCode { get; set; }
-
-        /// <summary>
-        /// 同步状态 0：待同步；	  1：同步成功；	 2：同步失败；
-        /// </summary>
-        [SugarColumn(ColumnDescription = "同步状态", ColumnDataType = "varchar(1)", IsNullable = true)]
-        public string SyncState { get; set; } = "1";
-    }
-}

src/Hotline/DataSharing/Province/XieTong/Receive/DsReceiveProvinceData.cs

@@ -14,14 +14,25 @@ namespace Hotline.DataSharing.Province.XieTong.Receive
         /// 服务工单编号  
         /// </summary>
         [SugarColumn(ColumnDescription = "服务工单编号", ColumnDataType = "varchar(50)")]
-        public string CaseSerial { get; set; }
+        public string? CaseSerial { get; set; }
 
         /// <summary>
         /// 材料标识
         /// </summary>
         [SugarColumn(ColumnDescription = "材料标识", ColumnDataType = "varchar(50)")]
-        public string CliengGuid { get; set; }
+        public string? CliengGuid { get; set; }
 
+        /// <summary>
+        /// 服务接口名称
+        /// </summary>
+        [SugarColumn(ColumnDescription = "服务接口名称", ColumnDataType = "varchar(30)")]
+        public string? ServiceInterface { get; set; }
+
+        /// <summary>
+        /// 推送数据
+        /// </summary>
+        [SugarColumn(ColumnDescription = "推送数据", ColumnDataType = "text")]
+        public string? ReceiveData { get; set; }
 
     }
 }

src/Hotline/DataSharing/Province/XieTong/Receive/DsScreenCaseResultReceive.cs

@@ -1,67 +0,0 @@
-using SqlSugar;
-using System.ComponentModel;
-using XF.Domain.Repository;
-
-namespace Hotline.DataSharing.Province.XieTong.Receive
-{
-    /// <summary>
-    /// 服务工单甄别结果
-    /// </summary>
-    [Description("服务工单甄别结果")]
-    public class DsScreenCaseResultReceive : CreationModificationEntity
-    {
-        /// <summary>
-        /// 审核结果是否通过
-        /// </summary>
-        [SugarColumn(ColumnDescription = "审核结果是否通过", ColumnDataType = "varchar(10)")]
-        public string AuditResult { get; set; }
-
-        /// <summary>
-        /// 审核意见
-        /// </summary>
-        [SugarColumn(ColumnDescription = "审核意见", ColumnDataType = "text")]
-        public string AuditOpinion { get; set; }
-
-        /// <summary>
-        /// 审核时间
-        /// </summary>
-        [SugarColumn(ColumnDescription = "审核时间")]
-        public DateTime? AuditTime { get; set; }
-
-        /// <summary>
-        /// 审核部门
-        /// </summary>
-        [SugarColumn(ColumnDescription = "审核部门", ColumnDataType = "varchar(200)")]
-        public string AuditOuname { get; set; }
-
-        /// <summary>
-        /// 审核人
-        /// </summary>
-        [SugarColumn(ColumnDescription = "审核人", ColumnDataType = "varchar(50)")]
-        public string AuditPerson { get; set; }
-
-        /// <summary>
-        /// 材料标识
-        /// </summary>
-        [SugarColumn(ColumnDescription = "材料标识", ColumnDataType = "varchar(50)")]
-        public string CliengGuid { get; set; }
-
-        /// <summary>
-        /// 服务工单编号  
-        /// </summary>
-        [SugarColumn(ColumnDescription = "服务工单编号", ColumnDataType = "varchar(50)")]
-        public string CaseSerial { get; set; }
-
-        /// <summary>
-        /// 行政区划代码
-        /// </summary>
-        [SugarColumn(ColumnDescription = "行政区划代码", ColumnDataType = "varchar(24)")]
-        public string AreaCode { get; set; }
-
-        /// <summary>
-        /// 同步状态 0：待同步；	  1：同步成功；	 2：同步失败；
-        /// </summary>
-        [SugarColumn(ColumnDescription = "同步状态", ColumnDataType = "varchar(1)", IsNullable = true)]
-        public string SyncState { get; set; } = "1";
-    }
-}

src/Hotline/DataSharing/Province/XieTong/Receive/DsSendCaseEvlResult.cs

@@ -1,55 +0,0 @@
-using SqlSugar;
-using System.ComponentModel;
-using XF.Domain.Repository;
-
-namespace Hotline.DataSharing.Province.XieTong.Receive
-{
-    /// <summary>
-    /// 交办工单满意度接收
-    /// </summary>
-    [Description("交办工单满意度接收")]
-    public class DsSendCaseEvlResult : CreationModificationEntity
-    {
-        /// <summary>
-        /// 评价时间
-        /// </summary>
-        [SugarColumn(ColumnDescription = "评价时间")]
-        public DateTime? ReplyTime { get; set; }
-
-        /// <summary>
-        /// 评价内容
-        /// </summary>
-        [SugarColumn(ColumnDescription = "评价内容", ColumnDataType = "text")]
-        public string ReplyContent { get; set; }
-
-        /// <summary>
-        /// 结果满意度
-        /// </summary>
-        [SugarColumn(ColumnDescription = "结果满意度", ColumnDataType = "varchar(2)")]
-        public string ResultEvl { get; set; }
-
-        /// <summary>
-        /// 作风满意度
-        /// </summary>
-        [SugarColumn(ColumnDescription = "作风满意度", ColumnDataType = "varchar(2)")]
-        public string StyleEvl { get; set; }
-
-        /// <summary>
-        /// 服务工单编号  
-        /// </summary>
-        [SugarColumn(ColumnDescription = "服务工单编号", ColumnDataType = "varchar(50)")]
-        public string CaseSerial { get; set; }
-
-        /// <summary>
-        /// 行政区划代码
-        /// </summary>
-        [SugarColumn(ColumnDescription = "行政区划代码", ColumnDataType = "varchar(24)")]
-        public string AreaCode { get; set; }
-
-        /// <summary>
-        /// 同步状态 0：待同步；	  1：同步成功；	 2：同步失败；
-        /// </summary>
-        [SugarColumn(ColumnDescription = "同步状态", ColumnDataType = "varchar(1)", IsNullable = true)]
-        public string SyncState { get; set; } = "1";
-    }
-}

src/Hotline/DataSharing/Province/XieTong/Receive/DsSendSuperviseInfo.cs

@@ -1,85 +0,0 @@
-using SqlSugar;
-using System.ComponentModel;
-using XF.Domain.Repository;
-
-namespace Hotline.DataSharing.Province.XieTong.Receive
-{
-    /// <summary>
-    /// 督办工单派发
-    /// </summary>
-    [Description("督办工单派发")]
-    public class DsSendSuperviseInfo : CreationModificationEntity
-    {
-        /// <summary>
-        /// 督办编号
-        /// </summary>
-        [SugarColumn(ColumnDescription = "督办编号", ColumnDataType = "varchar(50)")]
-        public string SuperviseSerial { get; set; }
-
-        /// <summary>
-        /// 服务工单编号
-        /// </summary>
-        [SugarColumn(ColumnDescription = "服务工单编号", ColumnDataType = "varchar(50)", IsNullable = true)]
-        public string CaseSerial { get; set; }
-
-        /// <summary>
-        /// 督办标题
-        /// </summary>
-        [SugarColumn(ColumnDescription = "督办标题", ColumnDataType = "varchar(50)")]
-        public string SuperviseTitle { get; set; }
-
-        /// <summary>
-        /// 督办内容
-        /// </summary>
-        [SugarColumn(ColumnDescription = "督办内容", ColumnDataType = "text")]
-        public string SuperviseContent { get; set; }
-
-        /// <summary>
-        /// 督办发起人
-        /// </summary>
-        [SugarColumn(ColumnDescription = "督办发起人", ColumnDataType = "varchar(50)")]
-        public string SupervisePerson { get; set; }
-
-        /// <summary>
-        /// 督办发起时间
-        /// </summary>
-        [SugarColumn(ColumnDescription = "督办发起时间")]
-        public DateTime? SuperviseTime { get; set; }
-
-        /// <summary>
-        /// 督办发起单位
-        /// </summary>
-        [SugarColumn(ColumnDescription = "督办发起单位", ColumnDataType = "varchar(200)")]
-        public string SuperviseSendDept { get; set; }
-
-        /// <summary>
-        /// 被督办单位
-        /// </summary>
-        [SugarColumn(ColumnDescription = "被督办单位", ColumnDataType = "varchar(200)")]
-        public string SuperviseRsvDept { get; set; }
-
-        /// <summary>
-        /// 督办类型
-        /// </summary>
-        [SugarColumn(ColumnDescription = "督办类型", ColumnDataType = "varchar(10)")]
-        public string SuperviseType { get; set; }
-
-        /// <summary>
-        /// 督办反馈截止时间
-        /// </summary>
-        [SugarColumn(ColumnDescription = "督办反馈截止时间")]
-        public DateTime? SuperviseReturnDate { get; set; }
-
-        /// <summary>
-        /// 行政区划代码
-        /// </summary>
-        [SugarColumn(ColumnDescription = "行政区划代码", ColumnDataType = "varchar(24)")]
-        public string AreaCode { get; set; }
-
-        /// <summary>
-        /// 材料标识
-        /// </summary>
-        [SugarColumn(ColumnDescription = "督办类型", ColumnDataType = "varchar(50)")]
-        public string CliengGuid { get; set; }
-    }
-}

src/Hotline/DataSharing/Province/XieTong/Receive/DsSendWarnInfo.cs

@@ -1,67 +0,0 @@
-using SqlSugar;
-using System.ComponentModel;
-using XF.Domain.Repository;
-
-namespace Hotline.DataSharing.Province.XieTong.Receive
-{
-    /// <summary>
-    /// 服务工单预警
-    /// </summary>
-    [Description("服务工单预警")]
-    public class DsSendWarnInfo : CreationModificationEntity
-    {
-        /// <summary>
-        /// 预警规则
-        /// </summary>
-        [SugarColumn(ColumnDescription = "预警规则", ColumnDataType = "varchar(50)")]
-        public string WarnRulename { get; set; }
-
-        /// <summary>
-        /// 规则明细
-        /// </summary>
-        [SugarColumn(ColumnDescription = "规则明细", ColumnDataType = "varchar(200)")]
-        public string WarnDescribe { get; set; }
-
-        /// <summary>
-        /// 预警应处理时间
-        /// </summary>
-        [SugarColumn(ColumnDescription = "预警应处理时间")]
-        public DateTime? WarnTimebf { get; set; }
-
-        /// <summary>
-        /// 预警等级
-        /// </summary>
-        [SugarColumn(ColumnDescription = "预警等级", ColumnDataType = "varchar(50)")]
-        public string WarnDegree { get; set; }
-
-        /// <summary>
-        /// 预警类型
-        /// </summary>
-        [SugarColumn(ColumnDescription = "预警类型", ColumnDataType = "varchar(50)")]
-        public string WarnType { get; set; }
-
-        /// <summary>
-        /// 预警时间
-        /// </summary>
-        [SugarColumn(ColumnDescription = "预警时间")]
-        public DateTime? WarnDate { get; set; }
-
-        /// <summary>
-        /// 服务工单编号  
-        /// </summary>
-        [SugarColumn(ColumnDescription = "服务工单编号", ColumnDataType = "varchar(50)")]
-        public string CaseSerial { get; set; }
-
-        /// <summary>
-        /// 行政区划代码
-        /// </summary>
-        [SugarColumn(ColumnDescription = "行政区划代码", ColumnDataType = "varchar(24)")]
-        public string AreaCode { get; set; }
-
-        /// <summary>
-        /// 同步状态 0：待同步；	  1：同步成功；	 2：同步失败；
-        /// </summary>
-        [SugarColumn(ColumnDescription = "同步状态", ColumnDataType = "varchar(1)", IsNullable = true)]
-        public string SyncState { get; set; } = "1";
-    }
-}

src/Hotline/DataSharing/Province/XieTong/Receive/DsSupplyCaseInfo.cs

@@ -1,55 +0,0 @@
-using SqlSugar;
-using System.ComponentModel;
-using XF.Domain.Repository;
-
-namespace Hotline.DataSharing.Province.XieTong.Receive
-{
-    /// <summary>
-    /// 服务工单交办补充诉求
-    /// </summary>
-    [Description("服务工单交办补充诉求")]
-    public class DsSupplyCaseInfo : CreationModificationEntity
-    {
-        /// <summary>
-        /// 补充人员
-        /// </summary>
-        [SugarColumn(ColumnDescription = "补充人员", ColumnDataType = "varchar(200)")]
-        public string SupplyName { get; set; }
-
-        /// <summary>
-        /// 补充时间
-        /// </summary>
-        [SugarColumn(ColumnDescription = "补充时间")]
-        public DateTime? SupplyTime { get; set; }
-
-        /// <summary>
-        /// 补充内容
-        /// </summary>
-        [SugarColumn(ColumnDescription = "补充内容", ColumnDataType = "text")]
-        public string SupplyContent { get; set; }
-
-        /// <summary>
-        /// 材料标识
-        /// </summary>
-        [SugarColumn(ColumnDescription = "材料标识", ColumnDataType = "varchar(50)")]
-        public string CliengGuid { get; set; }
-
-        /// <summary>
-        /// 服务工单编号  
-        /// </summary>
-        [SugarColumn(ColumnDescription = "服务工单编号", ColumnDataType = "varchar(50)")]
-        public string CaseSerial { get; set; }
-
-        /// <summary>
-        /// 行政区划代码
-        /// </summary>
-        [SugarColumn(ColumnDescription = "行政区划代码", ColumnDataType = "varchar(24)")]
-        public string AreaCode { get; set; }
-
-        /// <summary>
-        /// 同步状态 0：待同步；	  1：同步成功；	 2：同步失败；
-        /// </summary>
-        [SugarColumn(ColumnDescription = "同步状态", ColumnDataType = "varchar(1)", IsNullable = true)]
-        public string SyncState { get; set; } = "1";
-    }
-}