Merge branch 'release' into dev

src/Hotline.Api/Controllers/OrderController.cs

@@ -4275,7 +4275,7 @@ public class OrderController : BaseController
                     ETimeType.WorkDay,
                     dto.TimeLimit.Value, order.AcceptTypeCode);
                 endTime = expiredTime.EndTime;
-                await _orderRepository.Updateable().SetColumns(o => new Orders.Order() { ExpiredTime = expiredTime.EndTime, NearlyExpiredTime = expiredTime.NearlyExpiredTime, NearlyExpiredTimeOne = expiredTime.NearlyExpiredTimeOne,Status = EOrderStatus.SendBack })
+                await _orderRepository.Updateable().SetColumns(o => new Orders.Order() { ExpiredTime = expiredTime.EndTime, NearlyExpiredTime = expiredTime.NearlyExpiredTime, NearlyExpiredTimeOne = expiredTime.NearlyExpiredTimeOne })
                     .Where(o => o.Id == order.Id).ExecuteCommandAsync(HttpContext.RequestAborted);
                 var orderDto = _mapper.Map<OrderDto>(order);
                 await _capPublisher.PublishAsync(Hotline.Share.Mq.EventNames.HotlineOrderExpiredTimeUpdate, orderDto,
@@ -4285,10 +4285,10 @@ public class OrderController : BaseController
             var processType = dto.FlowDirection == EFlowDirection.OrgToCenter || dto.FlowDirection == EFlowDirection.CenterToCenter
                 ? EProcessType.Zhiban
                 : EProcessType.Jiaoban;
-            await _orderRepository.Updateable().SetColumns(o => new Orders.Order() { ProcessType = processType })
+            await _orderRepository.Updateable().SetColumns(o => new Orders.Order() { ProcessType = processType, Status = EOrderStatus.SendBack })
                 .Where(o => o.Id == order.Id).ExecuteCommandAsync(HttpContext.RequestAborted);
             await _workflowApplication.RecallAsync(recall, endTime, order.Status >= EOrderStatus.Filed, HttpContext.RequestAborted);
-            var publish = await _orderPublishRepository.GetAsync(x => x.OrderId == dto.OrderId);
+			var publish = await _orderPublishRepository.GetAsync(x => x.OrderId == dto.OrderId);
             if (publish != null)
             {
                 var publishHistory = _mapper.Map<OrderPublishHistory>(publish);

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

@@ -28,7 +28,7 @@
     }
   },
   "ConnectionStrings": {
-    "Hotline": "PORT=5432;DATABASE=hotline_dev;HOST=110.188.24.182;PASSWORD=fengwo11!!;USER ID=dev;"
+    "Hotline": "PORT=5432;DATABASE=hotline;HOST=110.188.24.182;PASSWORD=fengwo11!!;USER ID=dev;"
     //"Redis": "110.188.24.182:50179",
     //"MongoDB": "mongodb://192.168.100.121:27017",
     //"Wex": "server=222.212.82.225;Port=4509;Database=fs_kft;Uid=root;Pwd=Wex@12345;"
@@ -37,7 +37,7 @@
     "Host": "110.188.24.182",
     "Port": 50179,
     "Password": "fengwo123!$!$",
-    "Database": 5 //release:3, dev:5
+    "Database": 3 //release:3, dev:5
   },
   "Swagger": true,
   "Cors": {

src/Hotline.Api/config/appsettings.json

@@ -28,7 +28,7 @@
     }
   },
   "ConnectionStrings": {
-    "Hotline": "PORT=5432;DATABASE=hotline_dev;HOST=110.188.24.182;PASSWORD=fengwo11!!;USER ID=dev;"
+    "Hotline": "PORT=5432;DATABASE=hotline;HOST=110.188.24.182;PASSWORD=fengwo11!!;USER ID=dev;"
     //"Redis": "110.188.24.182:50179,password=fengwo22@@",
     //"MongoDB": "mongodb://192.168.100.121:27017",
     //"Wex": "server=222.212.82.225;Port=4509;Database=fs_kft;Uid=root;Pwd=Wex@12345;"
@@ -37,7 +37,7 @@
     "Host": "110.188.24.182",
     "Port": 50179,
     "Password": "fengwo123!$!$",
-    "Database": 5 
+    "Database": 3 
   },
   "Swagger": true,
   "Cors": {

src/Hotline.Application/Handlers/FlowEngine/WorkflowPreviousHandler.cs

@@ -74,7 +74,7 @@ namespace Hotline.Application.Handlers.FlowEngine
                     var order = await _orderDomainService.GetOrderAsync(workflow.ExternalId, withHotspot: true, withAcceptor: true,
                         withExtension: true, cancellationToken: cancellationToken);
                     order.CheckIfFiled();
-                    order.UpdateHandlingStatus(workflow.IsInCountersign);
+                    //order.UpdateHandlingStatus(workflow.IsInCountersign);
 					_mapper.Map(workflow, order);
                     if (notification.TargetStep.StepType is EStepType.Start)
                     {

src/Hotline.Application/Handlers/FlowEngine/WorkflowRecallHandler.cs

@@ -60,7 +60,7 @@ public class WorkflowRecallHandler : INotificationHandler<RecallNotify>
             case WorkflowModuleConsts.OrderHandle:
                 var order = await _orderDomainService.GetOrderAsync(workflow.ExternalId, withHotspot: true, withAcceptor: true,
                     withExtension: true, cancellationToken: cancellationToken);
-                order.UpdateHandlingStatus(workflow.IsInCountersign);
+                //order.UpdateHandlingStatus(workflow.IsInCountersign);
 				_mapper.Map(workflow, order);
                 if (notification.TargetStep.StepType is EStepType.Start)
                 {

src/Hotline.Application/Mappers/OrderMapperConfigs.cs

@@ -153,5 +153,9 @@ public class OrderMapperConfigs : IRegister
             .Map(d => d.TimeLimit, s => s.TimeText)
             .Map(d => d.TimeLimitCount, s => s.Count)
             .Map(d => d.TimeLimitUnit, s => s.TimeType);
+
+        config.ForType<OrderScreen, OrderScreenListDto>()
+            .IgnoreIf((s, d) => s.VisitDetail == null, d => d.VisitDetail)
+            ;
     }
 }

src/Hotline/Permissions/EPermission.cs

@@ -1996,19 +1996,7 @@ namespace Hotline.Permissions
         #endregion
         #endregion
 
-        #region 省平台对接
-        /// <summary>
-        /// 省平台对接
-        /// </summary>
-        [Display(GroupName ="省平台对接",Name ="省平台对接",Description ="省平台对接")]
-        ProvinceAbutment = 701600,
-        /// <summary>
-        /// 政民互动发布
-        /// </summary>
-        [Display(GroupName ="省平台对接",Name ="政民互动发布",Description ="政民互动发布")]
-        GovernmentpPeopleInteractPublish = 701601,
-
-        #endregion
+        
         #endregion
 
         #region 话务管理（80,00,00）
@@ -2471,7 +2459,7 @@ namespace Hotline.Permissions
 
         #endregion
 
-        #region 数据共享平台
+        #region 数据共享平台(13,00,00)
         /// <summary>
         /// 数据共享平台
         /// </summary>
@@ -2549,6 +2537,40 @@ namespace Hotline.Permissions
         PublishErrorQuery = 131400,
         #endregion
 
+        #region 省平台对接(14,00,00)
+        /// <summary>
+        /// 省平台对接
+        /// </summary>
+        [Display(GroupName = "省平台对接", Name = "省平台对接", Description = "省平台对接")]
+        ProvinceAbutment = 140000,
+        /// <summary>
+        /// 省综合查询
+        /// </summary>
+        [Display(GroupName ="省平台对接",Name ="省综合查询",Description ="省综合查询")]
+        ProvinceOrderList = 140100,
+        /// <summary>
+        /// 省延期查询
+        /// </summary>
+        [Display(GroupName ="省平台对接",Name ="省延期查询",Description ="省延期查询")]
+        ProvinceOrderDelay = 140200,
+        /// <summary>
+        /// 省退单查询
+        /// </summary>
+        [Display(GroupName ="省平台对接",Name ="省退单查询",Description ="省退单查询")]
+        ProvinceOrderReturn = 140300,
+        /// <summary>
+        /// 省甄别查询
+        /// </summary>
+        [Display(GroupName ="省平台对接",Name ="省甄别查询",Description ="省甄别查询")]
+        ProvinceOrderOrderScreen = 140400,
+        /// <summary>
+        /// 政民互动发布
+        /// </summary>
+        [Display(GroupName = "省平台对接", Name = "政民互动发布", Description = "政民互动发布")]
+        GovernmentpPeopleInteractPublish = 140500,
+
+        #endregion
+
         #region 公用（99，00,00）
 
         #region 话机操作面板权限