src/Hotline.Share/Mq/EventNames.Province.cs

@@ -0,0 +1,240 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Hotline.Share.Mq
+{
+    public partial class EventNames
+    {
+        #region 下行（省上向市州推送）
+        /// <summary>
+        /// 服务工单交办
+        /// </summary>
+        public const string HotlineOrderReceiveCaseInfo = "hotline.order.receivecaseinfo";
+
+        /// <summary>
+        /// 服务工单退回反馈
+        /// </summary>
+        public const string HotlineOrderGetCaseBackResult = "hotline.order.getcasebackresult";
+
+        /// <summary>
+        /// 服务工单延时审核结果
+        /// </summary>
+        public const string HotlineOrderDelayCaseResultReceive = "hotline.order.delaycaseresultreceive";
+
+        /// <summary>
+        /// 服务工单交办补充诉求
+        /// </summary>
+        public const string HotlineOrderSupplyCaseInfoReceive = "hotline.order.supplycaseinforeceive";
+
+        /// <summary>
+        /// 服务工单撤单
+        /// </summary>
+        public const string HotlineOrderRevokeCaseInfo = "hotline.order.revokecaseinfo";
+
+        /// <summary>
+        /// 服务工单催单
+        /// </summary>
+        public const string HotlineOrderRemindCaseInfo = "hotline.order.remindcaseinfo";
+
+        /// <summary>
+        /// 服务工单预警
+        /// </summary>
+        public const string HotlineOrderSendWarnInfo = "hotline.order.sendwarninfo";
+
+        /// <summary>
+        /// 督办工单派发
+        /// </summary>
+        public const string HotlineOrderSendSuperviseInfo = "hotline.order.sendsuperviseinfo";
+
+        /// <summary>
+        /// 服务工单甄别结果
+        /// </summary>
+        public const string HotlineOrderScreenCaseResultReceive = "hotline.order.screencaseresultreceive";
+
+        /// <summary>
+        /// 交办工单满意度接收
+        /// </summary>
+        public const string HotlineOrderSendCaseEvlResult = "hotline.order.sendcaseevlresult";
+
+        /// <summary>
+        /// 上报工单处理结果/退回
+        /// </summary>
+        public const string HotlineOrderGetCaseReultSend = "hotline.order.getcasereultsend";
+
+        /// <summary>
+        /// 上报工单评价
+        /// </summary>
+        public const string HotlineOrderGetVisitInfoSend = "hotline.order.getvisitinfosend";
+        #endregion
+
+        #region 上行（市州向省上推送）
+        #region 协同-第一批次
+
+        /// <summary>
+        /// 服务工单交办处理
+        /// </summary>
+        public const string HotlineOrderGetCaseResultReceive = "hotline.order.getcaseresultreceive";
+
+        /// <summary>
+        /// 服务工单交办处理过程
+        /// </summary>
+        public const string HotlineOrderGetCaseProcessReceive = "hotline.order.getcaseprocessreceive";
+
+        /// <summary>
+        /// 服务工单交办评价
+        /// </summary>
+        public const string HotlineOrderGetVisitInfoReceive = "hotline.order.getvisitinforeceive";
+
+        /// <summary>
+        /// 退回申请
+        /// </summary>
+        public const string HotlineOrderGetCaseBackApply = "hotline.order.getcasebackapply";
+
+        /// <summary>
+        /// 服务工单申请延时
+        /// </summary>
+        public const string HotlineOrderDelayCaseInfoSend = "hotline.order.delaycaseinfosend";
+
+        /// <summary>
+        /// 服务工单督办过程
+        /// </summary>
+        public const string HotlineOrderSendSuperviseProcessInfo = "hotline.order.sendsuperviseprocessinfo";
+
+        /// <summary>
+        /// 服务工单督办结果
+        /// </summary>
+        public const string HotlineOrderSendSuperviseResultInfo = "hotline.order.sendsuperviseresultinfo";
+
+        /// <summary>
+        /// 工单发起甄别
+        /// </summary>
+        public const string HotlineOrderScreenCaseInfoSend = "hotline.order.screencaseinfosend";
+
+        /// <summary>
+        /// 政民互动提交公开
+        /// </summary>
+        public const string HotlineOrderZMHDCaseInfoPublic = "hotline.order.zmhdcaseinfopublic";
+
+        /// <summary>
+        /// 服务工单拓展信息交办
+        /// </summary>
+        public const string HotlineOrderReceiveCaseExtends = "hotline.order.receivecaseextends";
+
+        /// <summary>
+        /// 材料接口
+        /// </summary>
+        public const string HotlineOrderGetCaseMaterialInfo = "hotline.order.getcasematerialinfo";
+        #endregion
+
+        #region 汇聚-第二批次
+        /// <summary>
+        /// 热线工单创建成功
+        /// </summary>
+        public const string HotlineOrderCreated = "hotline.order.created";
+
+        /// <summary>
+        /// 热线工单流转--服务工单处理
+        /// </summary>
+        public const string HotlineOrderFlow = "hotline.order.flow";
+
+        /// <summary>
+        /// 工单从中心派往部门
+        /// </summary>
+        public const string HotlineOrderCenterToOrg = "hotline.order.centertoorg";
+
+        /// <summary>
+        /// 热线工单归档---服务工单结果
+        /// </summary>
+        public const string HotlineOrderFiled = "hotline.order.filed";
+
+        /// <summary>
+        /// 工单发布
+        /// </summary>
+        public const string HotlineOrderPublished = "hotline.order.published";
+
+        /// <summary>
+        /// 服务工单处理结果
+        /// </summary>
+        public const string HotlineOrderSubmitCaseResult = "hotline.order.submitcaseresult";
+
+        /// <summary>
+        /// 服务工单处理
+        /// </summary>
+        public const string HotlineOrderSubmitCaseProcess = "hotline.order.submitcaseprocess";
+
+        /// <summary>
+        /// 服务工单回访评价
+        /// </summary>
+        public const string HotlineOrderSubmitVisitInfo = "hotline.order.submitvisitinfo";
+
+        /// <summary>
+        /// 电话记录
+        /// </summary>
+        public const string HotlineOrderSubmitCaseRecord = "hotline.order.submitcaserecord";
+
+        /// <summary>
+        /// 统计数据
+        /// </summary>
+        public const string HotlineOrderSubmitCaseTotal = "hotline.order.submitcasetotal";
+
+        /// <summary>
+        /// 服务工单拓展信息
+        /// </summary>
+        public const string HotlineOrderSubmitCaseExtends = "hotline.order.submitcaseextends";
+        #endregion
+
+        #region 协同-第三批次
+        /// <summary>
+        /// 服务工单上报
+        /// </summary>
+        public const string SendCaseInfo = "hotline.order.sendcaseinfo";
+
+        /// <summary>
+        /// 上报补充诉求
+        /// </summary>
+        public const string SupplyCaseInfoSend = "hotline.order.supplycaseinfosend";
+
+        /// <summary>
+        /// 服务工单撤单
+        /// </summary>
+        public const string SendRevokeCaseInfo = "hotline.order.sendrevokecaseinfo";
+
+        /// <summary>
+        /// 服务工单催单
+        /// </summary>
+        public const string SendRemindCaseInfo = "hotline.order.sendremindcaseinfo";
+
+        #endregion
+
+        #region  协同-第四批次
+
+        #region 知识库
+        /// <summary>
+        /// 知识库上报
+        /// </summary>
+        public const string HotlineKnowledgeInfoSend = "hotline.knowledge.infosend";
+
+        /// <summary>
+        /// 知识库变更
+        /// </summary>
+        public const string HotlineKnowledgeInfoUpdate = "hotline.knowledge.infoupdate";
+
+        /// <summary>
+        /// 知识库下架
+        /// </summary>
+        public const string HotlineKnowledgeInfoAbandon = "hotline.knowledge.infoabandon";
+
+        #endregion
+
+        /// <summary>
+        /// 统计数据
+        /// </summary>
+        public const string HotlineSendRealTimeStatus = "hotline.order.sendrealtimestatus";
+        #endregion
+        #endregion
+
+    }
+}

