Browse Source

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

Dun.Jason 8 months ago
parent
commit
5433f6a71d

+ 1 - 0
src/Hotline.Application/Orders/OrderApplication.cs

@@ -557,6 +557,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
         var result = await _orderVisitRepository.Queryable()
         var result = await _orderVisitRepository.Queryable()
             .LeftJoin<Order>((visit, order) => order.Id == visit.OrderId)
             .LeftJoin<Order>((visit, order) => order.Id == visit.OrderId)
             .Where((visit, order) => visit.VisitTime >= dto.StartTime && visit.VisitTime <= dto.EndTime)
             .Where((visit, order) => visit.VisitTime >= dto.StartTime && visit.VisitTime <= dto.EndTime)
+            .Where((visit, order) => visit.VisitState == EVisitState.Visited)
             .GroupBy((visit, order) => new { order.SourceChannel })
             .GroupBy((visit, order) => new { order.SourceChannel })
             .Select((visit, order) => new OrderVisitSourceChannelDto
             .Select((visit, order) => new OrderVisitSourceChannelDto
             {
             {

+ 9 - 9
src/Hotline/FlowEngine/README.md

@@ -1,11 +1,11 @@
-### 工作流模块实现方案说明
+### 宸ヤ綔娴佹ā鍧楀疄鐜版柟妗堣�鏄�
 
 
-#### 流程模板
-* 同一模板可以配置给多个业务模块使用
-* 发布操作为当前草稿生成新版本号,并将前一个版本变为过期(如前版本为禁用状态则不变)
-* 节点配置是否可以发起会签,但下一节点选中汇总节点时,不允许发起会签
-* 同一模板内的会签策略保持一致
+#### 娴佺▼妯℃澘
+* 鍚屼竴妯℃澘鍙�互閰嶇疆缁欏�涓�笟鍔℃ā鍧椾娇鐢�
+* 鍙戝竷鎿嶄綔涓哄綋鍓嶈崏绋跨敓鎴愭柊鐗堟湰鍙凤紝骞跺皢鍓嶄竴涓�増鏈�彉涓鸿繃鏈燂紙濡傚墠鐗堟湰涓虹�鐢ㄧ姸鎬佸垯涓嶅彉锛�
+* 鑺傜偣閰嶇疆鏄�惁鍙�互鍙戣捣浼氱�锛屼絾涓嬩竴鑺傜偣閫変腑姹囨€昏妭鐐规椂锛屼笉鍏佽�鍙戣捣浼氱�
+* 鍚屼竴妯℃澘鍐呯殑浼氱�绛栫暐淇濇寔涓€鑷�
 
 
-#### 工作流业务模块
-* 按 WorkflowModuleConsts 约定模块编码持久化数据
-* 为模块匹配流程模板
+#### 宸ヤ綔娴佷笟鍔℃ā鍧�
+* 鎸� WorkflowModuleConsts 绾﹀畾妯″潡缂栫爜鎸佷箙鍖栨暟鎹�
+* 涓烘ā鍧楀尮閰嶆祦绋嬫ā鏉