aivisit

src/Hotline.Ai.Jths/AiVisitService.cs

@@ -44,8 +44,8 @@ namespace Hotline.Ai.Jths
                 BatchStatus = 1,
                 SceneUid = _sceneuid,
                 Priority = 1,
-                StartDate = aiOrderVisit.BeginTime.ToString("yyyy/MM/dd hh:mm:ss"),
-                EndDate = aiOrderVisit.EndTime.ToString("yyyy/MM/dd hh:mm:ss"),
+                StartDate = aiOrderVisit.BeginTime.ToString("yyyy/MM/dd HH:mm:ss"),
+                EndDate = aiOrderVisit.EndTime.ToString("yyyy/MM/dd HH:mm:ss"),
                 FestivalBan = aiOrderVisit.FestivalBan,
                 RuleType = aiOrderVisit.RuleType,
                 RuleUid = _ruleuid,
@@ -72,14 +72,13 @@ namespace Hotline.Ai.Jths
             }
             requestData.TaskDataList = taskDataList;
             var response = await ExecuteAsync<AiVisitServiceRequest, AiVisitServiceResponse>(_baseUrl + "/edas/batchTask",Method.Post, requestData,cancellationToken);
-
-            if (response.TaskInfoList!=null && !string.IsNullOrEmpty(response.BatchUid))
+            if (response.Result.TaskInfoList!=null && !string.IsNullOrEmpty(response.Result.BatchUid))
             {
                 //拼对象
-                aiOrderVisit.BatchUid = response.BatchUid;
+                aiOrderVisit.BatchUid = response.Result.BatchUid;
                 for (int i = 0; i < aiOrderVisit.AiOrderVisitDetails.Count; i++)
                 {
-                    var taskInfo = response.TaskInfoList.FirstOrDefault(x => x.CalledNumber == aiOrderVisit.AiOrderVisitDetails[i].OuterNo);
+                    var taskInfo = response.Result.TaskInfoList.FirstOrDefault(x => x.CalledNumber == aiOrderVisit.AiOrderVisitDetails[i].OuterNo);
                     if (taskInfo != null)
                     {
                         aiOrderVisit.AiOrderVisitDetails[i].AiOrderVisitState = Share.Enums.Ai.EAiOrderVisitState.InProgress;
@@ -95,7 +94,7 @@ namespace Hotline.Ai.Jths
         }
 
 
-        public async Task<TResponse> ExecuteAsync<TRequest,TResponse>(string path, Method httpMethod, TRequest request,
+        public async Task<ApiResponse<TResponse>> ExecuteAsync<TRequest,TResponse>(string path, Method httpMethod, TRequest request,
             CancellationToken cancellationToken)
             where TRequest : class
         {
@@ -114,7 +113,7 @@ namespace Hotline.Ai.Jths
             }
             try
             {
-                var response = await _client.ExecuteAsync<TResponse>(req, cancellationToken);
+                var response = await _client.ExecuteAsync<ApiResponse<TResponse>>(req, cancellationToken);
                 return response.Data;
             }
             catch (Exception e)

src/Hotline.Ai.Jths/OrderVisits/AiVisitServiceResponse.cs

@@ -3,9 +3,6 @@ namespace Hotline.Ai.Jths.OrderVisits
 {
     public class AiVisitServiceResponse
     {
-
-
-
         public string BatchUid { get; set; }
 
         public List<TaskInfoList> TaskInfoList { get; set; }

src/Hotline/Permissions/EPermission.cs

@@ -118,6 +118,11 @@ namespace Hotline.Permissions
         /// </summary>
         [Display(GroupName ="延期待办",Name ="延期审核",Description ="延期审核")]
         DelayOrderAudit = 100501,
+        /// <summary>
+        /// 延期退回
+        /// </summary>
+        [Display(GroupName ="延期待办",Name = "延期退回",Description ="延期退回")]
+        DelayOrderReturn = 100502,
         #endregion
 
         #region 甄别待办
@@ -129,9 +134,13 @@ namespace Hotline.Permissions
         /// <summary>
         /// 甄别审批
         /// </summary>
-        [Display(GroupName = "甄别审批",Name ="甄别审批",Description ="甄别审批")]
+        [Display(GroupName = "甄别待办", Name ="甄别审批",Description ="甄别审批")]
         ScreenOrderAudit = 100601,
-
+        /// <summary>
+        /// 甄别退回
+        /// </summary>
+        [Display(GroupName = "甄别待办",Name ="甄别退回",Description ="甄别退回")]
+        ScreenOrderReturn = 100602,
         #endregion
 
         #region 督办待办
@@ -159,7 +168,16 @@ namespace Hotline.Permissions
         #endregion
 
         #region 催办待办
-
+        /// <summary>
+        /// 催办待办
+        /// </summary>
+        [Display(GroupName = "催办待办",Name ="催办待办",Description = "催办待办")]
+        OrderUrging = 100900,
+        /// <summary>
+        /// 催办签收
+        /// </summary>
+        [Display(GroupName = "催办待办",Name ="催办签收",Description ="催办签收")]
+        OrderUrgingSign = 100902,
 
         #endregion
         #endregion