src/Hotline.Share/Mq/EventNames.cs

@@ -1,239 +1,11 @@
 namespace Hotline.Share.Mq
 {
-    public class EventNames
+    public partial class EventNames
     {
         /// <summary>
         /// 呼叫中心.黑名单电话过期
         /// </summary>
         public const string CallCenterBlackListExpired = "callcenter.blacklist.expired";
 
-        #region 下行（省上向市州推送）
-        /// <summary>
-        /// 服务工单交办
-        /// </summary>
-        public const string HotlineOrderReceiveCaseInfo = "hotline.order.receivecaseinfo";
-
-        /// <summary>
-        /// 服务工单退回反馈
-        /// </summary>
-        public const string HotlineOrderGetCaseBackResult = "hotline.order.getcasebackresult";
-
-        /// <summary>
-        /// 服务工单延时审核结果
-        /// </summary>
-        public const string HotlineOrderDelayCaseResultReceive = "hotline.order.delaycaseresultreceive";
-
-        /// <summary>
-        /// 服务工单交办补充诉求
-        /// </summary>
-        public const string HotlineOrderSupplyCaseInfoReceive = "hotline.order.supplycaseinforeceive";
-
-        /// <summary>
-        /// 服务工单撤单
-        /// </summary>
-        public const string HotlineOrderRevokeCaseInfo = "hotline.order.revokecaseinfo";
-
-        /// <summary>
-        /// 服务工单催单
-        /// </summary>
-        public const string HotlineOrderRemindCaseInfo = "hotline.order.remindcaseinfo";
-
-        /// <summary>
-        /// 服务工单预警
-        /// </summary>
-        public const string HotlineOrderSendWarnInfo = "hotline.order.sendwarninfo";
-
-        /// <summary>
-        /// 督办工单派发
-        /// </summary>
-        public const string HotlineOrderSendSuperviseInfo = "hotline.order.sendsuperviseinfo";
-
-        /// <summary>
-        /// 服务工单甄别结果
-        /// </summary>
-        public const string HotlineOrderScreenCaseResultReceive = "hotline.order.screencaseresultreceive";
-
-        /// <summary>
-        /// 交办工单满意度接收
-        /// </summary>
-        public const string HotlineOrderSendCaseEvlResult = "hotline.order.sendcaseevlresult";
-
-        /// <summary>
-        /// 上报工单处理结果/退回
-        /// </summary>
-        public const string HotlineOrderGetCaseReultSend = "hotline.order.getcasereultsend";
-
-        /// <summary>
-        /// 上报工单评价
-        /// </summary>
-        public const string HotlineOrderGetVisitInfoSend = "hotline.order.getvisitinfosend";
-        #endregion
-
-        #region 上行（市州向省上推送）
-        #region 协同-第一批次
-
-        /// <summary>
-        /// 服务工单交办处理
-        /// </summary>
-        public const string HotlineOrderGetCaseResultReceive = "hotline.order.getcaseresultreceive";
-
-        /// <summary>
-        /// 服务工单交办处理过程
-        /// </summary>
-        public const string HotlineOrderGetCaseProcessReceive = "hotline.order.getcaseprocessreceive";
-
-        /// <summary>
-        /// 服务工单交办评价
-        /// </summary>
-        public const string HotlineOrderGetVisitInfoReceive = "hotline.order.getvisitinforeceive";
-
-        /// <summary>
-        /// 退回申请
-        /// </summary>
-        public const string HotlineOrderGetCaseBackApply = "hotline.order.getcasebackapply";
-
-        /// <summary>
-        /// 服务工单申请延时
-        /// </summary>
-        public const string HotlineOrderDelayCaseInfoSend = "hotline.order.delaycaseinfosend";
-
-        /// <summary>
-        /// 服务工单督办过程
-        /// </summary>
-        public const string HotlineOrderSendSuperviseProcessInfo = "hotline.order.sendsuperviseprocessinfo";
-        
-        /// <summary>
-        /// 服务工单督办结果
-        /// </summary>
-        public const string HotlineOrderSendSuperviseResultInfo = "hotline.order.sendsuperviseresultinfo";
-
-        /// <summary>
-        /// 工单发起甄别
-        /// </summary>
-        public const string HotlineOrderScreenCaseInfoSend = "hotline.order.screencaseinfosend";
-
-        /// <summary>
-        /// 政民互动提交公开
-        /// </summary>
-        public const string HotlineOrderZMHDCaseInfoPublic = "hotline.order.zmhdcaseinfopublic";
-
-        /// <summary>
-        /// 服务工单拓展信息交办
-        /// </summary>
-        public const string HotlineOrderReceiveCaseExtends = "hotline.order.receivecaseextends";
-
-        /// <summary>
-        /// 材料接口
-        /// </summary>
-        public const string HotlineOrderGetCaseMaterialInfo = "hotline.order.getcasematerialinfo";
-        #endregion
-
-        #region 汇聚-第二批次
-        /// <summary>
-        /// 热线工单创建成功
-        /// </summary>
-        public const string HotlineOrderCreated = "hotline.order.created";
-
-        /// <summary>
-        /// 热线工单流转--服务工单处理
-        /// </summary>
-        public const string HotlineOrderFlow = "hotline.order.flow";
-
-        /// <summary>
-        /// 工单从中心派往部门
-        /// </summary>
-        public const string HotlineOrderCenterToOrg = "hotline.order.centertoorg";
-
-        /// <summary>
-        /// 热线工单归档---服务工单结果
-        /// </summary>
-        public const string HotlineOrderFiled = "hotline.order.filed";
-
-        /// <summary>
-        /// 工单发布
-        /// </summary>
-        public const string HotlineOrderPublished = "hotline.order.published";
-
-        /// <summary>
-        /// 服务工单处理结果
-        /// </summary>
-        public const string HotlineOrderSubmitCaseResult = "hotline.order.submitcaseresult";
-
-        /// <summary>
-        /// 服务工单处理
-        /// </summary>
-        public const string HotlineOrderSubmitCaseProcess = "hotline.order.submitcaseprocess";
-
-        /// <summary>
-        /// 服务工单回访评价
-        /// </summary>
-        public const string HotlineOrderSubmitVisitInfo = "hotline.order.submitvisitinfo";
-
-        /// <summary>
-        /// 电话记录
-        /// </summary>
-        public const string HotlineOrderSubmitCaseRecord = "hotline.order.submitcaserecord";
-
-        /// <summary>
-        /// 统计数据
-        /// </summary>
-        public const string HotlineOrderSubmitCaseTotal = "hotline.order.submitcasetotal";
-
-        /// <summary>
-        /// 服务工单拓展信息
-        /// </summary>
-        public const string HotlineOrderSubmitCaseExtends = "hotline.order.submitcaseextends";
-        #endregion
-
-        #region 协同-第三批次
-        /// <summary>
-        /// 服务工单上报
-        /// </summary>
-        public const string SendCaseInfo = "hotline.order.sendcaseinfo";
-
-        /// <summary>
-        /// 上报补充诉求
-        /// </summary>
-        public const string SupplyCaseInfoSend = "hotline.order.supplycaseinfosend";
-
-        /// <summary>
-        /// 服务工单撤单
-        /// </summary>
-        public const string SendRevokeCaseInfo = "hotline.order.sendrevokecaseinfo";
-
-        /// <summary>
-        /// 服务工单催单
-        /// </summary>
-        public const string SendRemindCaseInfo = "hotline.order.sendremindcaseinfo";
-
-        #endregion
-
-        #region  协同-第四批次
-
-        #region 知识库
-        /// <summary>
-        /// 知识库上报
-        /// </summary>
-        public const string HotlineKnowledgeInfoSend = "hotline.knowledge.infosend";
-
-        /// <summary>
-        /// 知识库变更
-        /// </summary>
-        public const string HotlineKnowledgeInfoUpdate = "hotline.knowledge.infoupdate";
-
-        /// <summary>
-        /// 知识库下架
-        /// </summary>
-        public const string HotlineKnowledgeInfoAbandon = "hotline.knowledge.infoabandon";
-
-        #endregion
-
-        /// <summary>
-        /// 统计数据
-        /// </summary>
-        public const string HotlineSendRealTimeStatus = "hotline.order.sendrealtimestatus";
-        #endregion
-        #endregion
-
     }
 }

