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

src/Hotline.Api/StartupHelper.cs

@@ -313,14 +313,14 @@ namespace Hotline.Api
                             .WithCronSchedule("0/10 * * * * ?")
                         );
 
-                        var getCallSatisfactionJobKey = new JobKey(nameof(XingTangCallSatisfactionSyncJob));
-                        d.AddJob<XingTangCallSatisfactionSyncJob>(getCallSatisfactionJobKey);
-                        d.AddTrigger(t => t
-                            .WithIdentity("get-callsatisfaction-trigger")
-                            .ForJob(getCallSatisfactionJobKey)
-                            .StartNow()
-                            .WithCronSchedule("0/30 * * * * ?")
-                        );
+                        //var getCallSatisfactionJobKey = new JobKey(nameof(XingTangCallSatisfactionSyncJob));
+                        //d.AddJob<XingTangCallSatisfactionSyncJob>(getCallSatisfactionJobKey);
+                        //d.AddTrigger(t => t
+                        //    .WithIdentity("get-callsatisfaction-trigger")
+                        //    .ForJob(getCallSatisfactionJobKey)
+                        //    .StartNow()
+                        //    .WithCronSchedule("0/30 * * * * ?")
+                        //);
 
                         break;
                 }

src/Hotline.Api/config/appsettings.Development.json

@@ -1,34 +1,34 @@
 {
   "CityBaseConfiguration": {
     "CityProvince": {
-      "UserId": "03aba148-e7b1-cd03-bf00-3a1177930508",
-      "UserName": "省12345平台",
-      "OrgId": "001171",
-      "OrgName": "省12345平台"
+      "UserId": "9fd11bfd-0c39-f1f0-80b1-3a1384977b8e",
+      "UserName": "省12345交办",
+      "OrgId": "001090",
+      "OrgName": "省12345交办"
     },
     "CityProvinceAssign": {
-      "UserId": "",
-      "UserName": "",
-      "OrgId": "001178",
+      "UserId": "9fd11bfd-0c39-f1f0-80b1-3a1384977b8e",
+      "UserName": "省12345交办",
+      "OrgId": "001090",
       "OrgName": "省12345交办"
     },
     "PublicSecurity": {
-      "UserId": "e90501d7-c453-e18a-f1fa-3a1177930699",
+      "UserId": "a5a57c15-fe42-5782-449b-3a1384976aaf",
       "UserName": "市公安局110",
-      "OrgId": "001180",
+      "OrgId": "001096",
       "OrgName": "市公安局110"
     },
     "CityEnterprise": {
-      "UserId": "ce42562c-afc1-764b-1dc8-3a1177930346",
-      "UserName": "联系服务企业",
-      "OrgId": "001181",
-      "OrgName": "联系服务企业"
+      "UserId": "",
+      "UserName": "",
+      "OrgId": "",
+      "OrgName": ""
     },
     "ComprehensiveTreatment": {
-      "UserId": "d4cb7151-41fa-a810-6c1e-3a117792fc0c",
-      "UserName": "综治平台",
-      "OrgId": "001143",
-      "OrgName": "综治平台"
+      "UserId": "",
+      "UserName": "",
+      "OrgId": "",
+      "OrgName": ""
     }
   },
   "AllowedHosts": "*",

src/Hotline.Application/Orders/OrderApplication.cs

@@ -825,6 +825,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
             .Includes(x => x.OrderScreens)
             .WhereIF(!string.IsNullOrEmpty(dto.Keyword), d => d.Title.Contains(dto.Keyword!)) //标题
             .WhereIF(!string.IsNullOrEmpty(dto.ProvinceNo), d => d.ProvinceNo == dto.ProvinceNo) //省本地编号
+             .WhereIF(!string.IsNullOrEmpty(dto.ReceiveProvinceNo), d => d.ReceiveProvinceNo == dto.ReceiveProvinceNo) //省编号
             .WhereIF(!string.IsNullOrEmpty(dto.No), d => d.No == dto.No) //工单编码
             .WhereIF(!string.IsNullOrEmpty(dto.AcceptType), d => d.AcceptTypeCode == dto.AcceptType)//受理类型
             //.WhereIF(dto.AcceptTypes.Any(), d => dto.AcceptTypes.Contains(d.AcceptTypeCode)) //受理类型

src/Hotline.Application/Subscribers/DatasharingSubscriber.cs

@@ -70,7 +70,7 @@ namespace Hotline.Application.Subscribers
         private readonly ISystemDicDataCacheManager _sysDicDataCacheManager;
         private readonly IOptions<CityBaseConfiguration> _cityBaseConfiguration;
 
-		public DataSharingSubscriber(
+        public DataSharingSubscriber(
             IRepository<OrderVisit> orderVisitRepository,
             IMapper mapper,
             IOrderRepository orderRepository,
@@ -132,7 +132,7 @@ namespace Hotline.Application.Subscribers
             _orderPublishRepository = orderPublishRepository;
             _sysDicDataCacheManager = sysDicDataCacheManager;
             _cityBaseConfiguration = cityBaseConfiguration;
-		}
+        }
 
         /// <summary>
         /// 接收工单退回结果
@@ -240,7 +240,8 @@ namespace Hotline.Application.Subscribers
             };
             await _orderRevokeRepository.AddAsync(orderRevoke, cancellationToken);
 
