Merge branch 'test' into feature/exam

合并冲突

src/Hotline.Api/Controllers/Bi/BiCallController.cs

@@ -738,6 +738,38 @@ public class BiCallController : BaseController
                 await _callReportApplication.QueryEnterpriseCallDateStatisticsDetail(dto.QueryDto)
             , "企业服务话务明细", "Date");
 
+    /// <summary>
+    /// 高效服务话务明细
+    /// </summary>
+    /// <param name="dto"></param>
+    /// <returns></returns>
+    [HttpGet("query-gaoxiao-calldate-statistics")]
+    public async Task<object> QueryGaoXiaoCallDateStatisticsDetail([FromQuery] QueryCallDateStatisticsDetailDto dto)
+    {
+        var list = await _callReportApplication.QueryGaoXiaoCallDateStatisticsDetail(dto);
+        var total = new QueryGaoXiaoCallDateStatisticsDetailResp()
+        {
+            Date = "合计",
+            GaoXiaoCallInCount = list.Sum(x => x.GaoXiaoCallInCount),
+            GaoXiaoCallInPutthroughCount = list.Sum(x => x.GaoXiaoCallInPutthroughCount),
+            GaoXiaoQueueOffCount = list.Sum(x => x.GaoXiaoQueueOffCount),//企业服务队列挂断
+            GaoXiaoWaitOffCount = list.Sum(x => x.GaoXiaoWaitOffCount) //企业服务等待挂断
+        };
+        return new { List = list, Total = total };
+    }
+
+    /// <summary>
+    /// 高效服务话务明细导出
+    /// </summary>
+    /// <param name="dto"></param>
+    /// <returns></returns>
+    [HttpPost("query-gaoxiao-calldate-statistics/export")]
+    [LogFilterAlpha("导出日志")]
+    public async Task<FileStreamResult> QueryGaoXiaoCallDateStatisticsDetailExport([FromBody] ExportExcelDto<QueryCallDateStatisticsDetailDto> dto)
+    => _exportApplication.GetExcelFile(
+                dto,
+                await _callReportApplication.QueryGaoXiaoCallDateStatisticsDetail(dto.QueryDto)
+            , "高效服务话务明细", "Date");
 
     /// <summary>
     /// 呼出话务统计明细

src/Hotline.Api/Controllers/Exam/ExamManageController.cs

@@ -3,7 +3,7 @@ using Exam.Share;
 using Exam.Share.ViewResponses.Exam;
 using Hotline.Application.Exam.Constants.ApiRoutes;
 using Hotline.Application.Exam.Interface.ExamManages;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 using Hotline.Share.Requests.Exam;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;

src/Hotline.Api/Controllers/Exam/ExtractRuleController.cs

@@ -3,7 +3,7 @@ using Exam.Infrastructure.Data.Entity;
 using Exam.Share.ViewResponses.Exam;
 using Hotline.Application.Exam.Constants.ApiRoutes;
 using Hotline.Application.Exam.Interface.ExamManages;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 using Hotline.Share.Dtos.TestPapers;
 using Hotline.Share.Requests.Exam;
 using Hotline.Share.ViewResponses.Exam;

src/Hotline.Api/Controllers/Exam/QuestionController.cs

@@ -2,7 +2,7 @@
 using Exam.Share.ViewResponses.Question;
 using Hotline.Application.Exam.Constants.ApiRoutes;
 using Hotline.Application.Exam.Interface.Questions;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 using Hotline.Share.Dtos.Questions;
 using Hotline.Share.Requests.Question;
 using MapsterMapper;

src/Hotline.Api/Controllers/Exam/TestPaperController.cs

@@ -5,7 +5,7 @@ using Exam.Share.ViewResponses.TestPaper;
 using Hotline.Application.Exam.Constants.ApiRoutes;
 using Hotline.Application.Exam.Interface.TestPapers;
 using Hotline.Application.Exam.Service.ExamManages;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 using Hotline.Share.Dtos.Questions;
 using Hotline.Share.Dtos.TestPapers;
 using Hotline.Share.Requests.Exam;

src/Hotline.Api/Controllers/IPPbxController.cs

@@ -687,71 +687,8 @@ namespace Hotline.Api.Controllers
             {
                 //await _iPPbxApplication.ResetTelStatus(null, dto.TelNo, CancellationToken.None);
             }
-
-            #region 处理动作数据
-            TelOperation telOperation = new()
-            {
-                StaffNo = dto.StaffNo,
-                TelNo = dto.TelNo,
-                OperateState = dto.Status,
-                OperateTime = DateTime.Now,
-            };
-
-            switch (dto.Status)
-            {
-                case 0:
-                    telOperation.OperateStateText = "签出";
-                    break;
-                case 100:
-                    telOperation.OperateStateText = "签入";
-                    break;
-                case 200:
-                    telOperation.OperateStateText = "空闲";
-                    break;
-                case 201:
-                    telOperation.OperateStateText = "小休";
-                    break;
-                case 202:
-                    telOperation.OperateStateText = "繁忙";
-                    break;
-                case 300:
-                    telOperation.OperateStateText = "呼入振铃";
-                    break;
-                case 301:
-                    telOperation.OperateStateText = "呼入通话";
-                    break;
-                case 302:
-                    telOperation.OperateStateText = "呼出振铃";
-                    break;
-                case 303:
-                    telOperation.OperateStateText = "呼出通话";
-                    break;
-                case 310:
-                    telOperation.OperateStateText = "通话保持";
-                    break;
-                case 320:
-                    telOperation.OperateStateText = "会议";
-                    break;
-                case 330:
-                    telOperation.OperateStateText = "咨询";
-                    break;
-                case 400:
-                    telOperation.OperateStateText = "整理";
-                    break;
-                case 900:
-                    telOperation.OperateStateText = "注册";
-                    break;
-                case 901:
-                    telOperation.OperateStateText = "注销";
-                    break;
-                default:
-                    break;
-            }
-            await _telOperationRepository.AddAsync(telOperation);
-            #endregion
-
-            dto.Status = await _callTelClient.GetStatusAsync(dto.Status);
-            await _callApplication.EndActionAsync(dto.Adapt<EndActionInDto>());
+            //dto.Status = await _callTelClient.GetStatusAsync(dto.Status);
+            //await _callApplication.EndActionAsync(dto.Adapt<EndActionInDto>());
 
         }
 

src/Hotline.Api/Controllers/Snapshot/SnapshotUserController.cs

@@ -3,6 +3,7 @@ using Hotline.Repository.SqlSugar.Extensions;
 using Hotline.Share.Dtos;
 using Hotline.Share.Dtos.Snapshot;
 using Hotline.Share.Tools;
+using Hotline.Snapshot.IRepository;
 using Microsoft.AspNetCore.Mvc;
 using System.ComponentModel;
 
@@ -12,10 +13,28 @@ namespace Hotline.Api.Controllers.Snapshot;
 public class SnapshotUserController : BaseController
 {
     private readonly ISnapshotUserApplication _snapshotUserApplication;
+    private readonly ISafetyTypeRepository _safetyTypeRepository;
 
-    public SnapshotUserController(ISnapshotUserApplication snapshotUserApplication)
+    public SnapshotUserController(ISnapshotUserApplication snapshotUserApplication, ISafetyTypeRepository safetyTypeRepository)
     {
         _snapshotUserApplication = snapshotUserApplication;
+        _safetyTypeRepository = safetyTypeRepository;
+    }
+
+    /// <summary>
+    /// 获取添加安全志愿者和安全员分类关系的基础数据
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet("citizen_relation/basedata")]
+    public async Task<Dictionary<string, object>> GetCitizenRelationSafetyTypeBase()
+    {
+        var safetyTypes = await _safetyTypeRepository.Queryable()
+            .Select(m => new { m.Id, m.Name})
+            .ToListAsync(HttpContext.RequestAborted);
+        return new Dictionary<string, object>
+        {
+            { "safetyTypes", safetyTypes }
+        };
     }
 
     /// <summary>
@@ -27,11 +46,20 @@ public class SnapshotUserController : BaseController
         => (await _snapshotUserApplication.GetCitizenRelationSafetyType(dto).ToPagedListAsync(dto)).ToPaged();
 
     /// <summary>
-    /// 添加安全志愿者
+    /// 添加安全志愿者和安全员分类关系
     /// </summary>
     /// <param name="dto"></param>
     /// <returns></returns>
     [HttpPost("citizen_relation")]
     public async Task AddCitizenRelationSafetyTypeInDto([FromBody]AddCitizenRelationSafetyTypeInDto dto)
         => await _snapshotUserApplication.AddCitizenRelationSafetyType(dto, HttpContext.RequestAborted);
+
+    /// <summary>
+    /// 批量删除安全志愿者分类关系
+    /// </summary>
+    /// <param name="dto"></param>
+    /// <returns></returns>
+    [HttpDelete("citizen_relation")]
+    public async Task DeleteCitizenRelationSafetyType([FromBody] DeleteCitizenRelationSafetyTypeInDto dto)
+        => await _snapshotUserApplication.DeleteCitizenRelationSafetyAsync(dto);
 }

src/Hotline.Api/Program.cs

@@ -1,6 +1,5 @@
 using Hotline.Api;
 using Serilog;