src/Hotline/FlowEngine/Workflows/WorkflowDomainService.cs

@@ -64,8 +64,8 @@ namespace Hotline.FlowEngine.Workflows
                 ModuleCode = wfModule.Code,
                 DefinitionId = definition.Id,
                 Status = EWorkflowStatus.Runnable,
-                TimeLimit = GetTimeLimit(definition.Code),//todo
-                ExpiredTime = CalculateExpiredTime(definition.Code),//todo
+                TimeLimit = GetTimeLimit(definition.Code),//todo 过期时间
+                ExpiredTime = CalculateExpiredTime(definition.Code),//todo 过期时间
                 StepBoxes = new(),
                 Traces = new(),
                 Definition = definition,
@@ -272,7 +272,7 @@ namespace Hotline.FlowEngine.Workflows
                     throw new UserFriendlyException(
                         $"未查询到对应会签信息，workflowId:{workflow.Id}, countersignId:{currentStep.CountersignId}", "无效会签编号");
 
-                //todo 1.根据当前节点配置查找结束节点对应开始节点 2.如该开始节点与当前会签开始节点吻合说明可以结束
+                //1.根据当前节点配置查找结束节点对应开始节点 2.如该开始节点与当前会签开始节点吻合说明可以结束
 
                 //如果!=，说明未发起会签而是继承的外层会签
                 if (currentStepBox.CountersignStartStepCode == currentCountersign.StartStepCode)
