src/Sharing.Api/Controllers/HotlineMessageReceiveController.cs

@@ -427,16 +427,6 @@ namespace Sharing.Api.Controllers
             }
         }
 
-        #endregion
-
-
-
-
-
-
-
-
-
         /// <summary>
         ///热线工单归档---服务工单结果
         /// </summary>
@@ -462,6 +452,8 @@ namespace Sharing.Api.Controllers
 
         }
 
+        #endregion
+
 
         /// <summary>
         /// 挂电话推送----电话记录
@@ -606,30 +598,32 @@ namespace Sharing.Api.Controllers
             };
 
             //处理受理类型
-            switch (dto.AcceptType)
-            {
-                case EAcceptType.Consult:
-                    sendCaseInfo.CaseType = "10";
-                    break;
-                case EAcceptType.Suggest:
-                    sendCaseInfo.CaseType = "15";
-                    break;
-                case EAcceptType.SeekHelp:
-                    sendCaseInfo.CaseType = "20";
-                    break;
-                case EAcceptType.Praise:
-                    sendCaseInfo.CaseType = "25";
-                    break;
-                case EAcceptType.Report:
-                    sendCaseInfo.CaseType = "30";
-                    break;
-                case EAcceptType.Complain:
-                    sendCaseInfo.CaseType = "35";
-                    break;
-                case EAcceptType.Other:
-                    sendCaseInfo.CaseType = "40";
-                    break;
-            }
+            //switch (dto.AcceptType)
+            //{
+            //    case EAcceptType.Consult:
+            //        sendCaseInfo.CaseType = "10";
+            //        break;
+            //    case EAcceptType.Suggest:
+            //        sendCaseInfo.CaseType = "15";
+            //        break;
+            //    case EAcceptType.SeekHelp:
+            //        sendCaseInfo.CaseType = "20";
+            //        break;
+            //    case EAcceptType.Praise:
+            //        sendCaseInfo.CaseType = "25";
+            //        break;
+            //    case EAcceptType.Report:
+            //        sendCaseInfo.CaseType = "30";
+            //        break;
+            //    case EAcceptType.Complain:
+            //        sendCaseInfo.CaseType = "35";
+            //        break;
+            //    case EAcceptType.Other:
+            //        sendCaseInfo.CaseType = "40";
+            //        break;
+            //}
+
+            sendCaseInfo.CaseType = dto.AcceptTypeCode;
 
             //处理紧急程度
             sendCaseInfo.CaseIsUrgent = dto.EmergencyLevel switch

src/Sharing.Api/ProvinceService.cs

@@ -156,33 +156,35 @@ namespace Sharing.Api
             }
 
             //处理受理类型
-            switch (dto.AcceptType)
-            {
-                case EAcceptType.Consult:
-                    submitCaseInfo.CaseType = "10";
-                    break;
-                case EAcceptType.Suggest:
-                    submitCaseInfo.CaseType = "15";
-                    break;
-                case EAcceptType.SeekHelp:
-                    submitCaseInfo.CaseType = "20";
-                    break;
-                case EAcceptType.Praise:
-                    submitCaseInfo.CaseType = "25";
-                    break;
-                case EAcceptType.Report:
-                    submitCaseInfo.CaseType = "30";
-                    break;
-                case EAcceptType.Complain:
-                    submitCaseInfo.CaseType = "35";
-                    break;
-                case EAcceptType.Other:
-                    submitCaseInfo.CaseType = "40";
-                    break;
-                default:
-                    submitCaseInfo.CaseType = "40";
-                    break;
-            }
+            //switch (dto.AcceptType)
+            //{
+            //    case EAcceptType.Consult:
+            //        submitCaseInfo.CaseType = "10";
+            //        break;
+            //    case EAcceptType.Suggest:
+            //        submitCaseInfo.CaseType = "15";
+            //        break;
+            //    case EAcceptType.SeekHelp:
+            //        submitCaseInfo.CaseType = "20";
+            //        break;
+            //    case EAcceptType.Praise:
+            //        submitCaseInfo.CaseType = "25";
+            //        break;
+            //    case EAcceptType.Report:
+            //        submitCaseInfo.CaseType = "30";
+            //        break;
+            //    case EAcceptType.Complain:
+            //        submitCaseInfo.CaseType = "35";
+            //        break;
+            //    case EAcceptType.Other:
+            //        submitCaseInfo.CaseType = "40";
+            //        break;
+            //    default:
+            //        submitCaseInfo.CaseType = "40";
+            //        break;
+            //}
+
+            submitCaseInfo.CaseType = dto.AcceptTypeCode;
 
             //处理紧急程度
             switch (dto.EmergencyLevel)
