Merge branch 'dev' of http://110.188.24.182:10023/Fengwo/hotline into dev

src/Hotline.Api/Controllers/OrderController.cs

@@ -493,8 +493,10 @@ public class OrderController : BaseController
                 pushaData.Id = order.Id;
                 pushaData.CreationTime = order.CreationTime;
                 //推送消息
+                //await _capPublisher.PublishAsync(Hotline.Share.Mq.EventNames.HotlineOrderContingencyManagement,
+                // pushaData, Hotline.Share.Mq.EventNames.HotlineOrderContingencyManagementState, HttpContext.RequestAborted);
                 await _capPublisher.PublishAsync(Hotline.Share.Mq.EventNames.HotlineOrderContingencyManagement,
-                 pushaData, Hotline.Share.Mq.EventNames.HotlineOrderContingencyManagementState);
+                pushaData, cancellationToken: HttpContext.RequestAborted);
             }
         }
         catch (Exception)

src/Hotline/dataview.md

@@ -6,6 +6,11 @@ CASE "ordertemp"."Status"
 	WHEN 400 THEN '已发布'
 	WHEN 300 THEN '已归档'
 	WHEN 200 THEN '会签中'
+	WHEN 105 THEN '退回审批中'
+	WHEN 104 THEN '特提审批中'
+	WHEN 103 THEN '移交信件'
+	WHEN 102 THEN '退回信件'
+	WHEN 101 THEN '特提信件'
 	WHEN 100 THEN '办理中'
 	WHEN 9 THEN '退回省平台'
 	WHEN 2 THEN '特提待受理'
@@ -17,6 +22,7 @@ CASE 	WHEN "Status">=300 and "ExpiredTime">"FiledTime" THEN '正常'
 		  WHEN "Status">=300 AND "ExpiredTime"<"FiledTime" THEN '超期'
 			WHEN "Status"<300 AND "ExpiredTime"> now() AND now()> "NearlyExpiredTime" THEN '即将超期'
 			WHEN "Status"<300 AND "ExpiredTime">now() AND now()< "NearlyExpiredTime" THEN '正常'
+		  WHEN "Status"<300 AND "ExpiredTime"<now() THEN '超期'
 	ELSE '未知'
 END AS "IsOverExpiredTime",
 "SourceChannel" AS "Source" , 
@@ -82,7 +88,7 @@ END AS "FromGender" ,
 "Content" AS "Content" , 
 "ActualOpinion" AS "ActualOpinion" ,
 "FileOpinion" AS "FileOpinion" ,
-"Id" AS "SugarNav_Id" FROM "order" ordertemp  WHERE (( "CreationTime" >= '2024-03-29' ) AND ( "CreationTime" < '2024-07-3' ))  AND ( "IsDeleted" = FALSE )ORDER BY "CreationTime" ASC) aaa
+"Id" AS "SugarNav_Id" FROM "order" ordertemp  WHERE (( "CreationTime" >= '2024-07-17' ) AND ( "CreationTime" < '2024-07-24' ))  AND ( "IsDeleted" = FALSE )ORDER BY "CreationTime" ASC) aaa
 left join 
 (select DISTINCT CASE visitdetailtemp."SeatEvaluate"
 	WHEN 0 THEN '默认满意'
@@ -96,8 +102,7 @@ left join
 END AS "SeatVisitResult",visittemp."OrderId" as "OrderId"
  from order_visit visittemp
 left join order_visit_detail visitdetailtemp on visittemp."Id"= visitdetailtemp."VisitId"  
-where visittemp."CreationTime">='2024-03-29' and visitdetailtemp."VisitTarget"=10 AND visittemp."VisitState"=30 ) bbb on aaa."SugarNav_Id"=bbb."OrderId";
-
+where visittemp."CreationTime">='2024-07-17' and visitdetailtemp."VisitTarget"=10 AND visittemp."VisitState"=30 ) bbb on aaa."SugarNav_Id"=bbb."OrderId";
 
 
 ### 超期件查询