@@ -333,7 +333,7 @@ namespace Hotline.FlowEngine.Workflows
             //是否从中心流转出去，重新计算expiredTime 
             var isFromCenterToOrg = CheckIfFlowFromCenterToOrg(currentStepBox, nextStepBoxDefine);
             if (isFromCenterToOrg)
-                workflow.CenterToOrg(CalculateExpiredTime(workflow.Definition.Code));//todo
+                workflow.CenterToOrg(CalculateExpiredTime(workflow.Definition.Code));//todo 过期时间
 
             ////最终办理意见与时间处理（解决工单业务需求，如果流程配置普通节点后未配置汇总节点则不会运行到此处）
             //var normalSteps = workflow.StepBoxes
@@ -459,7 +459,7 @@ namespace Hotline.FlowEngine.Workflows
 
             //orgToCenter会触发重新计算期满时间，1.无需审核按当前时间进行计算 2.需审核按审核通过时间计算
             if (CheckIfFlowFromOrgToCenter(currentStepBox, prevStepBox))
-                workflow.OrgToCenter(CalculateExpiredTime(""));//todo
+                workflow.OrgToCenter(CalculateExpiredTime(""));//todo 过期时间
 
             await _workflowRepository.UpdateAsync(workflow, cancellationToken);
 
@@ -1027,21 +1027,6 @@ namespace Hotline.FlowEngine.Workflows
             return steps;
         }
 
