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

@@ -852,8 +852,8 @@ namespace Hotline.Api.Controllers.DataSharing
                     AreaCode = tmpCaseMaterialInfo.AreaCode,
                     FileName = file.FileName,
                     FileSize = file.Length,
-                    Additions = businessFileDto.path,
-                    FileId = businessFileDto.id,
+                    Additions = businessFileDto.id,
+                    Path = businessFileDto.path,
                     Direction = "2",
                     SyncState = "1"
                 };

src/Hotline.Share/Dtos/DataSharing/Enterprise/EnterpriseResponse.cs

@@ -47,7 +47,6 @@ namespace Sharing.Share.Dtos.DataSharing.Enterprise
         /// <summary>
         /// 成功
         /// </summary>
-        /// <param name="data"></param>
         /// <param name="description"></param>
         /// <returns></returns>
         public static EnterpriseDeResponse Success(string? description = "")

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

@@ -948,6 +948,21 @@ namespace Hotline.DataSharing.Province.Services
                 default:
                     break;
             }
+
+            //将未接通未做评价的默认为满意
+            switch (dto.SubjectResultSatifyCode)
+            {
+                case "1":
+                case "2":
+                case "3":
+                case "4":
+                case "5":
+                    break;
+                default:
+                    dto.SubjectResultSatifyCode = "3";
+                    break;
+            }
+
             //如果省上下来的工单走服务工单交办评价接口,不是省上派下来的工单,走服务工单评价接口
             if (dto.Order.IsProvince && dto.Order.Source == ESource.ProvinceStraight)
             {
@@ -975,16 +990,7 @@ namespace Hotline.DataSharing.Province.Services
                 data.Id = await _submitVisitInfoRepository.AddAsync(data, cancellationToken);
 
                 //将待推送数据写入待推送表
-                DsWaitingPushData pushData = new()
-                {
-                    ServiceInterface = "SubmitVisitInfo",
-                    Data = System.Text.Json.JsonSerializer.Serialize(data),
-                    Priority = 0,
-                    PushUrl = "submit_visit_info",
-                    Method = HttpMethods.Post,
-                    SyncID = data.Id
-                };
-                await _waitingPushDataRepository.AddAsync(pushData, cancellationToken);
+                await InitPushData("SubmitVisitInfo", System.Text.Json.JsonSerializer.Serialize(data), "submit_visit_info", data.Id, 0, cancellationToken);
 
                 //组装110数据
                 if (dto.Order.Source == ESource.Police110)
@@ -1637,6 +1643,7 @@ namespace Hotline.DataSharing.Province.Services
                         Key = item.Key,
                         Type = item.Type,
                         Additions = item.Additions,
+                        Path = item.Path,
                         Direction = "1",
                         SyncState = "0"
                     };
@@ -1645,22 +1652,22 @@ namespace Hotline.DataSharing.Province.Services
                     switch (item.Classify)
                     {
                         case "1":
-                            materialInfo.MaterialType = "10";
+                            materialInfo.MaterialType = "10";//受理材料
                             break;
                         case "2":
-                            materialInfo.MaterialType = "20";
+                            materialInfo.MaterialType = "20";//环节材料
                             break;
                         case "3":
-                            materialInfo.MaterialType = "30";
+                            materialInfo.MaterialType = "30";//结果材料
                             break;
                         case "4":
-                            materialInfo.MaterialType = "40";
+                            materialInfo.MaterialType = "40";//回访评价材料
                             break;
                         case "5":
-                            materialInfo.MaterialType = "50";
+                            materialInfo.MaterialType = "50";//督办材料
                             break;
                         case "6":
-                            materialInfo.MaterialType = "60";
+                            materialInfo.MaterialType = "60";//知识库材料
                             break;
                         default:
                             break;
@@ -1715,7 +1722,6 @@ namespace Hotline.DataSharing.Province.Services
             return pwd;
         }
 
-        #endregion
         #endregion
 
         /// <summary>
@@ -1728,7 +1734,7 @@ namespace Hotline.DataSharing.Province.Services
         /// <param name="Priority"></param>
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
-        public async Task InitPushData(string ServiceInterface, string Data, string PushUrl, string SyncID, int Priority, CancellationToken cancellationToken)
+        private async Task InitPushData(string ServiceInterface, string Data, string PushUrl, string SyncID, int Priority, CancellationToken cancellationToken)
         {
             //将待推送数据写入待推送表
             DsWaitingPushData pushData = new()
@@ -1742,5 +1748,8 @@ namespace Hotline.DataSharing.Province.Services
             };
             await _waitingPushDataRepository.AddAsync(pushData, cancellationToken);
         }
+        #endregion
+
+
     }
 }

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

@@ -1217,7 +1217,7 @@ namespace Hotline.DataSharing.Province.Services
                 var dataReceive = _mapper.Map<GetCaseMaterialInfoModel>(item);
 
                 //附件上传
-                var result = await SendFileData(dataReceive, item.FileName, item.FileId, cancellationToken);
+                var result = await SendFileData(dataReceive, item.FileName, item.Additions, cancellationToken);
                 if (result != null && result.ReturnInfo != null)
                 {
                     //结果处理
@@ -1335,10 +1335,9 @@ namespace Hotline.DataSharing.Province.Services
                 return Newtonsoft.Json.JsonConvert.DeserializeObject<ProvinceResponse>(strResult);
             }
             catch (Exception)
-            { }
-
-            return Newtonsoft.Json.JsonConvert.DeserializeObject<ProvinceResponse>("");
-
+            {
+                return new ProvinceResponse();
+            }
         }
 
         /// <summary>

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

@@ -35,12 +35,6 @@ namespace Hotline.DataSharing.Province.XieTong.Receive
         [SugarColumn(ColumnDescription = "附件名称", ColumnDataType = "varchar(100)")]
         public string? FileName { get; set; }
 
-        /// <summary>
-        /// 附件Id
-        /// </summary>
-        [SugarColumn(ColumnDescription = "附件Id", ColumnDataType = "varchar(50)")]
-        public string? FileId { get; set; }
-
         /// <summary>
         /// 附件大小
         /// </summary>
@@ -65,6 +59,12 @@ namespace Hotline.DataSharing.Province.XieTong.Receive
 		[SugarColumn(ColumnDescription = "附件")]
         public string? Additions { get; set; }
 
+        /// <summary>
+		/// 附件路径
+		/// </summary>
+		[SugarColumn(ColumnDescription = "附件路径")]
+        public string? Path { get; set; }
+
         /// <summary>
         /// 同步方向 1：市州数据向省上推送；	2：省上数据向市州推送；
         /// </summary>