Merge branch 'master' of http://110.188.24.182:10023/Fengwo/hotline

src/Hotline.Api/Controllers/EnforcementOrderController.cs

@@ -33,6 +33,7 @@ namespace Hotline.Api.Controllers
         private readonly IRepository<SystemOrganize> _systemOrganizeRepository;
         private readonly ISessionContext _sessionContext;
         private readonly IRepository<OrderVisitDetail> _orderVisitDetailRepository;
+        private readonly IRepository<SystemArea> _systemAreaRepository;
 
         public EnforcementOrderController(IRepository<EnforcementOrderHander> enforcementOrderHanderRepository,
          IRepository<EnforcementOrders> enforcementOrdersRepository,
@@ -43,7 +44,8 @@ namespace Hotline.Api.Controllers
          ISystemDicDataCacheManager sysDicDataCacheManager,
          IRepository<SystemOrganize> systemOrganizeRepository,
          ISessionContext sessionContext,
-         IRepository<OrderVisitDetail> orderVisitDetailRepository)
+         IRepository<OrderVisitDetail> orderVisitDetailRepository,
+         IRepository<SystemArea> systemAreaRepository)
         {
             _enforcementOrderHanderRepository = enforcementOrderHanderRepository;
             _enforcementOrdersRepository = enforcementOrdersRepository;
@@ -55,6 +57,7 @@ namespace Hotline.Api.Controllers
             _systemOrganizeRepository = systemOrganizeRepository;
             _sessionContext = sessionContext;
             _orderVisitDetailRepository = orderVisitDetailRepository;
+            _systemAreaRepository = systemAreaRepository;
         }
 
         /// <summary>
@@ -152,6 +155,25 @@ namespace Hotline.Api.Controllers
             return rsp;
         }
 
+        /// <summary>
+        /// 获取区域信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("get_system_area")]
+        public async Task<object> GetSystemAreaAsync()
+        {
+            return await _systemAreaRepository.Queryable()
+                .Where(p => p.Id == "511500" || p.ParentId == "511500")
+                .Select(p => new
+                {
+                    p.AreaName,
+                    p.Id
+                })
+                .OrderBy(p=>p.Id)
+                .ToListAsync();
+
+        }
+
         /// <summary>
         /// 线索核实  
         /// </summary>

src/Hotline.Share/Dtos/JudicialManagement/QueryEventClassificationStatisticsDto.cs

@@ -0,0 +1,13 @@
+using Hotline.Share.Requests;
+
+namespace Hotline.Share.Dtos.JudicialManagement
+{
+    public record QueryEventClassificationStatisticsDto : PagedRequest
+    {
+        public DateTime StartDate { get; set; }
+        public DateTime EndDate { get; set; }
+        public string EventTypeId { get; set; }
+
+        public string AreaCode { get; set; }
+    }
+}

src/Hotline/FlowEngine/Workflows/WorkflowDomainService.cs

@@ -1284,8 +1284,8 @@ namespace Hotline.FlowEngine.Workflows
             {
                 if (currentStep.IsCountersignEndStep)
                 {
-                    //todo check if current is topend f: csStartStep.prev
-                    //todo t: check if dto.StartCs t: csconfig f: config
+                    // check if current is topend f: csStartStep.prev
+                    // t: check if dto.StartCs t: csconfig f: config
                     if (currentStep.IsTopCountersignEndStep(workflow.TopCountersignStepId))
                     {
                         if (dto.IsStartCountersign)
@@ -1303,7 +1303,7 @@ namespace Hotline.FlowEngine.Workflows
                     }
                     else
                     {
-                        //todo csStartStep.prev
+                        // csStartStep.prev
                         var csStartStep =
                             workflow.Steps.FirstOrDefault(d => d.Id == currentStep.CountersignStartStepId);
                         if (csStartStep is null)
@@ -1419,7 +1419,7 @@ namespace Hotline.FlowEngine.Workflows
             {
                 // 创建会签汇总节点
                 var countersignEndStep =
-                    await CreateCountersignEndStepAsync(prevStep, dto, expiredTime, cancellationToken);
+                    await CreateCountersignEndStepAsync(prevStep, dto, expiredTime, cancellationToken: cancellationToken);
                 nextSteps = new List<WorkflowStep> { countersignEndStep };
 
                 //create trace
@@ -1432,7 +1432,7 @@ namespace Hotline.FlowEngine.Workflows
         }
 
         private async Task<WorkflowStep> CreateCountersignEndStepAsync(WorkflowStep countersignStartStep,
-            BasicWorkflowDto dto, DateTime? expiredTime, CancellationToken cancellationToken)
+            BasicWorkflowDto dto, DateTime? expiredTime, string? opinion = null, CancellationToken cancellationToken = default)
         {
             var csEndStep = _mapper.Map<WorkflowStep>(countersignStartStep);
             csEndStep.Status = EWorkflowStepStatus.WaitForAccept;
@@ -1454,6 +1454,9 @@ namespace Hotline.FlowEngine.Workflows
             csEndStep.Reset();
             csEndStep.ResetParameters();
 
+            if (!string.IsNullOrEmpty(opinion))
+                csEndStep.Opinion = opinion;
+
             await _workflowStepRepository.AddAsync(csEndStep, cancellationToken);
             return csEndStep;
         }
@@ -2235,7 +2238,7 @@ namespace Hotline.FlowEngine.Workflows
             if (handlerType.HasValue)
                 step.HandlerType = handlerType.Value;
 
-            if(!string.IsNullOrEmpty(opinion))
+            if (!string.IsNullOrEmpty(opinion))
                 step.Opinion = opinion;
 
             return step;

src/Hotline/FlowEngine/Workflows/WorkflowStep.cs

@@ -95,8 +95,7 @@ public class WorkflowStep : StepBasicEntity
         nameof(Workflows.WorkflowTrace.StepId))]
     public WorkflowTrace WorkflowTrace { get; set; }
 
-    [Navigate(NavigateType.OneToMany, nameof(Id),
-        nameof(WorkflowStepHandler.WorkflowStepId))]
+    [Navigate(NavigateType.OneToMany, nameof(WorkflowStepHandler.WorkflowStepId))]
     public List<WorkflowStepHandler> StepHandlers { get; set; }
 
     #region Method