Merge branch 'master' of http://git.12345lm.cn/Fengwo/hotline

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

@@ -1,13 +1,12 @@
-using DotNetCore.CAP;
-using Hotline.DataSharing;
+using Hotline.DataSharing;
 using Hotline.DataSharing.Province;
-using Hotline.DataSharing.Province.Extend;
 using Hotline.DataSharing.Province.Notifications;
 using Hotline.DataSharing.Province.XieTong.Receive;
 using Hotline.DataSharing.Province.XieTong.Send;
 using Hotline.Share.Dtos.DataSharing;
 using Hotline.Share.Dtos.DataSharing.Province;
 using Hotline.Share.Dtos.DataSharing.Province.XieTong.Receive;
+using Hotline.Share.Dtos.File;
 using Hotline.Share.Dtos.Order;
 using Hotline.Share.Enums.Order;
 using MapsterMapper;
@@ -27,40 +26,17 @@ namespace Hotline.Api.Controllers.DataSharing
         #region 注入
         private readonly IMapper _mapper;
         private readonly IMediator _mediator;
-        private readonly IRepository<DsFormEnvironMent> _formEnvironMentRepository;
-        private readonly IRepository<DsFormTraffic> _formTrafficRepository;
-        private readonly IRepository<DsFormExpressWay> _formExpressWayRepository;
-        private readonly IRepository<DsFormMedical> _formMedicalRepository;
-        private readonly IRepository<DsFormNetWorktec> _formNetWorktecRepository;
-        private readonly IRepository<DsFormPost> _formPostRepository;
-        private readonly IRepository<DsFormReturnexChange> _formReturnexChangeRepository;
-        private readonly IRepository<DsFormShamPub> _formShamPubRepository;
-        private readonly IRepository<DsFormTaxationComplaint> _formTaxationComplaintRepository;
-        private readonly IRepository<DsFormTaxationConsulting> _formTaxationConsultingRepository;
-        private readonly IRepository<DsReceiveCaseExtends> _receiveCaseExtendsRepository;
         private readonly IRepository<DsGetCaseMaterialInfo> _getCaseMaterialInfoRepository;
         private readonly IRepository<DsSendCaseInfo> _sendCaseInfoRepository;
         private readonly IRepository<DsGetCaseBackApply> _getCaseBackApplyRepository;
         private readonly IChannelConfigurationManager _channelConfigurationManager;
         private readonly IRepository<DsReceiveProvinceData> _dsReceiveProvinceDataRepository;
 
-
         /// <summary>
         /// 
         /// </summary>
         /// <param name="mapper"></param>
         /// <param name="mediator"></param>
-        /// <param name="formEnvironMentRepository"></param>
-        /// <param name="formTrafficRepository"></param>
-        /// <param name="formExpressWayRepository"></param>
-        /// <param name="formMedicalRepository"></param>
-        /// <param name="formNetWorktecRepository"></param>
-        /// <param name="formPostRepository"></param>
-        /// <param name="formReturnexChangeRepository"></param>
-        /// <param name="formShamPubRepository"></param>
-        /// <param name="formTaxationComplaintRepository"></param>
-        /// <param name="formTaxationConsultingRepository"></param>
-        /// <param name="receiveCaseExtendsRepository"></param>
         /// <param name="getCaseMaterialInfoRepository"></param>
         /// <param name="sendCaseInfoRepository"></param>
         /// <param name="getCaseBackApplyRepository"></param>
