4 Commits eeca2185bf ... 0f5b21aa6a

Auteur SHA1 Message Date
  libin 0f5b21aa6a Merge branch 'test' into lib/test il y a 17 heures
  libin 11f4d2bb85 通话记录传参优化 il y a 17 heures
  guqiang 60623557ff Merge branch 'feature/exam' into test il y a 18 heures
  guqiang b104902c1a 调整培训接口 il y a 18 heures

+ 9 - 9
src/Hotline.Application/Exam/Service/Trains/TrainRecordService.cs

@@ -327,17 +327,17 @@ namespace Hotline.Application.Exam.Service.Trains
         private async Task<List<SimpleKnowladgeDto>> GetKnowladges(EntityQueryRequest entityQueryRequest)
         {
             var questionTable = QuestionQueryable(entityQueryRequest);
-            var questionSourcewareRepository = new ExamRepository<ExamPracticeQuestionSourceware>(_uow, _dataPermissionFilterBuilder, _serviceProvider);
-            var sourcewareRepository = new ExamRepository<KnowledgeBase.Knowledge>(_uow, _dataPermissionFilterBuilder, _serviceProvider);
-            var questionSourcewareTable = questionSourcewareRepository.Queryable();
-            var sourcewareTable = sourcewareRepository.Queryable();
+            var questionKnowladgeRepository = new ExamRepository<ExamTrainPracticeKnowladge>(_uow, _dataPermissionFilterBuilder, _serviceProvider);
+            var knowledgeRepository = new ExamRepository<KnowledgeBase.Knowledge>(_uow, _dataPermissionFilterBuilder, _serviceProvider);
+            var questionKnowladgeTable = questionKnowladgeRepository.Queryable();
+            var knowledgeTable = knowledgeRepository.Queryable();
 
-            var queryable = questionTable.InnerJoin(questionSourcewareTable, (r, p, tpt, tp, ExamPracticeQuestionSourceware) => r.Id == ExamPracticeQuestionSourceware.QuestionId)
-                .InnerJoin(sourcewareTable, (r, p, tpt, tp, ExamPracticeQuestionSourceware,sw) => ExamPracticeQuestionSourceware.SourcewareId == sw.Id)
-                .Select((r, p, tpt, tp, ExamPracticeQuestionSourceware, sw) => new SimpleKnowladgeDto
+            var queryable = questionTable.InnerJoin(questionKnowladgeTable, (r, p, tpt, tp, ExamPracticeQuestionKnowledge) => tp.QuestionId == ExamPracticeQuestionKnowledge.QuestionId)
+                .InnerJoin(knowledgeTable, (r, p, tpt, tp, ExamPracticeQuestionKnowledge,kl) => ExamPracticeQuestionKnowledge.KnowladgeId == kl.Id)
+                .Select((r, p, tpt, tp, ExamPracticeQuestionKnowledge, kl) => new SimpleKnowladgeDto
                 {
-                    Title = sw.Title,
-                    Id = sw.Id
+                    Title = kl.Title,
+                    Id = kl.Id
                 });
 
             return await queryable.ToListAsync();

+ 1 - 1
src/Hotline.Repository.SqlSugar/CallCenter/TrCallRecordRepository.cs

@@ -285,7 +285,7 @@ namespace Hotline.Repository.SqlSugar.CallCenter
                  .WhereIF(!string.IsNullOrEmpty(dto.SensitiveWord), d => SqlFunc.JsonArrayAny(d.Sensitive, dto.SensitiveWord))
                  .WhereIF(dto.IsAiAnswered == true, x => string.IsNullOrEmpty(x.UserId) == true && x.BeginIvrTime.HasValue && x.EndIvrTime.HasValue)
                  .WhereIF(dto.PhoneTypes != null, x => x.PhoneTypes == dto.PhoneTypes)
-                 .WhereIF(dto.QuerySelf == 1, x => x.UserId == _sessionContext.UserId)
+                 .WhereIF(dto.QuerySelf == "true", x => x.UserId == _sessionContext.UserId)
                  .OrderByDescending(x => x.CreatedTime);
         }
 

+ 1 - 1
src/Hotline.Share/Dtos/TrCallCenter/TrTelDao.cs

@@ -581,7 +581,7 @@ namespace Hotline.Share.Dtos.TrCallCenter
         /// <summary>
         /// 是否自己的通话记录
         /// </summary>
-        public int? QuerySelf { get; set; }
+        public string? QuerySelf { get; set; }
     }