@@ -198,6 +200,11 @@ namespace Sharing.Api
                     break;
             }
 
+            if (string.IsNullOrEmpty(submitCaseInfo.CaseSerial))
+            {
+                submitCaseInfo.CaseSerial = dto.No;
+            }
+
             submitCaseInfo.Id = await _submitCaseInfoRepository.AddAsync(submitCaseInfo);
 
             //需要判断是否需要往110推送
@@ -235,6 +242,7 @@ namespace Sharing.Api
                 default:
                     break;
             }
+            data.CaseSerial = dto.Order.No;
             //将上报信息写入本地库
             data.Id = await _submitVisitInfoRepository.AddAsync(data);
 
@@ -245,7 +253,8 @@ namespace Sharing.Api
                 Data = System.Text.Json.JsonSerializer.Serialize(data),
                 Priority = 0,
                 PushUrl = "submit_visit_info",
-                Method = HttpMethods.Post
+                Method = HttpMethods.Post,
+                SyncID=data.Id
             };
             await _waitingPushDataRepository.AddAsync(pushData);
 
@@ -261,7 +270,7 @@ namespace Sharing.Api
                         RevisitTime = dto.VisitTime,
                         CheckingContent = dto.VisitRemark,
                         VisitContent = dto.VisitRemark,
-                        //  VisitResult = SubjectResultSatifyCode,
+                        VisitResult = dto.SubjectResultSatifyCode + "",
                         DisposalType = 3
                     };
                     await _policeSendChainDealDsRepository.AddAsync(checkData);
@@ -272,7 +281,7 @@ namespace Sharing.Api
                     checkData.RevisitTime = dto.VisitTime;
                     checkData.CheckingContent = dto.VisitRemark;
                     checkData.VisitContent = dto.VisitRemark;
-                    //  checkData.VisitResult = SubjectResultSatifyCode;
+                    checkData.VisitResult = dto.SubjectResultSatifyCode + "";
                     await _policeSendChainDealDsRepository.UpdateAsync(checkData);
                 }
 
@@ -299,7 +308,8 @@ namespace Sharing.Api
                 Data = System.Text.Json.JsonSerializer.Serialize(data),
                 Priority = 0,
                 PushUrl = "submit_case_process",
-                Method = HttpMethods.Post
+                Method = HttpMethods.Post,
+                SyncID = data.Id
             };
             await _waitingPushDataRepository.AddAsync(pushData);
 
@@ -326,7 +336,8 @@ namespace Sharing.Api
                 Data = System.Text.Json.JsonSerializer.Serialize(data),
                 Priority = 0,
                 PushUrl = "submit_case_result",
-                Method = HttpMethods.Post
+                Method = HttpMethods.Post,
+                SyncID = data.Id
             };
             await _waitingPushDataRepository.AddAsync(pushData);
 
@@ -446,16 +457,16 @@ namespace Sharing.Api
                     break;
                 case "scjgj"://12315个性化表单
                     //转换数据
-                    switch (dto.AcceptType)
+                    switch (dto.AcceptTypeCode)
                     {
-                        case EAcceptType.Consult:
+                        case "10":
                             dtoscjgj.Rqsttypy = "10";
                             break;
-                        case EAcceptType.Report:
+                        case "30":
                             dtoscjgj = _mapper.Map<FormMarket>(dto.OrderReport);
                             dtoscjgj.Rqsttypy = "25";
                             break;
-                        case EAcceptType.Complain:
+                        case "35":
                             dtoscjgj = _mapper.Map<FormMarket>(dto.OrderComplain);
                             dtoscjgj.Rqsttypy = "20";
                             string str = "";
@@ -533,6 +544,12 @@ namespace Sharing.Api
                 CallPoliceAddress = CaseAddress,
                 OrderId = orderDto.Id
             };
+
+            if (string.IsNullOrEmpty(policeSend.AlarmReceiptNumber))
+            {
+                policeSend.AlarmReceiptNumber = orderDto.No;
+                policeSend.SerialNumber = orderDto.No;
+            }
             //查询是否有此工单，如果没有新增此工单
             var data = await _policeSendChainAlarmDsRepository.GetAsync(p => p.OrderId == orderDto.Id);
             if (data == null)

