|
|
@@ -2,7 +2,6 @@
|
|
|
using DataSharing.Police110.DaoShu110;
|
|
|
using DataSharing.Police110.DCJT110;
|
|
|
using DataSharing.Police110.Encryption;
|
|
|
-using DataSharing.Province;
|
|
|
using DataSharing.RawData;
|
|
|
using DataSharing.Share.Dtos;
|
|
|
using DataSharing.Share.Dtos.HotlineSetting;
|
|
|
@@ -12,7 +11,6 @@ using DataSharing.Share.Dtos.Police110.DCJT110;
|
|
|
using DataSharing.Share.Enums;
|
|
|
using DotNetCore.CAP;
|
|
|
using Hotline.Share.Dtos.DataSharing.PusherHotlineDto;
|
|
|
-using Hotline.Share.Enums.DataSharing;
|
|
|
using Hotline.Share.Enums.Order;
|
|
|
using MapsterMapper;
|
|
|
using MediatR;
|
|
|
@@ -300,8 +298,8 @@ namespace DataSharing.Host.Controllers.Police110
|
|
|
var data = JsonConvert.DeserializeObject<ChainDeal_DCJTNewDto>(jsonRes);
|
|
|
jsonRes = JsonConvert.SerializeObject(data);
|
|
|
}
|
|
|
- // json 转 实体类
|
|
|
- chainDeal = System.Text.Json.JsonSerializer.Deserialize<ChainDeal_DCJT>(jsonRes);
|
|
|
+ // json 转 实体类
|
|
|
+ chainDeal = System.Text.Json.JsonSerializer.Deserialize<ChainDeal_DCJT>(jsonRes);
|
|
|
|
|
|
_logger.LogInformation("base64String---------" + base64String);
|
|
|
await InitRawData("service/api/dcjt/110To12345/chainDeal", base64String, jsonRes, chainDeal?.AlarmReceiptNumber);
|
|
|
@@ -784,8 +782,8 @@ namespace DataSharing.Host.Controllers.Police110
|
|
|
/// <returns></returns>
|
|
|
private async Task InitChainDeal(ChainDeal_DCJT policeReceiveChainDealDs)
|
|
|
{
|
|
|
- var orderData = await _dsOrderRepository.GetAsync(p => p.ExternalId == policeReceiveChainDealDs.AlarmReceiptNumber);
|
|
|
- if (orderData is null)
|
|
|
+ var checkDataDeal = await _dsPoliceSendChainAlarmDcjtRepository.GetAsync(p => p.AlarmReceiptNumber == policeReceiveChainDealDs.AlarmReceiptNumber && p.AlarmReceptionType == "0", HttpContext.RequestAborted);
|
|
|
+ if (checkDataDeal is null)
|
|
|
{
|
|
|
//写入对外展示表数据
|
|
|
DsReceiveHandleData dsReceive = new()
|
|
|
@@ -824,9 +822,10 @@ namespace DataSharing.Host.Controllers.Police110
|
|
|
|
|
|
if (policeReceiveChainDealDs.DisposalType == "1")//正常办理
|
|
|
{
|
|
|
+
|
|
|
OrderResultDto orderResultDto = new()
|
|
|
{
|
|
|
- OrderId = orderData.OrderId,
|
|
|
+ OrderId = checkDataDeal.OrderId,
|
|
|
FinishType = "1",
|
|
|
Opinion = policeReceiveChainDealDs.DisposalSituation,
|
|
|
Source = "110"
|
|
|
@@ -837,7 +836,7 @@ namespace DataSharing.Host.Controllers.Police110
|
|
|
{
|
|
|
OrderResultDto orderResultDto = new()
|
|
|
{
|
|
|
- OrderId = orderData.OrderId,
|
|
|
+ OrderId = checkDataDeal.OrderId,
|
|
|
FinishType = "0",
|
|
|
Opinion = policeReceiveChainDealDs.ReturnOpinion,
|
|
|
Source = "110"
|
|
|
@@ -850,7 +849,7 @@ namespace DataSharing.Host.Controllers.Police110
|
|
|
{
|
|
|
ProvinceOrderVisitDto orderVisitDto = new()
|
|
|
{
|
|
|
- ProvinceNo = orderData.ProvinceNo,
|
|
|
+ ProvinceNo = checkDataDeal.OrderId,
|
|
|
VisitTime = Convert.ToDateTime(policeReceiveChainDealDs.RevisitTime),
|
|
|
VisitContent = policeReceiveChainDealDs.VisitContent,
|
|
|
// OrgProcessingResults = policeReceiveChainDealDs.VisitResult,
|
tangjiang