-        /// <summary>
-        /// 重置currentStep信息
-        /// </summary>
-        private async Task ResetWorkflowCurrentStepInfo(Workflow workflow, NextWorkflowDto dto, WorkflowStep stepBox, CancellationToken cancellationToken)
-        {
-            //更新当前节点名称、时间、会签节点code
-            workflow.EndCountersign();
-            //todo 不更新实际办理，1.处理会签状态 2.处理当前节点(就是targetStep)
-            //workflow.SetWorkflowActualHandleInfo(isStartCountersign, stepBox);
-
-
-
-            await _workflowRepository.UpdateAsync(workflow, cancellationToken);
-        }
-
         private static void CheckWhetherRunnable(EWorkflowStatus status)
         {
             if (status != EWorkflowStatus.Runnable)
@@ -1372,7 +1357,7 @@ namespace Hotline.FlowEngine.Workflows
             step.Status = stepStatus;
             step.StepCountersignStatus = countersignStatus;
             step.ExpiredTime = expiredTime;
-            step.TimeLimit = GetTimeLimit("");//todo
+            step.TimeLimit = GetTimeLimit("");//todo 过期时间
 
             return step;
         }

src/Hotline/Orders/Order.cs

@@ -489,12 +489,7 @@ namespace Hotline.Orders
         //{
         //    Status = EOrderStatus.WaitForSign;
         //}
-
-        /// <summary>
-        /// 工单从中心派往部门办理
-        /// </summary>
-        public void FlowFromCenterToOrg() => ProcessType = EProcessType.Jiaoban;
-
+        
         /// <summary>
         /// 发布
         /// </summary>

src/Wex.Sdk/WexClient.cs

@@ -39,7 +39,7 @@ public class WexClient : IWexClient
             {
                 PropertyNamingPolicy = JsonNamingPolicy.CamelCase
             }, cancellationToken);
-            if (response.Code == 401)
+            if (response?.Code == 401)
             {
                 await _tokenManager.RefreshTokenAsync(cancellationToken);
                 response = await rsp.Content.ReadFromJsonAsync<TResponse>(new JsonSerializerOptions
@@ -47,8 +47,8 @@ public class WexClient : IWexClient
                     PropertyNamingPolicy = JsonNamingPolicy.CamelCase
                 }, cancellationToken);
             }
-            if (response.Code != 200)
-                throw new HttpRequestException(response.Msg);
+            if (response?.Code != 200)
+                throw new HttpRequestException(response?.Msg);
             return response;
         }
         catch (Exception)