Merge branch 'test' into release

src/Hotline.Api/Controllers/OrderController.cs

@@ -3949,7 +3949,7 @@ public class OrderController : BaseController
         var orders = await _orderApplication.QueryOrders(dto)
             .ToPageListWithoutTotalAsync(dto, HttpContext.RequestAborted);
         var list = _mapper.Map<IReadOnlyList<OrderDto>>(orders);
-        if (_appOptions.Value.IsLuZhou && !_sessionContext.OrgIsCenter)
+        if ((_appOptions.Value.IsLuZhou || _appOptions.Value.IsZiGong) && !_sessionContext.OrgIsCenter)
             list = list.Select(p => p.DataMask()).ToList();
         return list;
     }
@@ -4397,12 +4397,16 @@ public class OrderController : BaseController
             await _orderSnapshotRepository.Queryable()
                 .LeftJoin<IndustryCase>((snapshot, industryCase) => snapshot.IndustryCase == industryCase.Id)
                 .Where((snapshot, industryCase) => snapshot.Id == order.Id)
-                .Select((snapshot, industryCase) => new {
-                    snapshot.IndustryId, snapshot.IndustryName, industryCase.Name, 
+                .Select((snapshot, industryCase) => new
+                {
+                    snapshot.IndustryId,
+                    snapshot.IndustryName,
+                    industryCase.Name,
                     snapshot.IsRectifyDepartment,
                     snapshot.IsDangerDepartment,
                     snapshot.IsSafetyDepartment,
-                    snapshot.SignRemark,snapshot.SignUserId,
+                    snapshot.SignRemark,
+                    snapshot.SignUserId,
                     snapshot.SignUserName,
                     snapshot.SignTime
                 })
@@ -5044,7 +5048,7 @@ public class OrderController : BaseController
         if (isSnapshotEnable)
         {
             var orderSnapShot = await _orderSnapshotRepository.GetAsync(orderId, HttpContext.RequestAborted);
-            if(orderSnapShot != null && string.CompareOrdinal(orderSnapShot.IndustryName, "安全隐患") == 0)
+            if (orderSnapShot != null && string.CompareOrdinal(orderSnapShot.IndustryName, "安全隐患") == 0)
             {
                 isAqyh = true;
                 dto.Steps.RemoveAll(d => d.BusinessType == EBusinessType.Send);
@@ -5305,7 +5309,7 @@ public class OrderController : BaseController
                 orderHandleFlowDto.CrossSteps = orderHandleFlowDto.CrossSteps.OrderBy(d => d.Sort).ToList();
                 var stepCount = orderHandleFlowDto.CrossSteps.Count;
                 var unhandleSteps = new List<WorkflowStep> { startStep };
-                for (int i = 0;i < stepCount;i++)
+                for (int i = 0; i < stepCount; i++)
                 {
                     var crossStep = orderHandleFlowDto.CrossSteps[i];
                     var tempSteps = new List<WorkflowStep>();
@@ -5503,7 +5507,7 @@ public class OrderController : BaseController
             var orderSnapShot = await _orderSnapshotRepository.GetAsync(orderId, HttpContext.RequestAborted);
             isAqyh = orderSnapShot != null && string.CompareOrdinal(orderSnapShot.IndustryName, "安全隐患") == 0;
         }
-        if(!isAqyh)
+        if (!isAqyh)
             dto.Steps = dto.Steps.Where(d => string.CompareOrdinal(d.Value, "网格员") != 0
                                              && string.CompareOrdinal(d.Value, "工单标记") != 0).ToList();
 

src/Hotline.Api/Controllers/WebPortalController.cs

@@ -919,8 +919,12 @@ namespace Hotline.Api.Controllers
         public async Task<OpenResponse> GetOrderDetailById([FromBody] ArticleIdDto dto)
         {
             var data = await _orderRepository.GetAsync(p => p.Id == dto.Id, HttpContext.RequestAborted);
-
             var orderDetail = _mapper.Map<OrderDetail>(data);
+            if (_appOptions.Value.IsZiGong)
+            {
+                orderDetail.FlowResult = "";
+            }
+
             if (data != null)
             {
                 //如果是省工单或者是省政民互动的工单，市民不能进行评价

src/Hotline.Api/StartupExtensions.cs

@@ -201,7 +201,7 @@ internal static class StartupExtensions
         services.AddMq(configuration);
 
         //job
-        //services.RegisterJob(appConfiguration);
+        services.RegisterJob(appConfiguration);
 
         services.AddPdfManager();
 

src/Hotline.Application/Snapshot/Notifications/SnapshotHandler.cs

@@ -189,7 +189,7 @@ public class SnapshotStartWorkFlow : INotificationHandler<StartWorkflowNotify>
     {
         try
         {
-            if (_sysSetting.Snapshot == false && notification.Workflow.ModuleCode != WorkflowModuleConsts.OrderHandle) return;
+            if (_sysSetting.Snapshot == false || notification.Workflow.ModuleCode != WorkflowModuleConsts.OrderHandle) return;
             await _snapshotPointsDomainService.AddPointsAsync(notification.Workflow.ExternalId, EPointsSource.Report, ESnapshotSMSStatus.Agree, 0);
         }
         catch (Exception e)

src/Hotline.Repository.SqlSugar/File/FileRepository.cs

@@ -33,8 +33,9 @@ namespace Hotline.Repository.SqlSugar.File
 			foreach (var file in entities)
 			{
 				var names = file.FileName.Split(".");
-                file.Name = names[0];
-                file.Type = names[1];
+                //file.Name = names[0];
+                file.Type = names[names.Length-1];
+				file.Name = file.FileName.Replace("."+file.Type, "");
 				file.Key = id;
                 file.OrgName = _sessionContext.OrgName;
                 file.OrgId = _sessionContext.OrgId;
@@ -51,8 +52,10 @@ namespace Hotline.Repository.SqlSugar.File
 			foreach (var file in entities)
 			{
 				var names = file.FileName.Split(".");
-				file.Name = names[0];
-				file.Type = names[1];
+				//file.Name = names[0];
+				//file.Type = names[1];
+				file.Type = names[names.Length - 1];
+				file.Name = file.FileName.Replace("." + file.Type, "");
 				file.Key = id;
 				file.OrgName = _sessionContext.OrgName;
 				file.OrgId = _sessionContext.OrgId;
@@ -76,8 +79,10 @@ namespace Hotline.Repository.SqlSugar.File
 				if (string.IsNullOrEmpty(file.Path) || string.IsNullOrEmpty(file.AllPath))
 					throw UserFriendlyException.SameMessage("附件信息错误,请检查后重新上传附件！");
 				var names = file.FileName.Split(".");
-				file.Name = names[0];
-				file.Type = names[1];
+				//file.Name = names[0];
+				//file.Type = names[1];
+				file.Type = names[names.Length - 1];
+				file.Name = file.FileName.Replace("." + file.Type, "");
 				file.OrgName = _sessionContext.OrgName;
 				file.OrgId = _sessionContext.OrgId;
 				file.UserId = _sessionContext.UserId;

src/Hotline/Authentications/SessionContextManager.cs

@@ -76,7 +76,7 @@ public class SessionContextManager : ISessionContextManager, IScopeDependency
         var cityBase = JsonConvert.DeserializeObject<CityBaseConfiguration>(setting);
         DefaultCityBaseConfiguration config = source switch
         {
-            "province" => cityBase.CityProvince,
+            "province" => cityBase.CityProvinceAssign,
             "110" => cityBase.PublicSecurity,
             "yb-enterprise" => cityBase.CityEnterprise,
             "zzpt" => cityBase.ComprehensiveTreatment,

src/Hotline/FlowEngine/Workflows/WorkflowDomainService.cs

@@ -1193,7 +1193,8 @@ namespace Hotline.FlowEngine.Workflows
                         handler.orgId, handler.orgName, handler.roleId, handler.roleName);
                     //更新节点CreationTime  派单量统计  待派单数据使用
                     step.CreationTime = DateTime.Now;
-                }
+					step.WorkflowTrace.CreationTime = DateTime.Now;
+				}
             }
 
             var steps = handlers.SelectMany(d => d.steps).ToList();