-using Serilog.Formatting.Display;
 using XF.Domain.Authentications;
 
 Log.Logger = new LoggerConfiguration()
@@ -35,19 +34,12 @@ try
                 .AddCommandLine(args)
                 ;
         })
-        //.UseSerilog((ctx, lc) => lc
-        ////.WriteTo.Console(outputTemplate: "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message:lj}{NewLine}{Exception}{NewLine}")
-        //.Enrich.FromLogContext()
-        //.ReadFrom.Configuration(ctx.Configuration), true)
-        ;
-    
-    builder.Services.AddSerilog((services, lc) => lc
-        .ReadFrom.Configuration(builder.Configuration)
-        .ReadFrom.Services(services)
+        .UseSerilog((ctx, lc) => lc
+        //.WriteTo.Console(outputTemplate: "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message:lj}{NewLine}{Exception}{NewLine}")
         .Enrich.FromLogContext()
-    );
-
-
+        .ReadFrom.Configuration(ctx.Configuration), true)
+        ;
+    //builder.Services.AddControllers().AddNewtonsoftJson();
     builder
         .ConfigureServices()
         .ConfigurePipelines()

src/Hotline.Api/StartupHelper.cs

@@ -327,14 +327,14 @@ namespace Hotline.Api
                             .WithCronSchedule("0/5 * * * * ?")
                         );
 
-                        //var getOperationsJobKey = new JobKey(nameof(XingTangTelOperationSyncJob));
-                        //d.AddJob<XingTangTelOperationSyncJob>(getOperationsJobKey);
-                        //d.AddTrigger(t => t
-                        //    .WithIdentity("get-operationsxt-trigger")
-                        //    .ForJob(getOperationsJobKey)
-                        //    .StartNow()
-                        //    .WithCronSchedule("0/10 * * * * ?")
-                        //);
+                        var getOperationsJobKey = new JobKey(nameof(XingTangTelOperationSyncJob));
+                        d.AddJob<XingTangTelOperationSyncJob>(getOperationsJobKey);
+                        d.AddTrigger(t => t
+                            .WithIdentity("get-operationsxt-trigger")
+                            .ForJob(getOperationsJobKey)
+                            .StartNow()
+                            .WithCronSchedule("0/10 * * * * ?")
+                        );
 
                         var getCallSatisfactionJobKey = new JobKey(nameof(XingTangCallSatisfactionSyncJob));
                         d.AddJob<XingTangCallSatisfactionSyncJob>(getCallSatisfactionJobKey);

src/Hotline.Api/config/appsettings.Development.json

