|
@@ -276,7 +276,7 @@ namespace DataSharing.Host.Controllers
|
|
|
//转换数据
|
|
|
var dto = receiveBackResult.paras;
|
|
|
|
|
|
- var data = await _getCaseBackApplyRepository.GetAsync(p => p.CaseSerial == dto.CaseSerial, HttpContext.RequestAborted);
|
|
|
+ var data = await _getCaseBackApplyRepository.GetAsync(p => p.CaseSerial == dto.CaseSerial && p.IsFeedBack == false, HttpContext.RequestAborted);
|
|
|
if (data == null)
|
|
|
return OpenResponse.Ok(GetDataBaseReponse<string>.Failed("接口调用失败!"));
|
|
|
|
|
@@ -299,6 +299,9 @@ namespace DataSharing.Host.Controllers
|
|
|
//向业务系统推送消息
|
|
|
await _capPublisher.PublishAsync(Hotline.Share.Mq.EventNames.SharingOrderReturnFeedback, dataBack, cancellationToken: HttpContext.RequestAborted);
|
|
|
|
|
|
+ data.IsFeedBack = true;
|
|
|
+ await _getCaseBackApplyRepository.UpdateAsync(data, HttpContext.RequestAborted);
|
|
|
+
|
|
|
return OpenResponse.Ok(GetDataBaseReponse<string>.Success("您已成功提交数据!"));
|
|
|
}
|
|
|
else
|
|
@@ -524,21 +527,17 @@ namespace DataSharing.Host.Controllers
|
|
|
|
|
|
if (!string.IsNullOrEmpty(id))
|
|
|
{
|
|
|
- //向业务系统推送消息
|
|
|
- var dataOrder = await _dataOrderRepository.GetAsync(p => p.ProvinceNo == dto.CaseSerial, HttpContext.RequestAborted);
|
|
|
- if (dataOrder != null)
|
|
|
+ var listFiles = await GetFileData(dto.CliengGuid, dto.CaseSerial, "工单补充");
|
|
|
+ AddOrderComplementDto complementDto = new AddOrderComplementDto
|
|
|
{
|
|
|
- var listFiles = await GetFileData(dto.CliengGuid, dto.CaseSerial, "工单补充");
|
|
|
- AddOrderComplementDto complementDto = new AddOrderComplementDto
|
|
|
- {
|
|
|
- Opinion = dto.SupplyContent,
|
|
|
- OrderId = dataOrder.OrderId,
|
|
|
- DsBisId = dto.CliengGuid,
|
|
|
- Files = listFiles
|
|
|
- };
|
|
|
- //向业务系统推送消息
|
|
|
- await _capPublisher.PublishAsync(Hotline.Share.Mq.EventNames.SharingOrderSupplements, complementDto, cancellationToken: HttpContext.RequestAborted);
|
|
|
- }
|
|
|
+ DsBisId = dto.CaseSerial,
|
|
|
+ SupplyName = dto.SupplyName,
|
|
|
+ SupplyTime = dto.SupplyTime,
|
|
|
+ Opinion = dto.SupplyContent,
|
|
|
+ Files = listFiles
|
|
|
+ };
|
|
|
+ //向业务系统推送消息
|
|
|
+ await _capPublisher.PublishAsync(Hotline.Share.Mq.EventNames.SharingOrderSupplements, complementDto, cancellationToken: HttpContext.RequestAborted);
|
|
|
|
|
|
return OpenResponse.Ok(GetDataBaseReponse<string>.Success("您已成功提交数据!"));
|
|
|
|