src/DataSharing.Host/Controllers/Police110/PoliceDCJTController.cs

@@ -712,40 +712,41 @@ namespace DataSharing.Host.Controllers.Police110
         {
             var orderData = await _dsOrderRepository.GetAsync(p => p.ExternalId == policeReceiveChainDealDs.AlarmReceiptNumber);
             if (orderData is null)
-                return;
-
-            //写入对外展示表数据
-            DsReceiveHandleData dsReceive = new()
-            {
-                OrderNo = orderData.OrderNo,
-                Source = "110平台",
-                PlatformsName = "110平台",
-                ReceiveData = System.Text.Json.JsonSerializer.Serialize(policeReceiveChainDealDs)
-            };
-            if (policeReceiveChainDealDs.DisposalType == "1")//正常办理
-            {
-                dsReceive.OperationType = "110推送办理结果";
-                dsReceive.Opinion = policeReceiveChainDealDs.DisposalSituation;
-            }
-            else if (policeReceiveChainDealDs.DisposalType == "2")//退回 
-            {
-                dsReceive.OperationType = "110退回";
-                dsReceive.Opinion = policeReceiveChainDealDs.ReturnOpinion;
-            }
-            else if (policeReceiveChainDealDs.DisposalType == "3")//回访 
             {
-                var orgProcessingResults = policeReceiveChainDealDs.VisitResult switch
+                //写入对外展示表数据
+                DsReceiveHandleData dsReceive = new()
                 {
-                    "1" => "非常满意",//非常满意
-                    "2" => "满意",//满意
-                    "3" => "不满意",//不满意
-                    _ => "满意",
+                    OrderNo = orderData.OrderNo,
+                    Source = "110平台",
+                    PlatformsName = "110平台",
+                    ReceiveData = System.Text.Json.JsonSerializer.Serialize(policeReceiveChainDealDs)
                 };
-                dsReceive.OperationType = "110回访内容";
-                dsReceive.Opinion = "回访时间：" + policeReceiveChainDealDs.RevisitTime + "/br回访内容：" + policeReceiveChainDealDs.VisitContent + "/br回访方式：人工回访/br满意度" + orgProcessingResults;
-            }
+                if (policeReceiveChainDealDs.DisposalType == "1")//正常办理
+                {
+                    dsReceive.OperationType = "110推送办理结果";
+                    dsReceive.Opinion = policeReceiveChainDealDs.DisposalSituation;
+                }
+                else if (policeReceiveChainDealDs.DisposalType == "2")//退回 
+                {
+                    dsReceive.OperationType = "110退回";
+                    dsReceive.Opinion = policeReceiveChainDealDs.ReturnOpinion;
+                }
+                else if (policeReceiveChainDealDs.DisposalType == "3")//回访 
+                {
+                    var orgProcessingResults = policeReceiveChainDealDs.VisitResult switch
+                    {
+                        "1" => "非常满意",//非常满意
+                        "2" => "满意",//满意
+                        "3" => "不满意",//不满意
+                        _ => "满意",
+                    };
+                    dsReceive.OperationType = "110回访内容";
+                    dsReceive.Opinion = "回访时间：" + policeReceiveChainDealDs.RevisitTime + "/br回访内容：" + policeReceiveChainDealDs.VisitContent + "/br回访方式：人工回访/br满意度" + orgProcessingResults;
+                }
 
-            await _dsReceiveHandleDataRepository.AddAsync(dsReceive, HttpContext.RequestAborted);
+                await _dsReceiveHandleDataRepository.AddAsync(dsReceive, HttpContext.RequestAborted);
+                return;
+            }
 
             if (policeReceiveChainDealDs.DisposalType == "1")//正常办理
             {

src/DataSharing.Host/Controllers/Police110/PoliceDSController.cs

@@ -691,39 +691,41 @@ namespace DataSharing.Host.Controllers.Police110
         {
             var orderData = await _dsOrderRepository.GetAsync(p => p.ExternalId == policeReceiveChainDealDs.AlarmReceiptNumber);
             if (orderData is null)
-                return;
-            //写入对外展示表数据
-            DsReceiveHandleData dsReceive = new()
-            {
-                OrderNo = orderData.OrderNo,
-                Source = "110平台",
-                PlatformsName = "110平台",
-                ReceiveData = System.Text.Json.JsonSerializer.Serialize(policeReceiveChainDealDs)
-            };
-            if (policeReceiveChainDealDs.DisposalType == 1)//正常办理
-            {
-                dsReceive.OperationType = "110推送办理结果";
-                dsReceive.Opinion = policeReceiveChainDealDs.DisposalSituation;
-            }
-            else if (policeReceiveChainDealDs.DisposalType == 2)//退回 
-            {
-                dsReceive.OperationType = "110退回";
-                dsReceive.Opinion = policeReceiveChainDealDs.ReturnOpinion;
-            }
-            else if (policeReceiveChainDealDs.DisposalType == 3)//回访 
             {
-                var orgProcessingResults = policeReceiveChainDealDs.VisitResult switch
+                //写入对外展示表数据
+                DsReceiveHandleData dsReceive = new()
                 {
-                    "1" => "非常满意",//非常满意
-                    "2" => "满意",//满意
-                    "3" => "不满意",//不满意
-                    _ => "满意",
+                    OrderNo = orderData.OrderNo,
+                    Source = "110平台",
+                    PlatformsName = "110平台",
+                    ReceiveData = System.Text.Json.JsonSerializer.Serialize(policeReceiveChainDealDs)
                 };
-                dsReceive.OperationType = "110回访内容";
-                dsReceive.Opinion = "回访时间：" + policeReceiveChainDealDs.RevisitTime + "/br回访内容：" + policeReceiveChainDealDs.VisitContent + "/br回访方式：人工回访/br满意度" + orgProcessingResults;
-            }
+                if (policeReceiveChainDealDs.DisposalType == 1)//正常办理
+                {
+                    dsReceive.OperationType = "110推送办理结果";
+                    dsReceive.Opinion = policeReceiveChainDealDs.DisposalSituation;
+                }
+                else if (policeReceiveChainDealDs.DisposalType == 2)//退回 
+                {
+                    dsReceive.OperationType = "110退回";
+                    dsReceive.Opinion = policeReceiveChainDealDs.ReturnOpinion;
+                }
+                else if (policeReceiveChainDealDs.DisposalType == 3)//回访 
+                {
+                    var orgProcessingResults = policeReceiveChainDealDs.VisitResult switch
+                    {
+                        "1" => "非常满意",//非常满意
+                        "2" => "满意",//满意
+                        "3" => "不满意",//不满意
+                        _ => "满意",
+                    };
+                    dsReceive.OperationType = "110回访内容";
+                    dsReceive.Opinion = "回访时间：" + policeReceiveChainDealDs.RevisitTime + "/br回访内容：" + policeReceiveChainDealDs.VisitContent + "/br回访方式：人工回访/br满意度" + orgProcessingResults;
+                }
 
-            await _dsReceiveHandleDataRepository.AddAsync(dsReceive, HttpContext.RequestAborted);
+                await _dsReceiveHandleDataRepository.AddAsync(dsReceive, HttpContext.RequestAborted);
+                return;
+            }
 
             if (policeReceiveChainDealDs.DisposalType == 1)//正常办理
             {

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

@@ -146,18 +146,22 @@ namespace DataSharing.Host.Controllers.YiBin
 
             var id = await _dsReceiveEnterpriseDataRepository.AddAsync(data, HttpContext.RequestAborted);
             var order = await _dataOrderRepository.GetAsync(p => p.OrderNo == dto.ReplyCode, HttpContext.RequestAborted);
-
-            //写入对外展示表数据
-            DsReceiveHandleData dsReceive = new()
+            if (order == null)
             {
-                OrderNo = dto.ReplyCode,
-                Source = "企业专班",
-                PlatformsName = "企业专班",
-                ReceiveData = System.Text.Json.JsonSerializer.Serialize(dto),
-                OperationType = dto.ReplyResultType == 2 ? "工单退回" : dto.ReplyResultType == 1 ? "办理完成" : "办理中",
-                Opinion = dto.ReplyContent
-            };
-            await _dsReceiveHandleDataRepository.AddAsync(dsReceive, HttpContext.RequestAborted);
+                //写入对外展示表数据
+                DsReceiveHandleData dsReceive = new()
+                {
+                    OrderNo = dto.ReplyCode,
+                    Source = "企业专班",
+                    PlatformsName = "企业专班",
+                    ReceiveData = System.Text.Json.JsonSerializer.Serialize(dto),
+                    OperationType = dto.ReplyResultType == 2 ? "工单退回" : dto.ReplyResultType == 1 ? "办理完成" : "办理中",
+                    Opinion = dto.ReplyContent
+                };
+                await _dsReceiveHandleDataRepository.AddAsync(dsReceive, HttpContext.RequestAborted);
+                //这里往业务系统推送数据
+                return OpenResponse.Ok(EnterpriseDeResponse.Success("回复提交成功"));
+            }
 
             List<FileDto> Files = new();
             if (dto.ReplyFiles != null && dto.ReplyFiles.Count > 0)