@@ -1,7 +1,7 @@
 {
   "AllowedHosts": "*",
   "AppConfiguration": {
-    "AppScope": "LuZhou",
+    "AppScope": "YiBin",
     "YiBin": {
       "AreaCode": "511500",
       "CallCenterType": "TianRun", //XunShi、WeiErXin、TianRun、XingTang

src/Hotline.Application/Exam/Interface/ExamManages/IExamManageService.cs

@@ -1,7 +1,7 @@
 using Exam.Share;
 using Exam.Share.ViewResponses.Exam;
 using Hotline.Exams.ExamManages;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 using Hotline.Share.Requests.Exam;
 using Microsoft.AspNetCore.Http;
 

src/Hotline.Application/Exam/Interface/ExamManages/IExamTagService.cs

@@ -1,5 +1,5 @@
 using Hotline.Exams.ExamManages;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 using Hotline.Share.Dtos.ExamManages;
 using Hotline.Share.Requests.Exam;
 using Hotline.Share.ViewResponses.Exam;

src/Hotline.Application/Exam/Interface/ExamManages/IExtractRuleService.cs

@@ -1,6 +1,6 @@
 using Exam.Share.ViewResponses.Exam;
 using Hotline.Exams.ExamManages;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 using Hotline.Share.Dtos.TestPapers;
 using Hotline.Share.Requests.Exam;
 using Hotline.Share.ViewResponses.Exam;

src/Hotline.Application/Exam/Interface/ExamManages/IUnExamUserService.cs

@@ -1,6 +1,6 @@
 using Exam.Share;
 using Exam.Share.ViewResponses.Exam;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 using Hotline.Share.Requests.Exam;
 
 namespace Hotline.Application.Exam.Interface.ExamManages

src/Hotline.Application/Exam/Interface/ExamManages/IUserExamResultService.cs

@@ -1,6 +1,6 @@
 using Exam.Share;
 using Exam.Share.ViewResponses.Exam;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 using Hotline.Share.Requests.Exam;
 
 namespace Hotline.Application.Exam.Interface.ExamManages

src/Hotline.Application/Exam/Interface/ExamManages/IUserExamService.cs

@@ -3,7 +3,7 @@ using Exam.Share;
 using Exam.Share.Dtos.ExamManage;
 using Exam.Share.ViewResponses.Exam;
 using Hotline.Exams.ExamManages;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 using Hotline.Share.Dtos.ExamManages;
 using Hotline.Share.Requests.Exam;
 using Hotline.Share.ViewResponses.Exam;

src/Hotline.Application/Exam/Interface/Practices/IPracticeService.cs

@@ -1,7 +1,7 @@
 using Exam.Share;
 using Exam.Share.ViewResponses.Practices;
 using Hotline.Exams.Practices;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 using Hotline.Share.Dtos.Practices;
 using Hotline.Share.Requests.Exam;
 using Hotline.Share.Requests.TestPaper;

src/Hotline.Application/Exam/Interface/Questions/IQuestionAnswerService.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel;
 using Exam.Share;
 using Hotline.Exams.Questions;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 using Hotline.Share.Dtos.Questions;
 using Hotline.Share.Requests.Question;
 

src/Hotline.Application/Exam/Interface/Questions/IQuestionKnowladgeService.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel;
 using Exam.Share;
 using Hotline.Exams.TestPapers;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 using Hotline.Share.Dtos.Questions;
 using Hotline.Share.Requests.Question;
 

src/Hotline.Application/Exam/Interface/Questions/IQuestionOptionsService.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel;
 using Exam.Share;
 using Hotline.Exams.Questions;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 using Hotline.Share.Dtos.Questions;
 using Hotline.Share.Requests.Question;
 

src/Hotline.Application/Exam/Interface/Questions/IQuestionService.cs

@@ -1,6 +1,6 @@
 using Exam.Share.ViewResponses.Question;
 using Hotline.Exams.Questions;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 using Hotline.Share.Dtos.Questions;
 using Hotline.Share.Requests.Question;
 using Microsoft.AspNetCore.Http;

src/Hotline.Application/Exam/Interface/Questions/IQuestionSourcewareService.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel;
 using Exam.Share;
 using Hotline.Exams.Practices;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 using Hotline.Share.Dtos.Questions;
 using Hotline.Share.Requests.Question;
 

src/Hotline.Application/Exam/Interface/Questions/IQuestionTagService.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel;
 using Exam.Share;
 using Hotline.Exams.Questions;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 using Hotline.Share.Dtos.Questions;
 using Hotline.Share.Requests.Question;
 

src/Hotline.Application/Exam/Interface/Sourcewares/ISourcewareCategoryService.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel;
 using Exam.Share.ViewResponses.Sourceware;
 using Hotline.Exams.Sourcewares;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 using Hotline.Share.Dtos.Sourcewares;
 using Hotline.Share.Requests.Sourceware;
 

src/Hotline.Application/Exam/Interface/Sourcewares/ISourcewareService.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel;
 using Hotline.Exams.Sourcewares;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 using Hotline.Share.Dtos.Sourcewares;
 using Hotline.Share.Requests.Sourceware;
 using Hotline.Share.ViewResponses.Sourcewares;

src/Hotline.Application/Exam/Interface/TestPapers/ITestPaperService.cs

@@ -1,6 +1,6 @@
 using Exam.Share.ViewResponses.TestPaper;
 using Hotline.Exams.TestPapers;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 using Hotline.Share.Dtos.TestPapers;
 using Hotline.Share.Requests.Exam;
 using Hotline.Share.Requests.TestPaper;

src/Hotline.Application/Exam/Interface/Train/ITrainPlanService.cs

@@ -1,7 +1,7 @@
 using Exam.Share;
 using Exam.Share.ViewResponses.Train;
 using Hotline.Exams.Trains;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 using Hotline.Share.Requests.Train;
 
 namespace Hotline.Application.Exam.Interface.Train

src/Hotline.Application/Exam/Interface/Train/ITrainRecordAnswerService.cs

@@ -1,5 +1,5 @@
 using Hotline.Exams.Trains;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 using Hotline.Share.Dtos.Trains;
 
 namespace Hotline.Application.Exam.Interface.Train

src/Hotline.Application/Exam/Interface/Train/ITrainRecordService.cs

@@ -1,7 +1,7 @@
 using Exam.Share.Dtos.Trains;
 using Exam.Share.ViewResponses.Train;
 using Hotline.Exams.Trains;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 using Hotline.Share.Dtos.Trains;
 using Hotline.Share.Requests.Train;
 using Hotline.Share.ViewResponses.Trains;

src/Hotline.Application/Exam/Interface/Train/ITrainTemplateService.cs

@@ -1,6 +1,6 @@
 using Exam.Share.ViewResponses.Train;
 using Hotline.Exams.Trains;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 using Hotline.Share.Dtos.Trains;
 using Hotline.Share.Requests.Train;
 

src/Hotline.Application/Exam/Proxy/ExamManageProxy.cs

@@ -1,13 +1,10 @@
-using Exam.Repository.Sqlsugar.Repositories;
-using Hotline.Exams.ExamManages;
-using Hotline.Exams.Questions;
-using Hotline.Repository.SqlSugar;
+using Hotline.Repository.SqlSugar;
 using Hotline.Repository.SqlSugar.DataPermissions;
+using Hotline.Repository.SqlSugar.Exam.Extensions;
 using Hotline.Repository.SqlSugar.Exam.Interfaces.ExamManages;
 using Hotline.Repository.SqlSugar.Exam.Interfaces.Exams;
 using Hotline.Repository.SqlSugar.Exam.Interfaces.Questions;
-using Hotline.Repository.SqlSugar.Extensions;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Repositories;
 using MapsterMapper;
 using SqlSugar;
 using XF.Domain.Authentications;

src/Hotline.Application/Exam/Proxy/TestPaperProxy.cs

@@ -1,16 +1,16 @@
-using Exam.Repository.Sqlsugar.Repositories;
-using Hotline.Exams.TestPapers;
+using Hotline.Exams.TestPapers;
 using Hotline.Repository.SqlSugar;
 using Hotline.Repository.SqlSugar.DataPermissions;
 using Hotline.Repository.SqlSugar.Exam.Interfaces.Questions;
 using Hotline.Repository.SqlSugar.Exam.Interfaces.TestPapers;
-using Hotline.Repository.SqlSugar.Extensions;
 using MapsterMapper;
 using SqlSugar;
 using System.Threading;
 using Hotline.Exams.Questions;
+using Hotline.Repository.SqlSugar.Exam.Repositories;
 using XF.Domain.Authentications;
 using XF.Domain.Repository;
+using Hotline.Repository.SqlSugar.Exam.Extensions;
 
 namespace Hotline.Application.Exam.Proxy
 {

src/Hotline.Application/Exam/Service/ExamManages/ExamManageService.cs

@@ -1,48 +1,37 @@
 using Exam.Infrastructure.Data.Entity;
 using Exam.Infrastructure.Enums;
 using Exam.Infrastructure.Extensions;
-using Exam.Insfrastructure.Service.Service;
-using Exam.Repository.Sqlsugar.Repositories;
 using Exam.Share;
 using Exam.Share.ViewResponses.Exam;
 using Hotline.Application.Exam.Interface.ExamManages;
 using Hotline.Repository.SqlSugar;
 using Hotline.Repository.SqlSugar.DataPermissions;
 using Hotline.Repository.SqlSugar.Exam.Interfaces.ExamManages;
-using Hotline.Repository.SqlSugar.Interface;
-using Hotline.Share.Dtos.Questions;
 using Hotline.Share.Requests.Exam;
-using JiebaNet.Segmenter.Common;
 using MapsterMapper;
 using SqlSugar;
 using XF.Domain.Dependency;
 using XF.Domain.Entities;
-using Hotline.Repository.SqlSugar.Extensions;
 using Hotline.Application.Exam.QueryExtensions.ExamManages;
 using XF.Domain.Exceptions;
-using NetTaste;
-using Exam.Infrastructure.Validation.Validation;
 using Hotline.Application.Exam.Extensions;
 using XF.Domain.Authentications;
 using Hotline.Repository.SqlSugar.Exam.Core.Constants;
-using Exam.Repository.Sqlsugar.Repositories.ExamManages;
-using NPOI.SS.Formula.Functions;
 using Hotline.Exams.TestPapers;
 using Hotline.Application.Exam.Proxy;
 using Hotline.Repository.SqlSugar.Exam.Interfaces.TestPapers;
 using Hotline.Repository.SqlSugar.Exam.Interfaces.Questions;
-using Microsoft.AspNetCore.Http;
-using Hotline.Tools;
 using Hotline.Users;
-using System.Buffers;
-using Exam.Repository.Sqlsugar.Repositories.TestPapers;
 using Hotline.Application.Exam.Core.Extensions;
 using Hotline.Application.Exam.Core.Utilities;
 using Hotline.Exams.ExamManages;
 using Hotline.Exams.Questions;
 using Hotline.Repository.SqlSugar.Exam.Interfaces.Exams;
+using Hotline.Repository.SqlSugar.Exam.Repositories;
 using ExamErrorMessage = Hotline.Exams.Validate.ExamErrorMessage;
 using ExamQuestion = Hotline.Exams.Questions.ExamQuestion;
+using Hotline.Repository.SqlSugar.Exam.Service;
+using Hotline.Repository.SqlSugar.Exam.Extensions;
 
 namespace Hotline.Application.Exam.Service.ExamManages
 {

src/Hotline.Application/Exam/Service/ExamManages/ExamTagService.cs

@@ -1,7 +1,6 @@
 using Exam.Application.Interface.Exam;
 using Exam.Infrastructure.Data.Entity;
 using Exam.Infrastructure.Extensions;
-using Exam.Insfrastructure.Service.Service;
 using Exam.Share.ViewResponses.Sourceware;
 using Hotline.Application.Exam.Constants.Messages;
 using Hotline.Application.Exam.Extensions;
@@ -20,6 +19,7 @@ using Hotline.Application.Exam.Interface.ExamManages;
 using Hotline.Exams.ExamManages;
 using XF.Domain.Dependency;
 using XF.Domain.Exceptions;
+using Hotline.Repository.SqlSugar.Exam.Service;
 
 namespace Hotline.Application.Exam.Service.ExamManages
 {

src/Hotline.Application/Exam/Service/ExamManages/ExtractRuleService.cs

@@ -3,8 +3,6 @@ using Exam.Application.Interface.Exam;
 using Exam.Infrastructure.Data.Entity;
 using Exam.Infrastructure.Enums;
 using Exam.Infrastructure.Extensions;
-using Exam.Insfrastructure.Service.Service;
-using Exam.Repository.Sqlsugar.Repositories;
 using Exam.Share.ViewResponses.Exam;
 using Hotline.Application.Exam.Core.Extensions;
 using Hotline.Application.Exam.Core.Utilities;
@@ -16,9 +14,11 @@ using Hotline.Exams.Questions;
 using Hotline.Repository.SqlSugar;
 using Hotline.Repository.SqlSugar.DataPermissions;
 using Hotline.Repository.SqlSugar.Exam.Core.Constants;
+using Hotline.Repository.SqlSugar.Exam.Extensions;
 using Hotline.Repository.SqlSugar.Exam.Interfaces.ExamManages;
 using Hotline.Repository.SqlSugar.Exam.Interfaces.Questions;
-using Hotline.Repository.SqlSugar.Extensions;
+using Hotline.Repository.SqlSugar.Exam.Repositories;
+using Hotline.Repository.SqlSugar.Exam.Service;
 using Hotline.Share.Dtos.TestPapers;
 using Hotline.Share.Requests.Exam;
 using Hotline.Share.Tools;

src/Hotline.Application/Exam/Service/ExamManages/UserExamService.cs

@@ -1,14 +1,7 @@
-using DocumentFormat.OpenXml.Drawing;
-using DocumentFormat.OpenXml.Drawing.Charts;
-using DocumentFormat.OpenXml.Office2010.Excel;
-using Exam.Application.Interface.Exam;
+using Exam.Application.Interface.Exam;
 using Exam.Infrastructure.Data.Entity;
-using Exam.Infrastructure.Data.Interface;
 using Exam.Infrastructure.Enums;
 using Exam.Infrastructure.Extensions;
-using Exam.Infrastructure.Validation.Validation;
-using Exam.Insfrastructure.Service.Service;
-using Exam.Repository.Sqlsugar.Repositories;
 using Exam.Share;
 using Exam.Share.Dtos.ExamManage;
 using Exam.Share.ViewResponses.Exam;
@@ -18,15 +11,10 @@ using Hotline.Application.Exam.Interface.Strategy;
 using Hotline.Application.Exam.QueryExtensions.ExamManages;
 using Hotline.Application.Exam.Strategy;
 using Hotline.Exams.ExamManages;
-using Hotline.Exams.TestPapers;
 using Hotline.Repository.SqlSugar;
 using Hotline.Repository.SqlSugar.DataPermissions;
 using Hotline.Repository.SqlSugar.Exam.Interfaces.ExamManages;
-using Hotline.Repository.SqlSugar.Extensions;
-using Hotline.Repository.SqlSugar.Interface;
-using Hotline.Settings;
 using Hotline.Share.Dtos.ExamManages;
-using Hotline.Share.Dtos.Org;
 using Hotline.Share.Exams.Extensions;
 using Hotline.Share.Requests.Exam;
 using Hotline.Share.ViewResponses;
@@ -34,19 +22,17 @@ using Hotline.Share.ViewResponses.Exam;
 using Hotline.Users;
 using JiebaNet.Segmenter.Common;
 using MapsterMapper;
-using NPOI.SS.Formula.Functions;
-using SqlSugar;
-using System.Linq;
-using System.Threading.Tasks;
 using Hotline.Application.Exam.Core.Utilities;
 using Hotline.Application.Exam.Interface.ExamManages;
-using Hotline.Exams.Questions;
 using Hotline.Exams.Validate;
+using Hotline.Repository.SqlSugar.Exam.Repositories;
 using XF.Domain.Authentications;
 using XF.Domain.Dependency;
 using XF.Domain.Exceptions;
 using XF.Domain.Repository;
 using ExamQuestion = Hotline.Exams.Questions.ExamQuestion;
+using Hotline.Repository.SqlSugar.Exam.Service;
+using Hotline.Repository.SqlSugar.Exam.Extensions;
 
 namespace Hotline.Application.Exam.Service.ExamManages
 {

src/Hotline.Application/Exam/Service/Practices/PracticeService.cs

@@ -1,8 +1,6 @@
 using Exam.Infrastructure.Data.Entity;
 using Exam.Infrastructure.Data.Interface;
-using Exam.Insfrastructure.Service.Service;
 using Exam.Repository.Sqlsugar;
-using Exam.Repository.Sqlsugar.Repositories;
 using Exam.Share;
 using Exam.Share.ViewResponses.Exam;
 using Exam.Share.ViewResponses.Practices;
@@ -19,7 +17,6 @@ using Hotline.Repository.SqlSugar.DataPermissions;
 using Hotline.Repository.SqlSugar.Exam.Core.Constants;
 using Hotline.Repository.SqlSugar.Exam.Interfaces.Practices;
 using Hotline.Repository.SqlSugar.Exam.Interfaces.Questions;
-using Hotline.Repository.SqlSugar.Extensions;
 using Hotline.Share.Dtos.Practices;
 using Hotline.Share.Dtos.Questions;
 using Hotline.Share.Dtos.TestPapers;
@@ -36,8 +33,11 @@ using SqlSugar;
 using System.Linq;
 using Hotline.Application.Exam.Interface.Practices;
 using Hotline.Exams.Questions;
+using Hotline.Repository.SqlSugar.Exam.Repositories;
 using XF.Domain.Authentications;
 using XF.Domain.Dependency;
+using Hotline.Repository.SqlSugar.Exam.Service;
+using Hotline.Repository.SqlSugar.Exam.Extensions;
 
 namespace Hotline.Application.Exam.Service.Practices
 {

src/Hotline.Application/Exam/Service/Questions/QuestionService.cs

@@ -3,15 +3,12 @@ using Exam.Application;
 using Exam.Infrastructure.Data.Entity;
 using Exam.Infrastructure.Enums;
 using Exam.Infrastructure.Extensions;
-using Exam.Insfrastructure.Service.Service;
-using Exam.Repository.Sqlsugar.Repositories;
 using Exam.Share.ViewResponses.Question;
 using Hotline.Application.Exam.QueryExtensions.Questions;
 using Hotline.Exams.Sourcewares;
 using Hotline.Repository.SqlSugar;
 using Hotline.Repository.SqlSugar.DataPermissions;
 using Hotline.Repository.SqlSugar.Exam.Interfaces.Questions;
-using Hotline.Repository.SqlSugar.Extensions;
 using Hotline.Share.Dtos.Questions;
 using Hotline.Share.Requests.Question;
 using JiebaNet.Segmenter.Common;
@@ -37,12 +34,15 @@ using Hotline.Application.Exam.Core.Utilities;
 using Hotline.Application.Exam.Interface.Questions;
 using Hotline.Exams.ExamManages;
 using Hotline.Exams.Questions;
+using Hotline.Repository.SqlSugar.Exam.Repositories;
 using Hotline.Share.Dtos.TestPapers;
 using ExamQuestion = Hotline.Exams.Questions.ExamQuestion;
 using ExamQuestionAnswer = Hotline.Exams.Questions.ExamQuestionAnswer;
 using ExamQuestionKnowladge = Hotline.Exams.Questions.ExamQuestionKnowladge;
 using ExamQuestionOptions = Hotline.Exams.Questions.ExamQuestionOptions;
 using ExamQuestionSourceware = Hotline.Exams.Questions.ExamQuestionSourceware;
+using Hotline.Repository.SqlSugar.Exam.Service;
+using Hotline.Repository.SqlSugar.Exam.Extensions;
 
 namespace Hotline.Application.Exam.Service.Questions
 {

src/Hotline.Application/Exam/Service/Sourcewares/SourcewareCategoryService.cs

@@ -1,7 +1,6 @@
 using System.ComponentModel;
 using Exam.Infrastructure.Data.Entity;
 using Exam.Infrastructure.Extensions;
-using Exam.Insfrastructure.Service.Service;
 using Exam.Share.ViewResponses.Sourceware;
 using Hotline.Application.Exam.Constants.Messages;
 using Hotline.Application.Exam.Extensions;
@@ -10,6 +9,7 @@ using Hotline.Application.Exam.QueryExtensions.Sourcewares;
 using Hotline.Exams.Sourcewares;
 using Hotline.Repository.SqlSugar;
 using Hotline.Repository.SqlSugar.Exam.Interfaces.Sourcewares;
+using Hotline.Repository.SqlSugar.Exam.Service;
 using Hotline.Share.Dtos.Sourcewares;
 using Hotline.Share.Requests.Sourceware;
 using MapsterMapper;

src/Hotline.Application/Exam/Service/Sourcewares/SourcewareService.cs

@@ -3,7 +3,6 @@ using Exam.Infrastructure.Data.Entity;
 using Exam.Infrastructure.Data.Interface;
 using Exam.Infrastructure.Extensions;
 using Exam.Infrastructure.Validation.Constants;
-using Exam.Insfrastructure.Service.Service;
 using Hotline.Exams.Sourcewares;
 using Hotline.Repository.SqlSugar;
 using Hotline.Repository.SqlSugar.DataPermissions;
@@ -18,6 +17,7 @@ using System.ComponentModel;
 using Hotline.Application.Exam.Interface.Sourcewares;
 using Hotline.Application.Exam.QueryExtensions.Sourcewares;
 using XF.Domain.Dependency;
+using Hotline.Repository.SqlSugar.Exam.Service;
 
 namespace Hotline.Application.Exam.Service.Sourcewares
 {

src/Hotline.Application/Exam/Service/TestPapers/TestPaperService.cs

@@ -3,10 +3,7 @@ using Exam.Infrastructure.Data.Entity;
 using Exam.Infrastructure.Data.Interface;
 using Exam.Infrastructure.Enums;
 using Exam.Infrastructure.Extensions;
-using Exam.Insfrastructure.Service.Service;
 using Exam.Repository.Sqlsugar;
-using Exam.Repository.Sqlsugar.Repositories;
-using Exam.Repository.Sqlsugar.Repositories.TestPapers;
 using Exam.Share.ViewResponses.TestPaper;
 using Hotline.Application.Exam.Core.Extensions;
 using Hotline.Application.Exam.Extensions;
@@ -19,7 +16,6 @@ using Hotline.Repository.SqlSugar.Exam.Core.Constants;
 using Hotline.Repository.SqlSugar.Exam.Interfaces.Questions;
 using Hotline.Repository.SqlSugar.Exam.Interfaces.TestPapers;
 using Hotline.Repository.SqlSugar.Exam.Repositories.TestPapers;
-using Hotline.Repository.SqlSugar.Extensions;
 using Hotline.Share.Dtos.Questions;
 using Hotline.Share.Dtos.TestPapers;
 using Hotline.Share.Dtos.Trains;
@@ -38,6 +34,7 @@ using Hotline.Application.Exam.Core.Utilities;
 using Hotline.Application.Exam.Interface.TestPapers;
 using Hotline.Exams.ExamManages;
 using Hotline.Exams.Questions;
+using Hotline.Repository.SqlSugar.Exam.Repositories;
 using XF.Domain.Authentications;
 using XF.Domain.Dependency;
 using XF.Domain.Repository;
@@ -46,6 +43,8 @@ using ExamQuestionAnswer = Hotline.Exams.Questions.ExamQuestionAnswer;
 using ExamQuestionKnowladge = Hotline.Exams.Questions.ExamQuestionKnowladge;
 using ExamQuestionOptions = Hotline.Exams.Questions.ExamQuestionOptions;
 using ExamQuestionSourceware = Hotline.Exams.Questions.ExamQuestionSourceware;
+using Hotline.Repository.SqlSugar.Exam.Service;
+using Hotline.Repository.SqlSugar.Exam.Extensions;
 
 namespace Hotline.Application.Exam.Service.TestPapers
 {

src/Hotline.Application/Exam/Service/Trains/TrainPlanService.cs

@@ -2,8 +2,6 @@
 using Exam.Infrastructure.Data.Entity;
 using Exam.Infrastructure.Enums;
 using Exam.Infrastructure.Extensions;
-using Exam.Insfrastructure.Service.Service;
-using Exam.Repository.Sqlsugar.Repositories;
 using Exam.Share;
 using Exam.Share.ViewResponses.Train;
 using Hotline.Application.Exam.Core.Constants;
@@ -16,8 +14,10 @@ using Hotline.Exams.Trains;
 using Hotline.Repository.SqlSugar;
 using Hotline.Repository.SqlSugar.DataPermissions;
 using Hotline.Repository.SqlSugar.Exam.Core.Constants;
+using Hotline.Repository.SqlSugar.Exam.Extensions;
 using Hotline.Repository.SqlSugar.Exam.Interfaces.Trains;
-using Hotline.Repository.SqlSugar.Extensions;
+using Hotline.Repository.SqlSugar.Exam.Repositories;
+using Hotline.Repository.SqlSugar.Exam.Service;
 using Hotline.Share.Dtos.Trains;
 using Hotline.Share.Requests.Train;
 using Hotline.Users;

src/Hotline.Application/Exam/Service/Trains/TrainRecordService.cs

@@ -1,8 +1,5 @@
 using Exam.Infrastructure.Data.Entity;
 using Exam.Infrastructure.Validation.Validation;
-using Exam.Insfrastructure.Service.Service;
-using Exam.Repository.Sqlsugar.Repositories;
-using Exam.Repository.Sqlsugar.Repositories.Trains;
 using Exam.Share.Dtos.Trains;
 using Exam.Share.ViewResponses.Train;
 using Hotline.Application.Exam.Core.Extensions;
@@ -14,7 +11,6 @@ using Hotline.Exams.Trains;
 using Hotline.Repository.SqlSugar;
 using Hotline.Repository.SqlSugar.DataPermissions;
 using Hotline.Repository.SqlSugar.Exam.Interfaces.Trains;
-using Hotline.Repository.SqlSugar.Extensions;
 using Hotline.Share.Dtos.Questions;
 using Hotline.Share.Dtos.Trains;
 using Hotline.Share.Requests.Exam;
@@ -31,7 +27,10 @@ using NPOI.SS.Formula.Functions;
 using Hotline.Repository.SqlSugar.Exam.Repositories.Trains;
 using static NPOI.HSSF.Util.HSSFColor;
 using DocumentFormat.OpenXml.Drawing.Charts;
+using Hotline.Repository.SqlSugar.Exam.Repositories;
 using JiebaNet.Segmenter.Common;
+using Hotline.Repository.SqlSugar.Exam.Service;
+using Hotline.Repository.SqlSugar.Exam.Extensions;
 
 namespace Hotline.Application.Exam.Service.Trains
 {

src/Hotline.Application/Exam/Service/Trains/TrainTemplateService.cs

@@ -1,9 +1,6 @@
-using DocumentFormat.OpenXml.Office2010.Excel;
-using Exam.Infrastructure.Data.Entity;
+using Exam.Infrastructure.Data.Entity;
 using Exam.Infrastructure.Enums;
 using Exam.Infrastructure.Extensions;
-using Exam.Insfrastructure.Service.Service;
-using Exam.Repository.Sqlsugar.Repositories;
 using Exam.Share.ViewResponses.Train;
 using Hotline.Application.Exam.Core.Constants;
 using Hotline.Application.Exam.Core.Extensions;
@@ -12,16 +9,15 @@ using Hotline.Application.Exam.Extensions;
 using Hotline.Application.Exam.Interface.Train;
 using Hotline.Application.Exam.QueryExtensions.Trains;
 using Hotline.Exams.Questions;
-using Hotline.Exams.TestPapers;
 using Hotline.Exams.Trains;
 using Hotline.Repository.SqlSugar;
 using Hotline.Repository.SqlSugar.DataPermissions;
 using Hotline.Repository.SqlSugar.Exam.Core.Constants;
+using Hotline.Repository.SqlSugar.Exam.Extensions;
 using Hotline.Repository.SqlSugar.Exam.Interfaces.Questions;
 using Hotline.Repository.SqlSugar.Exam.Interfaces.Trains;
-using Hotline.Repository.SqlSugar.Extensions;
-using Hotline.Repository.SqlSugar.Interface;
-using Hotline.Share.Dtos.Questions;
+using Hotline.Repository.SqlSugar.Exam.Repositories;
+using Hotline.Repository.SqlSugar.Exam.Service;
 using Hotline.Share.Dtos.Trains;
 using Hotline.Share.Requests.Train;
 using JiebaNet.Segmenter.Common;

src/Hotline.Application/OrderApp/OrderApplication.cs

@@ -5726,7 +5726,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
                 .Where((x, su) => x.ModuleCode == WorkflowModuleConsts.OrderHandle && x.BusinessType == EBusinessType.Send)
                 .Where((x, su) => x.CreationTime >= dto.StartTime.Value && x.CreationTime <= dto.EndTime.Value && su.UserId == dto.UserId)
                 .WhereIF(dto.TitleCode.ToUpper() == "NOSENDORDERNUM", (x, su) => x.Status != EWorkflowStepStatus.Handled)
-                .WhereIF(dto.TitleCode.ToUpper() == "SENDORDERNUM", (x, su) => x.Status == EWorkflowStepStatus.Handled && !SqlFunc.JsonListObjectAny(x.NextHandlers, "OrgId", OrgSeedData.CenterId))
+                .WhereIF(dto.TitleCode.ToUpper() == "SENDORDERNUM", (x, su) => x.Status == EWorkflowStepStatus.Handled )
                 .GroupBy((x, su) => x.ExternalId)
                 .Select((x, su) => new { Id = x.ExternalId })
                 .MergeTable()
@@ -5765,7 +5765,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
                 .Where(x => x.ModuleCode == WorkflowModuleConsts.OrderHandle && (x.Name == "派单组" || x.Name == "班长审批"))
                 .Where(x => x.CreationTime >= dto.StartTime.Value && x.CreationTime <= dto.EndTime.Value && x.HandlerId == dto.UserId)
                 .WhereIF(dto.TitleCode.ToUpper() == "NOSENDORDERNUM", x => x.Status != EWorkflowStepStatus.Handled)
-                .WhereIF(dto.TitleCode.ToUpper() == "SENDORDERNUM", x => x.Status == EWorkflowStepStatus.Handled)
+                .WhereIF(dto.TitleCode.ToUpper() == "SENDORDERNUM", x => x.Status == EWorkflowStepStatus.Handled && !SqlFunc.JsonListObjectAny(x.NextHandlers, "OrgId", OrgSeedData.CenterId))
                 .WhereIF(dto.RoleName is "派单员", x => x.Name == "派单组")
                 .WhereIF(dto.RoleName is "中心班长", x => x.Name == "班长审批")
                 .GroupBy(x => x.ExternalId)

src/Hotline.Application/Snapshot/SnapshotUserApplication.cs

@@ -75,9 +75,17 @@ public class SnapshotUserApplication : ISnapshotUserApplication, IScopeDependenc
     {
         foreach (var item in dto.Items)
         {
-            await _citizenRepository.RemoveNav(m => m.Id == item.CitizenId)
-                .Include(m => m.SafetyTypes.Where(s => s.Id == item.SafetyTypeId).First())
-                .ExecuteCommandAsync();
+            var citizen = await _citizenRepository.Queryable()
+                .Includes(m => m.SafetyTypes)
+                .Where(m => m.Id == item.CitizenId)
+                .FirstAsync();
+            var deleteSafetyType = citizen.SafetyTypes.FirstOrDefault(m => m.Id == item.SafetyTypeId);
+            if (deleteSafetyType == null) continue;
+
+            citizen.SafetyTypes.Remove(deleteSafetyType);
+            _citizenRepository.UpdateNav(citizen)
+                .Include(m => m.SafetyTypes)
+                .ExecuteCommand();
         }
     }
 }

src/Hotline.Application/StatisticalReport/CallReport/CallReportApplicationBase.cs

@@ -257,6 +257,11 @@ public abstract class CallReportApplicationBase : ICallReportApplication
         throw new NotImplementedException();
     }
 
+    public virtual Task<List<QueryGaoXiaoCallDateStatisticsDetailResp>> QueryGaoXiaoCallDateStatisticsDetail(QueryCallDateStatisticsDetailDto dto)
+    {
+        throw new NotImplementedException();
+    }
+
     /// <summary>
     /// 呼出话务统计明细
     /// </summary>

src/Hotline.Application/StatisticalReport/CallReport/YiBinCallReportApplication.cs

@@ -290,6 +290,16 @@ public class YiBinCallReportApplication : CallReportApplicationBase, ICallReport
         return await _trCallRecordRepositoryEx.QueryEnterpriseCallDateStatisticsDetail(dto.StartTime.Value, dto.EndTime.Value);
     }
 
+    /// <summary>
+    /// 高效服务话务明细
+    /// </summary>
+    /// <param name="dto"></param>
+    /// <returns></returns>
+    public override async Task<List<QueryGaoXiaoCallDateStatisticsDetailResp>> QueryGaoXiaoCallDateStatisticsDetail(QueryCallDateStatisticsDetailDto dto)
+    {
+        return await _trCallRecordRepositoryEx.QueryGaoXiaoCallDateStatisticsDetail(dto.StartTime.Value, dto.EndTime.Value);
+    }
+
     /// <summary>
     /// 呼出话务统计明细
     /// </summary>

src/Hotline.Application/StatisticalReport/ICallReportApplication.cs

@@ -71,6 +71,13 @@ namespace Hotline.Application.StatisticalReport
         /// <returns></returns>
         Task<List<QueryEnterpriseCallDateStatisticsDetailResp>> QueryEnterpriseCallDateStatisticsDetail(QueryCallDateStatisticsDetailDto dto);
 
+        /// <summary>
+        /// 高效服务话务明细
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        Task<List<QueryGaoXiaoCallDateStatisticsDetailResp>> QueryGaoXiaoCallDateStatisticsDetail(QueryCallDateStatisticsDetailDto dto);
+
         /// <summary>
         /// 呼出话务统计明细
         /// </summary>

src/Hotline.Repository.SqlSugar/CallCenter/TrCallRecordRepository.cs

@@ -352,6 +352,24 @@ namespace Hotline.Repository.SqlSugar.CallCenter
             return await query.ToListAsync();
         }
 
+        public async Task<List<QueryGaoXiaoCallDateStatisticsDetailResp>> QueryGaoXiaoCallDateStatisticsDetail(DateTime startTime, DateTime endTime)
+        {
+            var query = Db.Queryable<TrCallRecord>()
+                .Where(x => x.CreatedTime >= startTime && x.CreatedTime <= endTime && SqlFunc.Length(x.Gateway) > 4 && x.CallDirection == ECallDirection.In)
+                .GroupBy(x => x.CreatedTime.ToString("yyyy-MM-dd"))
+                .Select(x => new QueryGaoXiaoCallDateStatisticsDetailResp()
+                {
+                    Date = x.CreatedTime.ToString("yyyy-MM-dd"),
+                    GaoXiaoCallInCount = SqlFunc.AggregateSum(SqlFunc.IIF(x.IvrDtmf.Substring(x.IvrDtmf.Length - 1, 1) == "3", 1, 0)),
+                    GaoXiaoCallInPutthroughCount = SqlFunc.AggregateSum(SqlFunc.IIF(x.IvrDtmf.Substring(x.IvrDtmf.Length - 1, 1) == "3" && x.OnState == EOnState.On, 1, 0)),
+                    //EnterpriseRingOffCount = SqlFunc.AggregateSum(SqlFunc.IIF(x.IvrDtmf.Substring(x.IvrDtmf.Length - 1, 1) == "3" && x.QueueTims > 0 && x.RingTimes == 0 && x.OnState == EOnState.NoOn, 1, 0)), //企业挂断
+                    GaoXiaoQueueOffCount = SqlFunc.AggregateSum(SqlFunc.IIF(x.IvrDtmf.Substring(x.IvrDtmf.Length - 1, 1) == "3" && x.QueueTims > 0 && x.RingTimes == 0 && x.OnState == EOnState.NoOn, 1, 0)),//企业服务队列挂断
+                    GaoXiaoWaitOffCount = SqlFunc.AggregateSum(SqlFunc.IIF(x.IvrDtmf.Substring(x.IvrDtmf.Length - 1, 1) == "3" && x.RingTimes > 0 && x.OnState == EOnState.NoOn, 1, 0)) //企业服务等待挂断
+                })
+                .OrderBy(x => x.Date);
+            return await query.ToListAsync();
+        }
+
         public async Task<List<QueryCallOutDateStatisticsDetailResp>> QueryCallOutDateStatisticsDetail(DateTime startTime, DateTime endTime, List<string> enterpriseTels)
         {
             var callTable = Db.Queryable<TrCallRecord>()

src/Hotline.Repository.SqlSugar/Extensions/ApiServiceExtension.cs → src/Hotline.Repository.SqlSugar/Exam/Extensions/ApiServiceExtension.cs

@@ -6,11 +6,11 @@ using XF.Domain.Authentications;
 using XF.Domain.Entities;
 using XF.Domain.Repository;
 
-namespace Hotline.Repository.SqlSugar.Extensions
+namespace Hotline.Repository.SqlSugar.Exam.Extensions
 {
     public static class ApiServiceExtension
     {
-        public static void ToInsert<T>(this T entity,ISessionContext sessionContext=null) where T : class, IEntity<string>, new()
+        public static void ToInsert<T>(this T entity, ISessionContext sessionContext = null) where T : class, IEntity<string>, new()
         {
             if (entity.Id.IsNullOrEmpty())
             {
@@ -26,11 +26,11 @@ namespace Hotline.Repository.SqlSugar.Extensions
                 if (creationEntity != null)
                 {
                     creationEntity.CreationTime = DateTime.Now;
-                   
+
                 }
             }
 
-            if(entity is ExamBusinessEntity)
+            if (entity is ExamBusinessEntity)
             {
                 var creationEntity = entity as ExamBusinessEntity;
                 if (creationEntity != null)
@@ -52,13 +52,13 @@ namespace Hotline.Repository.SqlSugar.Extensions
                     current.CreatorName = sessionContext.UserName;
                     current.AreaId = sessionContext.AreaId;
                 }
-              }
+            }
 
         }
 
         public static void ToInsert<T>(this List<T> entities, ISessionContext sessionContext = null) where T : class, IEntity<string>, new()
         {
-            foreach(var entity in entities)
+            foreach (var entity in entities)
             {
                 entity.ToInsert(sessionContext);
             }
@@ -66,14 +66,14 @@ namespace Hotline.Repository.SqlSugar.Extensions
 
         public static void ToUpdate<T>(this T entity, ISessionContext sessionContext = null) where T : class, IEntity<string>, new()
         {
-            if(entity is FullStateEntity)
+            if (entity is FullStateEntity)
             {
                 var fullStateEntity = entity as FullStateEntity;
                 if (fullStateEntity != null)
                     fullStateEntity.LastModificationTime = DateTime.Now;
 
-                    entity = fullStateEntity as T ?? entity;
-                
+                entity = fullStateEntity as T ?? entity;
+
             }
 
             if (sessionContext != null)
@@ -92,7 +92,7 @@ namespace Hotline.Repository.SqlSugar.Extensions
             }
         }
 
-        public static void ToUpdate<T>(this List<T> entities, ISessionContext sessionContext = null) where T : class, IEntity<string>, new()       
+        public static void ToUpdate<T>(this List<T> entities, ISessionContext sessionContext = null) where T : class, IEntity<string>, new()
         {
             foreach (var entity in entities)
             {

src/Hotline.Repository.SqlSugar/Interface/IApiService.cs → src/Hotline.Repository.SqlSugar/Exam/Interface/IApiService.cs

@@ -4,14 +4,14 @@ using FluentValidation;
 using XF.Domain.Dependency;
 using XF.Domain.Entities;
 
-namespace Hotline.Repository.SqlSugar.Interface
+namespace Hotline.Repository.SqlSugar.Exam.Interface
 {
-    public interface IApiService<TAdd,TUpdate,TEntity>: IDomainService 
+    public interface IApiService<TAdd, TUpdate, TEntity> : IDomainService
         where TAdd : IAddRequest
         where TUpdate : IActionRequest
         where TEntity : class, IEntity<string>, new()
     {
-        Task<string> AddAsync(TAdd actionRequest,CancellationToken cancellationToken);
+        Task<string> AddAsync(TAdd actionRequest, CancellationToken cancellationToken);
 
         Task AddAsync(List<TAdd> actionRequests, CancellationToken cancellationToken);
 

src/Hotline.Repository.SqlSugar/Exam/Interface/IDomainService.cs

@@ -0,0 +1,6 @@
+namespace Hotline.Repository.SqlSugar.Exam.Interface
+{
+    public interface IDomainService
+    {
+    }
+}

src/Hotline.Repository.SqlSugar/Interface/IExamRepository.cs → src/Hotline.Repository.SqlSugar/Exam/Interface/IExamRepository.cs

@@ -5,10 +5,10 @@ using SqlSugar;
 using XF.Domain.Entities;
 using XF.Domain.Repository;
 
-namespace Hotline.Repository.SqlSugar.Interface
+namespace Hotline.Repository.SqlSugar.Exam.Interface
 {
-    public interface IExamRepository<TEntity, TDBContext> :IRepository<TEntity> where TEntity : class, IEntity<string>, IHasCreationTime, IDataPermission, new()
-    where TDBContext: SugarUnitOfWork, new()
+    public interface IExamRepository<TEntity, TDBContext> : IRepository<TEntity> where TEntity : class, IEntity<string>, IHasCreationTime, IDataPermission, new()
+    where TDBContext : SugarUnitOfWork, new()
     {
         public ISugarUnitOfWork<TDBContext> UOW { get; }
 
@@ -60,7 +60,7 @@ namespace Hotline.Repository.SqlSugar.Interface
         /// <param name="entities"></param>
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
-        public  Task ValidateAddAsync(List<TEntity> entities, CancellationToken cancellationToken);
+        public Task ValidateAddAsync(List<TEntity> entities, CancellationToken cancellationToken);
 
         /// <summary>
         /// 用于事务（验证修改实体）
@@ -68,7 +68,7 @@ namespace Hotline.Repository.SqlSugar.Interface
         /// <param name="entities"></param>
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
-        public  Task ValidateUpdateAsync(List<TEntity> entities, CancellationToken cancellationToken);
+        public Task ValidateUpdateAsync(List<TEntity> entities, CancellationToken cancellationToken);
 
         /// <summary>
         /// 用于事务（验证删除实体）
@@ -76,7 +76,7 @@ namespace Hotline.Repository.SqlSugar.Interface
         /// <param name="entities"></param>
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
-        public  Task ValidateDeleteAsync(EntityQueryRequest entityQueryRequest, CancellationToken cancellationToken);
+        public Task ValidateDeleteAsync(EntityQueryRequest entityQueryRequest, CancellationToken cancellationToken);
 
         /// <summary>
         /// 用于事务（验证新增实体）

src/Hotline.Repository.SqlSugar/Interface/IQueryService.cs → src/Hotline.Repository.SqlSugar/Exam/Interface/IQueryService.cs

@@ -2,11 +2,11 @@
 using Exam.Infrastructure.Data.Interface;
 using XF.Domain.Dependency;
 
-namespace Hotline.Repository.SqlSugar.Interface
+namespace Hotline.Repository.SqlSugar.Exam.Interface
 {
-    public interface IQueryService<TView,TActionRequest,TQueryRequest>: IDomainService where TView : IViewResponse
-        where TQueryRequest:IQueryRequest
-        where TActionRequest:IActionRequest
+    public interface IQueryService<TView, TActionRequest, TQueryRequest> : IDomainService where TView : IViewResponse
+        where TQueryRequest : IQueryRequest
+        where TActionRequest : IActionRequest
     {
         Task<(int, List<TView>)> GetListAsync(TQueryRequest queryRequest);
 

src/Hotline.Repository.SqlSugar/Exam/Interface/StatusActionRequest.cs

@@ -0,0 +1,8 @@
+using Exam.Infrastructure.Data.Entity;
+
+namespace Hotline.Repository.SqlSugar.Exam.Interface
+{
+    public class StatusActionRequest : ActionRequest
+    {
+    }
+}

src/Hotline.Repository.SqlSugar/Exam/Interfaces/ExamManages/IExamAnswerRepository.cs

@@ -4,7 +4,7 @@ using XF.Domain.Repository;
 using System.ComponentModel;
 using Hotline.Exams.ExamManages;
 using Hotline.Repository.SqlSugar;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 
 namespace Hotline.Repository.SqlSugar.Exam.Interfaces.ExamManages
 {

src/Hotline.Repository.SqlSugar/Exam/Interfaces/ExamManages/IExamManageRepository.cs

@@ -1,7 +1,7 @@
-using Hotline.Repository.SqlSugar.Interface;
 using System.ComponentModel;
 using Hotline.Exams.ExamManages;
 using XF.Domain.Repository;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 
 namespace Hotline.Repository.SqlSugar.Exam.Interfaces.ExamManages
 {

src/Hotline.Repository.SqlSugar/Exam/Interfaces/ExamManages/IExamQuestionAnswerRepository.cs

@@ -1,6 +1,6 @@
 using Hotline.Exams.ExamManages;
 using Hotline.Exams.TestPapers;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 using System.ComponentModel;
 using XF.Domain.Repository;
 

src/Hotline.Repository.SqlSugar/Exam/Interfaces/ExamManages/IExamQuestionKnowladgeRepository.cs

@@ -3,7 +3,7 @@ using SqlSugar;
 using XF.Domain.Repository;
 using System.ComponentModel;
 using Hotline.Exams.ExamManages;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 
 namespace Hotline.Repository.SqlSugar.Exam.Interfaces.Questions
 {

src/Hotline.Repository.SqlSugar/Exam/Interfaces/ExamManages/IExamQuestionOptionsRepository.cs

@@ -1,5 +1,5 @@
 using Hotline.Exams.ExamManages;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 using XF.Domain.Repository;
 
 namespace Hotline.Repository.SqlSugar.Exam.Interfaces.ExamManages

src/Hotline.Repository.SqlSugar/Exam/Interfaces/ExamManages/IExamQuestionRepository.cs

@@ -1,7 +1,7 @@
-using Hotline.Repository.SqlSugar.Interface;
 using System.ComponentModel;
 using Hotline.Exams.ExamManages;
 using XF.Domain.Repository;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 
 namespace Hotline.Repository.SqlSugar.Exam.Interfaces.Exams
 {

src/Hotline.Repository.SqlSugar/Exam/Interfaces/ExamManages/IExamQuestionScoreRepository.cs

@@ -4,7 +4,7 @@ using XF.Domain.Repository;
 using System.ComponentModel;
 using Hotline.Exams.ExamManages;
 using Hotline.Repository.SqlSugar;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 
 namespace Hotline.Repository.SqlSugar.Exam.Interfaces.ExamManages
 {

src/Hotline.Repository.SqlSugar/Exam/Interfaces/ExamManages/IExamQuestionSourcewareRepository.cs

@@ -3,7 +3,7 @@ using SqlSugar;
 using XF.Domain.Repository;
 using System.ComponentModel;
 using Hotline.Exams.ExamManages;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 
 namespace Hotline.Repository.SqlSugar.Exam.Interfaces.ExamManages
 {

src/Hotline.Repository.SqlSugar/Exam/Interfaces/ExamManages/IExamTagRepository.cs

@@ -1,8 +1,8 @@
-using Hotline.Repository.SqlSugar.Interface;
 using System.ComponentModel;
 using System.Linq.Expressions;
 using Hotline.Exams.ExamManages;
 using XF.Domain.Repository;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 
 namespace Hotline.Repository.SqlSugar.Exam.Interfaces.ExamManages
 {

src/Hotline.Repository.SqlSugar/Exam/Interfaces/ExamManages/IExtractRuleRepository.cs

@@ -4,7 +4,7 @@ using XF.Domain.Repository;
 using System.ComponentModel;
 using Hotline.Exams.ExamManages;
 using Hotline.Repository.SqlSugar;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 
 namespace Hotline.Repository.SqlSugar.Exam.Interfaces.ExamManages
 {

src/Hotline.Repository.SqlSugar/Exam/Interfaces/ExamManages/IRuleTagRepository.cs

@@ -4,7 +4,7 @@ using XF.Domain.Repository;
 using System.ComponentModel;
 using Hotline.Exams.ExamManages;
 using Hotline.Repository.SqlSugar;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 
 namespace Hotline.Repository.SqlSugar.Exam.Interfaces.ExamManages
 {

src/Hotline.Repository.SqlSugar/Exam/Interfaces/ExamManages/IUserExamItemOptionRepository.cs

@@ -1,5 +1,5 @@
 using Hotline.Exams.ExamManages;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 using XF.Domain.Repository;
 
 namespace Hotline.Repository.SqlSugar.Exam.Interfaces.ExamManages

src/Hotline.Repository.SqlSugar/Exam/Interfaces/ExamManages/IUserExamItemRepository.cs

@@ -4,7 +4,7 @@ using XF.Domain.Repository;
 using System.ComponentModel;
 using Hotline.Exams.ExamManages;
 using Hotline.Repository.SqlSugar;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 
 namespace Hotline.Repository.SqlSugar.Exam.Interfaces.ExamManages
 {

src/Hotline.Repository.SqlSugar/Exam/Interfaces/ExamManages/IUserExamRepository.cs

@@ -4,7 +4,7 @@ using XF.Domain.Repository;
 using System.ComponentModel;
 using Hotline.Exams.ExamManages;
 using Hotline.Repository.SqlSugar;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 
 namespace Hotline.Repository.SqlSugar.Exam.Interfaces.ExamManages
 {

src/Hotline.Repository.SqlSugar/Exam/Interfaces/Practices/IPracticeAnswerRepository.cs

@@ -3,7 +3,7 @@ using SqlSugar;
 using XF.Domain.Repository;
 using System.ComponentModel;
 using Hotline.Exams.Practices;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 
 namespace Hotline.Repository.SqlSugar.Exam.Interfaces.Practices
 {

src/Hotline.Repository.SqlSugar/Exam/Interfaces/Practices/IPracticeQuestionKnowladgeRepository.cs

@@ -3,7 +3,7 @@ using SqlSugar;
 using XF.Domain.Repository;
 using System.ComponentModel;
 using Hotline.Exams.Practices;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 
 namespace Hotline.Repository.SqlSugar.Exam.Interfaces.Questions
 {

src/Hotline.Repository.SqlSugar/Exam/Interfaces/Practices/IPracticeQuestionOptionsRepository.cs

@@ -1,5 +1,5 @@
 using Hotline.Exams.Practices;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 using System;
 using System.Collections.Generic;
 using System.Linq;

src/Hotline.Repository.SqlSugar/Exam/Interfaces/Practices/IPracticeQuestionRepository.cs

@@ -3,7 +3,7 @@ using SqlSugar;
 using XF.Domain.Repository;
 using System.ComponentModel;
 using Hotline.Exams.Practices;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 
 namespace Hotline.Repository.SqlSugar.Exam.Interfaces.Practices
 {

src/Hotline.Repository.SqlSugar/Exam/Interfaces/Practices/IPracticeQuestionSourcewareRepository.cs

@@ -3,7 +3,7 @@ using SqlSugar;
 using XF.Domain.Repository;
 using System.ComponentModel;
 using Hotline.Exams.Practices;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 
 namespace Hotline.Repository.SqlSugar.Exam.Interfaces.Questions
 {

src/Hotline.Repository.SqlSugar/Exam/Interfaces/Practices/IPracticeRecordRepository.cs

@@ -3,7 +3,7 @@ using SqlSugar;
 using XF.Domain.Repository;
 using System.ComponentModel;
 using Hotline.Exams.Practices;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 
 namespace Hotline.Repository.SqlSugar.Exam.Interfaces.Practices
 {

src/Hotline.Repository.SqlSugar/Exam/Interfaces/Practices/IPracticeRepository.cs

@@ -3,7 +3,7 @@ using SqlSugar;
 using XF.Domain.Repository;
 using System.ComponentModel;
 using Hotline.Exams.Practices;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 
 namespace Hotline.Repository.SqlSugar.Exam.Interfaces.Practices
 {

src/Hotline.Repository.SqlSugar/Exam/Interfaces/Practices/IPracticeResultItemRepository.cs

@@ -3,7 +3,7 @@ using SqlSugar;
 using XF.Domain.Repository;
 using System.ComponentModel;
 using Hotline.Exams.Practices;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 
 namespace Hotline.Repository.SqlSugar.Exam.Interfaces.Practices
 {

src/Hotline.Repository.SqlSugar/Exam/Interfaces/Practices/IPracticeResultRepository.cs

@@ -3,7 +3,7 @@ using SqlSugar;
 using XF.Domain.Repository;
 using System.ComponentModel;
 using Hotline.Exams.Practices;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 
 namespace Hotline.Repository.SqlSugar.Exam.Interfaces.Practices
 {

src/Hotline.Repository.SqlSugar/Exam/Interfaces/Practices/IPracticeTagRepository.cs

@@ -3,7 +3,7 @@ using SqlSugar;
 using XF.Domain.Repository;
 using System.ComponentModel;
 using Hotline.Exams.Practices;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 
 namespace Hotline.Repository.SqlSugar.Exam.Interfaces.Practices
 {

src/Hotline.Repository.SqlSugar/Exam/Interfaces/Questions/IQuestionAnswerRepository.cs

@@ -3,7 +3,7 @@ using SqlSugar;
 using XF.Domain.Repository;
 using System.ComponentModel;
 using Hotline.Exams.Questions;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 
 namespace Hotline.Repository.SqlSugar.Exam.Interfaces.Questions
 {

src/Hotline.Repository.SqlSugar/Exam/Interfaces/Questions/IQuestionKnowladgeRepository.cs

@@ -3,7 +3,7 @@ using SqlSugar;
 using XF.Domain.Repository;
 using System.ComponentModel;
 using Hotline.Exams.Questions;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 
 namespace Hotline.Repository.SqlSugar.Exam.Interfaces.Questions
 {

src/Hotline.Repository.SqlSugar/Exam/Interfaces/Questions/IQuestionOptionsRepository.cs

@@ -3,7 +3,7 @@ using SqlSugar;
 using XF.Domain.Repository;
 using System.ComponentModel;
 using Hotline.Exams.Questions;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 
 namespace Hotline.Repository.SqlSugar.Exam.Interfaces.Questions
 {

src/Hotline.Repository.SqlSugar/Exam/Interfaces/Questions/IQuestionRepository.cs

@@ -3,7 +3,7 @@ using SqlSugar;
 using XF.Domain.Repository;
 using System.ComponentModel;
 using Hotline.Exams.Questions;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 
 namespace Hotline.Repository.SqlSugar.Exam.Interfaces.Questions
 {

src/Hotline.Repository.SqlSugar/Exam/Interfaces/Questions/IQuestionSourcewareRepository.cs

@@ -3,7 +3,7 @@ using SqlSugar;
 using XF.Domain.Repository;
 using System.ComponentModel;
 using Hotline.Exams.Questions;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 
 namespace Hotline.Repository.SqlSugar.Exam.Interfaces.Questions
 {

src/Hotline.Repository.SqlSugar/Exam/Interfaces/Questions/IQuestionTagRepository.cs

@@ -3,7 +3,7 @@ using SqlSugar;
 using XF.Domain.Repository;
 using System.ComponentModel;
 using Hotline.Exams.Questions;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 
 namespace Hotline.Repository.SqlSugar.Exam.Interfaces.Questions
 {

src/Hotline.Repository.SqlSugar/Exam/Interfaces/Questions/ITagQuestionRepository.cs

@@ -3,7 +3,7 @@ using SqlSugar;
 using XF.Domain.Repository;
 using System.ComponentModel;
 using Hotline.Exams.ExamManages;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 
 namespace Hotline.Repository.SqlSugar.Exam.Interfaces.Questions
 {

src/Hotline.Repository.SqlSugar/Exam/Interfaces/Sourcewares/ISourcewareCategoryRepository.cs

@@ -2,10 +2,10 @@
 using SqlSugar;
 using XF.Domain.Repository;
 using System.ComponentModel;
-using Hotline.Repository.SqlSugar.Interface;
 using Hotline.Share.Requests.Sourceware;
 using System.Linq.Expressions;
 using Hotline.Exams.Sourcewares;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 
 namespace Hotline.Repository.SqlSugar.Exam.Interfaces.Sourcewares
 {

src/Hotline.Repository.SqlSugar/Exam/Interfaces/Sourcewares/ISourcewareRepository.cs

@@ -2,8 +2,8 @@
 using SqlSugar;
 using XF.Domain.Repository;
 using System.ComponentModel;
-using Hotline.Repository.SqlSugar.Interface;
 using Hotline.Exams.Sourcewares;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 
 namespace Hotline.Repository.SqlSugar.Exam.Interfaces.Sourcewares
 {

src/Hotline.Repository.SqlSugar/Exam/Interfaces/TestPapers/ITestPaperItemAnswerRepository.cs

@@ -1,5 +1,5 @@
 using Hotline.Exams.TestPapers;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 using System.ComponentModel;
 using XF.Domain.Repository;
 

src/Hotline.Repository.SqlSugar/Exam/Interfaces/TestPapers/ITestPaperItemKnowladgeRepository.cs

@@ -3,7 +3,7 @@ using SqlSugar;
 using XF.Domain.Repository;
 using System.ComponentModel;
 using Hotline.Exams.TestPapers;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 
 namespace Hotline.Repository.SqlSugar.Exam.Interfaces.Questions
 {

src/Hotline.Repository.SqlSugar/Exam/Interfaces/TestPapers/ITestPaperItemOptionsRepository.cs

@@ -1,5 +1,5 @@
 using Hotline.Exams.TestPapers;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 using XF.Domain.Repository;
 
 namespace Hotline.Repository.SqlSugar.Exam.Interfaces.TestPapers

src/Hotline.Repository.SqlSugar/Exam/Interfaces/TestPapers/ITestPaperItemRepository.cs

@@ -3,7 +3,7 @@ using SqlSugar;
 using XF.Domain.Repository;
 using System.ComponentModel;
 using Hotline.Exams.TestPapers;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 
 namespace Hotline.Repository.SqlSugar.Exam.Interfaces.TestPapers
 {

src/Hotline.Repository.SqlSugar/Exam/Interfaces/TestPapers/ITestPaperItemSourcewareRepository.cs

@@ -3,7 +3,7 @@ using SqlSugar;
 using XF.Domain.Repository;
 using System.ComponentModel;
 using Hotline.Exams.TestPapers;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 
 namespace Hotline.Repository.SqlSugar.Exam.Interfaces.Questions
 {

src/Hotline.Repository.SqlSugar/Exam/Interfaces/TestPapers/ITestPaperRepository.cs

@@ -3,7 +3,7 @@ using SqlSugar;
 using XF.Domain.Repository;
 using System.ComponentModel;
 using Hotline.Exams.TestPapers;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 
 namespace Hotline.Repository.SqlSugar.Exam.Interfaces.TestPapers
 {

src/Hotline.Repository.SqlSugar/Exam/Interfaces/TestPapers/ITestPaperRuleRepository.cs

@@ -3,7 +3,7 @@ using SqlSugar;
 using XF.Domain.Repository;
 using System.ComponentModel;
 using Hotline.Exams.TestPapers;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 namespace Hotline.Repository.SqlSugar.Exam.Interfaces.TestPapers
 {
     /// <summary>

src/Hotline.Repository.SqlSugar/Exam/Interfaces/TestPapers/ITestPaperRuleTagRepository.cs

@@ -3,7 +3,7 @@ using SqlSugar;
 using XF.Domain.Repository;
 using System.ComponentModel;
 using Hotline.Exams.TestPapers;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 namespace Hotline.Repository.SqlSugar.Exam.Interfaces.TestPapers
 {
     /// <summary>

src/Hotline.Repository.SqlSugar/Exam/Interfaces/Trains/ITrainKnowladgeRepository.cs

@@ -3,7 +3,7 @@ using SqlSugar;
 using XF.Domain.Repository;
 using System.ComponentModel;
 using Hotline.Exams.Trains;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 
 namespace Hotline.Repository.SqlSugar.Exam.Interfaces.Trains
 {

src/Hotline.Repository.SqlSugar/Exam/Interfaces/Trains/ITrainPlanRepository.cs

@@ -3,7 +3,7 @@ using SqlSugar;
 using XF.Domain.Repository;
 using System.ComponentModel;
 using Hotline.Exams.Trains;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 
 namespace Hotline.Repository.SqlSugar.Exam.Interfaces.Trains
 {

src/Hotline.Repository.SqlSugar/Exam/Interfaces/Trains/ITrainPlanTemplateRepository.cs

@@ -1,5 +1,5 @@
 using Hotline.Exams.Trains;
-using Hotline.Repository.SqlSugar.Interface;
+using Hotline.Repository.SqlSugar.Exam.Interface;
 using System.ComponentModel;
 using XF.Domain.Repository;