修改回访推送查询

src/Hotline.Api/Controllers/TestController.cs

@@ -181,7 +181,7 @@ ICallApplication callApplication,
         IOptionsSnapshot<AppConfiguration> appOptions,
         ISystemSettingCacheManager systemSettingCacheManager,
         ICalcExpireTime expireTime
-		)
+        )
     {
         _logger = logger;
         //_authorizeGenerator = authorizeGenerator;
@@ -230,7 +230,7 @@ ICallApplication callApplication,
         _appOptions = appOptions;
         _systemSettingCacheManager = systemSettingCacheManager;
         _expireTime = expireTime;
-	}
+    }
 
 
     [HttpGet("time")]
@@ -290,7 +290,7 @@ ICallApplication callApplication,
         return OpenResponse.Ok(DateTime.Now.ToString("F"));
     }
 
-    
+
     /// <summary>
     /// 通过工单号重推回访到省上
     /// </summary>
@@ -302,7 +302,7 @@ ICallApplication callApplication,
     {
         string[] no = Nos.Split(',');
         var list = await _orderRepository.Queryable()
-             .Includes(x => x.OrderVisits.Where(q => q.VisitState == EVisitState.Visited).ToList(),d=>d.OrderVisitDetails)
+             .Includes(x => x.OrderVisits.Where(q => q.VisitState == EVisitState.Visited).ToList(), d => d.OrderVisitDetails)
              .Where(x => no.Contains(x.No) && x.Status == EOrderStatus.Visited).ToListAsync();
 
         foreach (var item in list)
@@ -321,15 +321,15 @@ ICallApplication callApplication,
                         VisitType = visit.VisitType,
                         VisitName = visit.CreatorName,
                         VisitTime = visit.VisitTime,
-                        VisitRemark = "满意",
+                        VisitRemark = visit.OrderVisitDetails.Where(q => q.VisitTarget == EVisitTarget.Org).FirstOrDefault()?.VisitContent,
                         AreaCode = item.AreaCode!,
-                        SubjectResultSatifyCode = "4",
-                        FirstSatisfactionCode = "4",
+                        SubjectResultSatifyCode = visit.NowEvaluate.Key,
+                        FirstSatisfactionCode = item.FirstVisitResultCode,
                         ClientGuid = ""
                     }, cancellationToken: HttpContext.RequestAborted);
                 }
             }
-            catch {}
+            catch { }
         }
     }
 
@@ -736,18 +736,18 @@ ICallApplication callApplication,
     [HttpGet("t5")]
     public async Task<string> GetUserAllowAnonymous()
     {
-		//var users = await _userRepository.Queryable()
-		//    .FirstAsync(d => d.Name == "xf", HttpContext.RequestAborted);
-		//return users.Id;
-		//var setting = _systemSettingCacheManager.GetSetting(SettingConstants.CityBaseConfiguration)?.SettingValue[0];
-		//CityBaseConfiguration cityBase = JsonConvert.DeserializeObject<CityBaseConfiguration>(setting);
-		//var b = cityBase;
-
-		//var a = await _expireTime.GetWorkDay(DateTime.Now);
-		//自动延期订阅
-		_capPublisher.PublishDelay(DateTime.Parse("2024-10-14 14:28:00") - DateTime.Now.AddHours(1), EventNames.HotlineOrderAutomaticDelay, new PublishAutomaticDelayDto() { OrderId = "08dcebff-2fae-4c30-824f-fe2ef4d582ae" });
-		return string.Empty;
-	}
+        //var users = await _userRepository.Queryable()
+        //    .FirstAsync(d => d.Name == "xf", HttpContext.RequestAborted);
+        //return users.Id;
+        //var setting = _systemSettingCacheManager.GetSetting(SettingConstants.CityBaseConfiguration)?.SettingValue[0];
+        //CityBaseConfiguration cityBase = JsonConvert.DeserializeObject<CityBaseConfiguration>(setting);
+        //var b = cityBase;
+
+        //var a = await _expireTime.GetWorkDay(DateTime.Now);
+        //自动延期订阅
+        _capPublisher.PublishDelay(DateTime.Parse("2024-10-14 14:28:00") - DateTime.Now.AddHours(1), EventNames.HotlineOrderAutomaticDelay, new PublishAutomaticDelayDto() { OrderId = "08dcebff-2fae-4c30-824f-fe2ef4d582ae" });
+        return string.Empty;
+    }
 
     [HttpGet("t6")]
     public async Task<string> GetUserWithAuth()
@@ -1027,9 +1027,10 @@ ICallApplication callApplication,
     /// <returns></returns>
     [HttpGet("automatic_delay")]
     [AllowAnonymous]
-    public async Task AutomaticDelay(DateTime ExpiredTime, string orderId) {
+    public async Task AutomaticDelay(DateTime ExpiredTime, string orderId)
+    {
 
-	    _capPublisher.PublishDelay(ExpiredTime - DateTime.Now.AddHours(1), EventNames.HotlineOrderAutomaticDelay, new PublishAutomaticDelayDto() { OrderId = orderId });
-	}
+        _capPublisher.PublishDelay(ExpiredTime - DateTime.Now.AddHours(1), EventNames.HotlineOrderAutomaticDelay, new PublishAutomaticDelayDto() { OrderId = orderId });
+    }
 
 }