src/Sharing.Application/Mappers/MapperConfigs.cs

@@ -63,10 +63,13 @@ namespace Sharing.Application.Mappers
             //服务工单回访评价
             config.ForType<PublishVisitDto, SubmitVisitInfo>()
             .Map(d => d.CaseSerial, x => x.Order.ToProvinceNo)
+            .Map(d=>d.SubjectResultSatify,x=>x.SubjectResultSatifyCode)
+            .Map(d=>d.FirstSatisfaction,x=>x.FirstSatisfactionCode)
             ;
             //服务工单交办评价
             config.ForType<PublishVisitDto, GetVisitInfoReceive>()
             .Map(d => d.CaseSerial, x => x.Order.FromProvinceNo)
+            .Map(d => d.SubjectResultSatify, x => x.SubjectResultSatifyCode)
             ;
 
             //汇聚扩展数据--投诉

src/Sharing.Application/Sharing.Application.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Hotline.Share" Version="1.0.16" />
+    <PackageReference Include="Hotline.Share" Version="1.0.17" />
     <PackageReference Include="XF.EasyCaching" Version="1.0.0" />
   </ItemGroup>
 

src/Sharing.DaoShu110/Controllers/PoliceDSController.cs

@@ -7,7 +7,6 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Sharing.DaoShu110.Dtos;
 using Sharing.DaoShu110.Extensions;
-using Sharing.Province.HuiJu.Send;
 using Sharing.Province.XieTong.Knowledge;
 using Sharing.Share.Dtos;
 using Sharing.WebCore;
@@ -661,7 +660,7 @@ namespace Sharing.DaoShu110.Controllers
                 {
                     VisitTime = policeReceiveChainDealDs.RevisitTime,
                     VisitRemark = policeReceiveChainDealDs.VisitContent,
-                    SubjectResultSatifyCode = policeReceiveChainDealDs.VisitResult,
+                    SubjectResultSatifyCode =Convert.ToInt32(policeReceiveChainDealDs.VisitResult),
                     VisitType = EVisitType.ArtificialVisit
                 };
                 publishVisitDto.Order.No110 = policeReceiveChainDealDs.AlarmReceiptNumber;

src/Sharing.Province/Controllers/ReceiveController.cs

@@ -180,31 +180,33 @@ namespace Sharing.Province.Controllers
                     break;
             }
 
-            //处理受理类型
-            switch (dto.CaseType)
-            {
-                case "10":
-                    data.AcceptType = EAcceptType.Consult;
-                    break;
-                case "15":
-                    data.AcceptType = EAcceptType.Suggest;
-                    break;
-                case "20":
-                    data.AcceptType = EAcceptType.SeekHelp;
-                    break;
-                case "25":
-                    data.AcceptType = EAcceptType.Praise;
-                    break;
-                case "30":
-                    data.AcceptType = EAcceptType.Report;
-                    break;
-                case "35":
-                    data.AcceptType = EAcceptType.Complain;
-                    break;
-                case "40":
-                    data.AcceptType = EAcceptType.Other;
-                    break;
-            }
+            ////处理受理类型
+            //switch (dto.CaseType)
+            //{
+            //    case "10":
+            //        data.AcceptType = EAcceptType.Consult;
+            //        break;
+            //    case "15":
+            //        data.AcceptType = EAcceptType.Suggest;
+            //        break;
+            //    case "20":
+            //        data.AcceptType = EAcceptType.SeekHelp;
+            //        break;
+            //    case "25":
+            //        data.AcceptType = EAcceptType.Praise;
+            //        break;
+            //    case "30":
+            //        data.AcceptType = EAcceptType.Report;
+            //        break;
+            //    case "35":
+            //        data.AcceptType = EAcceptType.Complain;
+            //        break;
+            //    case "40":
+            //        data.AcceptType = EAcceptType.Other;
+            //        break;
+            //}
+
+            data.AcceptTypeCode = dto.CaseType;
 
             //处理紧急程度
             switch (dto.CaseIsUrgent)

src/Sharing/Province/Other/WaitingPushData.cs

@@ -25,7 +25,7 @@ namespace Sharing.Province.Other
         /// <summary>
         /// 待同步数据ID
         /// </summary>
-        [SugarColumn(ColumnDescription = "待同步数据ID", ColumnDataType = "varchar(30)")]
+        [SugarColumn(ColumnDescription = "待同步数据ID", ColumnDataType = "varchar(50)")]
         public string SyncID { get; set; }
 
         /// <summary>