@@ -68,17 +44,6 @@ namespace Hotline.Api.Controllers.DataSharing
         /// <param name="dsReceiveProvinceDataRepository"></param>
         public ProvinceController(IMapper mapper,
            IMediator mediator,
-          IRepository<DsFormEnvironMent> formEnvironMentRepository,
-          IRepository<DsFormTraffic> formTrafficRepository,
-          IRepository<DsFormExpressWay> formExpressWayRepository,
-          IRepository<DsFormMedical> formMedicalRepository,
-          IRepository<DsFormNetWorktec> formNetWorktecRepository,
-          IRepository<DsFormPost> formPostRepository,
-          IRepository<DsFormReturnexChange> formReturnexChangeRepository,
-          IRepository<DsFormShamPub> formShamPubRepository,
-          IRepository<DsFormTaxationComplaint> formTaxationComplaintRepository,
-          IRepository<DsFormTaxationConsulting> formTaxationConsultingRepository,
-          IRepository<DsReceiveCaseExtends> receiveCaseExtendsRepository,
           IRepository<DsGetCaseMaterialInfo> getCaseMaterialInfoRepository,
           IRepository<DsSendCaseInfo> sendCaseInfoRepository,
           IRepository<DsGetCaseBackApply> getCaseBackApplyRepository,
@@ -87,17 +52,6 @@ namespace Hotline.Api.Controllers.DataSharing
         {
             _mapper = mapper;
             _mediator = mediator;
-            _formEnvironMentRepository = formEnvironMentRepository;
-            _formTrafficRepository = formTrafficRepository;
-            _formExpressWayRepository = formExpressWayRepository;
-            _formMedicalRepository = formMedicalRepository;
-            _formNetWorktecRepository = formNetWorktecRepository;
-            _formPostRepository = formPostRepository;
-            _formReturnexChangeRepository = formReturnexChangeRepository;
-            _formShamPubRepository = formShamPubRepository;
-            _formTaxationComplaintRepository = formTaxationComplaintRepository;
-            _formTaxationConsultingRepository = formTaxationConsultingRepository;
-            _receiveCaseExtendsRepository = receiveCaseExtendsRepository;
             _getCaseMaterialInfoRepository = getCaseMaterialInfoRepository;
             _sendCaseInfoRepository = sendCaseInfoRepository;
             _getCaseBackApplyRepository = getCaseBackApplyRepository;
@@ -470,7 +424,7 @@ namespace Hotline.Api.Controllers.DataSharing
                 return OpenResponse.Ok(Reponse.Failed(strResult));
 
             //转换数据
-            var dto =receiveSendWarnInfo.paras;
+            var dto = receiveSendWarnInfo.paras;
 
             //添加数据
             var id = await InitReceiveProvinceData(dto.CaseSerial, null, "send_warn_info", System.Text.Json.JsonSerializer.Serialize(dto));
@@ -536,7 +490,7 @@ namespace Hotline.Api.Controllers.DataSharing
                 return OpenResponse.Ok(Reponse.Failed(strResult));
 
             //转换数据
-            var dto =receiveGetCaseReultSend.paras;
+            var dto = receiveGetCaseReultSend.paras;
 
             //添加数据
             var id = await InitReceiveProvinceData(dto.CaseSerial, dto.CliengGuid, "get_case_result_send", System.Text.Json.JsonSerializer.Serialize(dto));
@@ -678,7 +632,7 @@ namespace Hotline.Api.Controllers.DataSharing
                 default:
                     break;
             }
-        
+
             if (!string.IsNullOrEmpty(id))
             {
                 //向业务系统推送消息
@@ -864,7 +818,31 @@ namespace Hotline.Api.Controllers.DataSharing
 
         #region 私有方法
 
-     //   public async Task<List<FileDto>>
+        /// <summary>
+        ///  根据附件Id,工单编号查询所有附件
+        /// </summary>
+        /// <param name="CliengGuid">材料标识ID</param>
+        /// <param name="CaseSerial">工单编号</param>
+        /// <param name="Classify">材料分类</param>
+        /// <returns></returns>
+        private async Task<List<FileDto>> GetFileData(string CliengGuid, string CaseSerial, string Classify)
+        {
+            var list = await _getCaseMaterialInfoRepository.Queryable().Where(p => p.CliengGuid == CliengGuid && p.CaseSerial == CaseSerial).ToListAsync();
+
+            List<FileDto> fileDtos = new List<FileDto>();
+            foreach (var item in list)
+            {
+                fileDtos.Add(new FileDto()
+                {
+                    Name = item.FileName,
+                    Type = item.Type,
+                    Classify = Classify,
+                    Additions = item.Additions,
+                    Path = item.Path
+                });
+            }
+            return fileDtos;
+        }
 
         /// <summary>
         /// 将数据写入表格

src/Hotline.Api/Controllers/OrderController.cs

@@ -468,7 +468,7 @@ public class OrderController : BaseController
         var orderVisit = await _orderVisitRepository.Queryable()
             .Includes(x => x.Order)
             .Includes(x => x.Employee)
-            .Includes(x => x.OrderVisitDetails)
+            .Includes(x => x.OrderVisitDetails.OrderBy(d=>d.VisitTarget).ToList())
             .FirstAsync(x => x.Id == id, HttpContext.RequestAborted);
 
         if (orderVisit is null)

src/Hotline.Application/Mappers/DataSharing/DsMapperConfigs.cs

@@ -8,6 +8,7 @@ using Hotline.DataSharing.Province.XieTong.Send;
 using Hotline.DataSharing.WebPortal;
 using Hotline.Share.Dtos.DataSharing.Province.Extend;
 using Hotline.Share.Dtos.DataSharing.Province.XieTong.Receive;
+using Hotline.Share.Dtos.File;
 using Hotline.Share.Dtos.Order;
 using Hotline.Share.Enums.CallCenter;
 using Hotline.Share.Enums.Order;
@@ -20,6 +21,7 @@ namespace Hotline.Application.Mappers.DataSharing
     {
         public void Register(TypeAdapterConfig config)
         {
+            #region 省对接
             //服务工单受理
             config.ForType<OrderDto, DsSubmitCaseInfo>()
                .Ignore(d => d.Id)
@@ -233,8 +235,8 @@ namespace Hotline.Application.Mappers.DataSharing
            .Map(d => d.AreaCode, x => x.Order.AreaCode)
            .Map(d => d.ApplyTime, x => x.SendBack.CreationTime)
            .Map(d => d.BackReason, x => string.IsNullOrEmpty(x.SendBack.AuditOpinion) ? x.SendBack.Content : x.SendBack.AuditOpinion)
-
            ;
+            #endregion
 
             #region 汇聚扩展数据--拓展信息
 

src/Hotline.Share/Dtos/DataSharing/Province/FileDto.cs

@@ -1,50 +0,0 @@
-namespace Sharing.Share.Dtos.DataSharing.Province
-{
-    public class FileDto
-    {
-        /// <summary>
-        /// 服务工单编号  
-        /// </summary>
-        public string CaseSerial { get; set; }
-
-        /// <summary>
-        /// 材料类型
-        /// </summary>
-        public string MaterialType { get; set; }
-
-        /// <summary>
-        /// 材料标识
-        /// </summary>
-        public string CliengGuid { get; set; }
-
-        /// <summary>
-        /// 行政区划代码
-        /// </summary>
-        public string AreaCode { get; set; }
-
-        /// <summary>
-        /// 附件名称
-        /// </summary>
-        public string? FileName { get; set; }
-
-        /// <summary>
-        /// 附件大小
-        /// </summary>
-        public long? FileSize { get; set; }
-
-        /// <summary>
-		/// 附件KEY
-		/// </summary>
-        public string Key { get; set; }
-
-        /// <summary>
-        /// 附件类型
-        /// </summary>
-        public string? Type { get; set; }
-
-        /// <summary>
-		/// 附件
-		/// </summary>
-        public string? Additions { get; set; }
-    }
-}

src/Hotline.Share/Dtos/FlowEngine/Workflow/StepBasicDto.cs

@@ -1,4 +1,5 @@
-using Hotline.Share.Enums.FlowEngine;
+using Hotline.Share.Dtos.File;
+using Hotline.Share.Enums.FlowEngine;
 
 namespace Hotline.Share.Dtos.FlowEngine.Workflow
 {
@@ -205,7 +206,7 @@ namespace Hotline.Share.Dtos.FlowEngine.Workflow
         /// <summary>
         /// 附件
         /// </summary>
-        public List<string> Additions { get; set; } = new();
+        public List<FileJsonDto> Files { get; set; } = new();
 
         /// <summary>
         /// 节点期满时间

src/Hotline/DataSharing/Order/DsOrder.cs

@@ -35,7 +35,7 @@ public class DsOrder : CreationModificationEntity
     /// 信件查询密码
     /// </summary>
     [SugarColumn(ColumnDescription = "信件查询密码", ColumnDataType = "varchar(20)")]
-    public string Password { get; set; }
+    public string? Password { get; set; }
 
     /// <summary>
     /// 工单标题

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

@@ -443,7 +443,8 @@ namespace Hotline.DataSharing.Province.Services
                         HotspotId = dto.HotspotId,
                         HotspotName = dto.HotspotName,
                         HotspotSpliceName = dto.HotspotSpliceName,
-                        Source = dto.Source.ToString()
+                        Source = dto.Source.ToString(),
+                        Password=dto.Password
                     };
                     await _dataOrderRepository.AddAsync(dataOrder, cancellationToken);
                 }