Parcourir la source

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

田爽 il y a 1 mois
Parent
commit
4de0320051

+ 1 - 1
src/Hotline.Api/Controllers/OrderController.cs

@@ -3676,7 +3676,7 @@ public class OrderController : BaseController
         var (total, items) = await query
             .Includes(d => d.OrderScreens)
             .Where(d => d.Contact == dto.PhoneNo)
-            .WhereIF(_sessionContext.OrgIsCenter==false,d=>d.IsSecret==false)
+            .WhereIF(_sessionContext.OrgIsCenter == false && _appOptions.Value.IsYiBin == true, d => d.IsSecret == false)
             .WhereIF(!string.IsNullOrEmpty(dto.OrderId), d => d.Id != dto.OrderId)
             .WhereIF(!string.IsNullOrEmpty(dto.Keyword), d => d.Title.Contains(dto.Keyword!) || d.No.Contains(dto.Keyword!))
             .Select(d => new OrderHistoryOutDto

+ 3 - 3
src/Hotline/Orders/OrderVisitDomainService.cs

@@ -189,12 +189,12 @@ public class OrderVisitDomainService : IOrderVisitDomainService, IScopeDependenc
             .FirstAsync()
             .Then(async detailSeat =>
             {
-                if (smsReplyRule.SeatEvaluate != null || smsReplyRule.VoiceEvaluate != null)
+                if (smsReplyRule.SeatEvaluate != null || smsReplyRule.SmSVoiceEvaluate != null)
                 {
                     if (smsReplyRule.SeatEvaluate != null)
                         detailSeat.SeatEvaluate ??= smsReplyRule.SeatEvaluate;
-                    if (smsReplyRule.VoiceEvaluate != null)
-                        detailSeat.VoiceEvaluate ??= smsReplyRule.VoiceEvaluate;
+                    if (smsReplyRule.SmSVoiceEvaluate != null)
+                        detailSeat.VoiceEvaluate ??= smsReplyRule.SmSVoiceEvaluate;
                     await _orderVisitDetailRepository.UpdateAsync(detailSeat);
                 }
             });

+ 6 - 0
src/Hotline/Settings/SettingOrderVisitSmsReplyRule.cs

@@ -62,6 +62,12 @@ public class SettingOrderVisitSmsReplyRule : FullStateEntity
     [SugarColumn(ColumnDescription = "语音评价(不需要更新就填NULL)")]
     public EVoiceEvaluate? VoiceEvaluate { get; set; }
 
+    /// <summary>
+    /// 短信语音评价(话务评价)
+    /// </summary>
+    [SugarColumn(ColumnDescription = "短信语音评价(不需要更新就填NULL)")]
+    public EVoiceEvaluate? SmSVoiceEvaluate { get; set; }
+
     /// <summary>
     /// 部门办件态度
     /// </summary>