Sfoglia il codice sorgente

修复页面基础数据无数据

qinchaoyue 4 mesi fa
parent
commit
484f424bca

+ 6 - 3
src/Hotline.Api/Controllers/Bi/BiCallController.cs

@@ -20,6 +20,8 @@ using System.Data;
 using System.Linq.Dynamic.Core;
 using XF.Domain.Repository;
 using Hotline.Settings;
+using XF.Utility.EnumExtensions;
+using Hotline.Share.Enums.CallCenter;
 
 namespace Hotline.Api.Controllers.Bi;
 
@@ -167,9 +169,10 @@ public class BiCallController : BaseController
     [HttpGet("query_calls_statistics_detail/base-data")]
     public Dictionary<string, dynamic> QueryCallsStatisticsDetailBaseData()
     {
-        return _baseDataApplication
-            .EndBy()
-            .Build();
+        return new Dictionary<string, dynamic>
+        {
+            { "endBy", EnumExts.GetDescriptions<EEndBy>() }
+        };
     }
 
     /// <summary>

+ 13 - 6
src/Hotline.Api/Controllers/Bi/BiOrderController.cs

@@ -3540,13 +3540,20 @@ namespace Hotline.Api.Controllers.Bi
         /// </summary>
         /// <returns></returns>
         [HttpGet("org-visitdetail-list-basedata")]
-        public Dictionary<string, dynamic> OrgVisitDetailListBaseData()
+        public async Task<Dictionary<string, dynamic>> OrgVisitDetailListBaseData()
         {
-            return _baseDataApplication
-                .VisitSatisfaction()
-                .OrgsOptions(_sessionContext)
-                .AttitudeType()
-                .Build();
+            IReadOnlyList<SystemOrganize> items;
+            if (_sessionContext.OrgIsCenter)
+                items = await _systemOrganizeRepository.GetOrgJson();
+            else
+                items = await _systemOrganizeRepository.GetOrgJsonForUser(_sessionContext.RequiredOrgId); ;
+
+            return new Dictionary<string, dynamic>
+            {
+                { "visitSatisfaction", _systemDicDataCacheManager.GetVisitSatisfaction() },
+                { "orgsOptions", items },
+                { "attitudeType", EnumExts.GetDescriptions<EAttitudeType>() }
+            };
         }
 
         /// <summary>

+ 33 - 12
src/Hotline.Api/Controllers/KnowledgeController.cs

@@ -704,12 +704,24 @@ namespace Hotline.Api.Controllers
                 new KeyValuePair<string, string>("KnowledgeOffshelf", "下架审核"),
             };
 
-            return _baseDataApplication
-                .FileType(EFileType.excel | EFileType.pdf)
-                .Add("tabNames", tabNames)
-                .Add("tabNewDraftsNames", tabNewDraftsNames)
-                .Add("tabAuditingNames", tabAuditingNames)
-                .Build();
+            //return _baseDataApplication
+            //    .FileType(EFileType.excel | EFileType.pdf)
+            //    .Build();
+            var ignoreFileType = EFileType.excel | EFileType.pdf;
+            var items = EnumExts.GetDescriptions<EFileType>();
+            var filteredDictionary = items
+                 .Where(kvp => (ignoreFileType & (EFileType)kvp.Key) == 0)
+                 .ToDictionary(kvp => kvp.Key, kvp => kvp.Value)
+                 .ToList();
+
+            return new Dictionary<string, dynamic>
+            {
+                { "fileType", filteredDictionary},
+                { "fileType", tabNames },
+                { "tabNames", tabNames },
+                { "tabNewDraftsNames", tabNewDraftsNames },
+                { "tabAuditingNames", tabAuditingNames }
+            };
         }
 
         /// <summary>
@@ -765,9 +777,14 @@ namespace Hotline.Api.Controllers
         [HttpGet("knowretrieval/base_data")]
         public Dictionary<string, dynamic> GetKnowretrievalBaseData()
         {
-            return _baseDataApplication
-                .KnowledgeRetrievalType(new[] { 3, 4 })
-                .Build();
+            //return _baseDataApplication
+            //    .KnowledgeRetrievalType(new[] { 3, 4 })
+            //    .Build();
+            var ignoreFileType = new[] { 3, 4 };
+            return new Dictionary<string, dynamic>
+            {
+                { "knowledgeRetrievalType", EnumExts.GetDescriptions<EKnowledgeRetrievalType>().Where(m => !ignoreFileType.Contains(m.Key)).ToList() }
+            };
         }
 
         /// <summary>
@@ -1601,9 +1618,13 @@ namespace Hotline.Api.Controllers
         [HttpGet("hotword/basedata")]
         public Dictionary<string, dynamic> AddKnowledgeHotWordBaseDataAsync()
         {
-            return _baseDataApplication
-                .KnowledgeHotWordType()
-                .Build();
+            //return _baseDataApplication
+            //    .KnowledgeHotWordType()
+            //    .Build();
+            return new Dictionary<string, dynamic>
+            {
+                { "knowledgeHotWordType", EnumExts.GetDescriptions<EKnowledgeHotWordType>() }
+            };
         }
 
         /// <summary>

+ 15 - 6
src/Hotline.Api/Controllers/OrderController.cs

@@ -1205,12 +1205,21 @@ public class OrderController : BaseController
     /// <returns></returns>
     [HttpGet("visit/batch-basedata")]
     public Dictionary<string, dynamic> VisitBatchBaseDat()
-        => _baseDataApplication
-            .SeatEvaluate()
-            .DissatisfiedReason()
-            .VisitSatisfaction()
-            .VisitManner()
-            .Build();
+    {
+        //return _baseDataApplication
+        //    .SeatEvaluate()
+        //    .DissatisfiedReason()
+        //    .VisitSatisfaction()
+        //    .VisitManner()
+        //    .Build();
+        return new Dictionary<string, dynamic>
+        {
+            { "seatEvaluate", EnumExts.GetDescriptions<ESeatEvaluate>() },
+            { "dissatisfiedReason", _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.DissatisfiedReason) },
+            { "visitSatisfaction", _sysDicDataCacheManager.GetVisitSatisfaction() },
+            { "visitManner", _sysDicDataCacheManager.VisitMananer }
+        };
+    }
 
     /// <summary>
     /// 扭转列表