-            var current = SessionContextCreator.CreateSessionContext(dto.Source,_cityBaseConfiguration.Value);
+            //宜宾需求：特提至中心（派单组?），由派单员归档
+            var current = SessionContextCreator.CreateSessionContext(dto.Source, _cityBaseConfiguration.Value);
             if (string.IsNullOrEmpty(order?.WorkflowId))
             {
                 var startDto = new StartWorkflowDto
@@ -249,15 +250,18 @@ namespace Hotline.Application.Subscribers
                     Title = order.Title,
                     Opinion = dto.Opinion,
                 };
-                await _workflowApplication.StartToEndAsync(startDto, current, order.Id, order.ExpiredTime,
+                //await _workflowApplication.StartToEndAsync(startDto, current, order.Id, order.ExpiredTime,
+                //    cancellationToken);
+                await _workflowApplication.StartWorkflowAsync(startDto, current, order.Id, order.ExpiredTime,
                     cancellationToken);
             }
             else
             {
                 //await _workflowApplication.HandleToEndAsync(current, order.WorkflowId, dto.Opinion, null,
                 //    cancellationToken: cancellationToken);
-                await _workflowApplication.JumpToEndAsync(current, order.WorkflowId, dto.Opinion, null, order.ExpiredTime,
-                    cancellationToken: cancellationToken);
+                //await _workflowApplication.JumpToEndAsync(current, order.WorkflowId, dto.Opinion, null, order.ExpiredTime,
+                //    cancellationToken: cancellationToken);
+                await _workflowDomainService.RecallToStartStepAsync(order.WorkflowId, dto.Opinion, current, cancellationToken);
             }
         }
 
@@ -417,7 +421,7 @@ namespace Hotline.Application.Subscribers
                             x.Status == EScreenStatus.Approval)
                 .FirstAsync(cancellationToken);
 
-            var current = SessionContextCreator.CreateSessionContext(dto.Source,_cityBaseConfiguration.Value);
+            var current = SessionContextCreator.CreateSessionContext(dto.Source, _cityBaseConfiguration.Value);
             await _workflowApplication.HandleToEndAsync(current,
                 orderScreen.WorkflowId, "省上推送甄别结果", null,
                 dto.ProvinceScreenResult.AuditResult
@@ -550,7 +554,7 @@ namespace Hotline.Application.Subscribers
             {
                 //处理省下行回访
                 var order = await _orderRepository.Queryable().Where(x => x.ReceiveProvinceNo == dto.ProvinceNo).FirstAsync();
-                if (order !=null)
+                if (order != null)
                 {
                     //判断是否有发布数据
                     var orderPublish = await _orderPublishRepository.Queryable()
@@ -606,22 +610,22 @@ namespace Hotline.Application.Subscribers
                     orgDetail.VisitOrgCode = order.ActualHandleOrgCode;
                     orgDetail.VisitOrgName = order.ActualHandleOrgName;
                     orgDetail.VisitTarget = EVisitTarget.Org;
-                    
-                    
+
+
                     orgDetail.OrgProcessingResults = satisfy;
 
                     visitedDetail.Add(orgDetail);
                     //TODO 自贡办件态度
 
 
-                    await _orderVisitedDetailRepository.AddRangeAsync(visitedDetail,cancellationToken);
-                    order.Visited(satisfy.Key,satisfy.Value);
+                    await _orderVisitedDetailRepository.AddRangeAsync(visitedDetail, cancellationToken);
+                    order.Visited(satisfy.Key, satisfy.Value);
                     order.Status = EOrderStatus.Visited;
                     await _orderRepository.UpdateAsync(order, cancellationToken);
 
                 }
-                
-                
+
+
             }
         }
 

src/Hotline.Share/Dtos/Order/QueryOrderDto.cs

@@ -171,6 +171,10 @@ namespace Hotline.Share.Dtos.Order
         /// </summary>
         public string? ProvinceChannel { get; set; }
 
+        /// <summary>
+        /// 省交办编号
+        /// </summary>
+        public string? ReceiveProvinceNo { get; set; }
     }