操作提取sql配置

performance/Performance.Api/wwwroot/Performance.Api.xml

@@ -1199,7 +1199,7 @@
         </member>
         <member name="M:Performance.Api.Controllers.EmployeeController.GetGatherHands(System.Int32,Performance.DtoModels.GatherRequest)">
             <summary>
-            手工录入
+            手工录入 - 录入界面
             </summary>
             <param name="allotId"></param>
             <param name="request"></param>
@@ -1215,7 +1215,15 @@
         </member>
         <member name="M:Performance.Api.Controllers.EmployeeController.GetGather(System.Int32,Performance.DtoModels.PersonParamsRequest)">
             <summary>
-            手工录入列表
+            手工录入列表 - 明细
+            </summary>
+            <param name="allotId"></param>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.EmployeeController.GetGatherTotal(System.Int32,Performance.DtoModels.PersonParamsRequest)">
+            <summary>
+            手工录入列表 - 汇总 
             </summary>
             <param name="allotId"></param>
             <param name="request"></param>

performance/Performance.Api/wwwroot/Performance.EntityModels.xml

@@ -3619,6 +3619,16 @@
             创建时间
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.ex_result_gather.Remark">
+            <summary>
+            备注
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.ex_result_gather.States">
+            <summary>
+            1 未通过 2 通过 
+            </summary>
+        </member>
         <member name="T:Performance.EntityModels.ex_script">
             <summary>
             
@@ -3649,6 +3659,21 @@
             是否可用 1 可用 2 不可用
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.ex_script.IsExecSuccess">
+            <summary>
+            是否执行通过
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.ex_script.ErrorMessage">
+            <summary>
+            执行错误信息
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.ex_script.TimeConsuming">
+            <summary>
+            语句执行完成所需时间
+            </summary>
+        </member>
         <member name="T:Performance.EntityModels.ex_special">
             <summary>
             
@@ -8315,14 +8340,14 @@
             
             </summary>
         </member>
-        <member name="P:Performance.EntityModels.sys_hospitalconfig.Type">
+        <member name="P:Performance.EntityModels.sys_hospitalconfig.DataBaseType">
             <summary>
-            1 标准库 2 绩效库
+            1、Sql Server  2、Orcale
             </summary>
         </member>
-        <member name="P:Performance.EntityModels.sys_hospitalconfig.DataBaseType">
+        <member name="P:Performance.EntityModels.sys_hospitalconfig.IsConnectioned">
             <summary>
-            1、Sql Server  2、Orcale
+            
             </summary>
         </member>
         <member name="T:Performance.EntityModels.sys_menu">

performance/Performance.DtoModels/AutoMapper/AutoMapperConfigs.cs

@@ -2,10 +2,7 @@
 using Performance.DtoModels.Request;
 using Performance.EntityModels;
 using Performance.Infrastructure;
-using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Performance.DtoModels.AutoMapper
 {
@@ -255,6 +252,14 @@ public AutoMapperConfigs()
 
             CreateMap<ex_result, ex_result_gather>()
                 .ReverseMap();
+
+            CreateMap<ex_type, ExtractConfigResponse>()
+               .ForMember(dest => dest.TypeId, opt => opt.MapFrom(src => src.Id))
+               .ReverseMap();
+
+            CreateMap<ex_script, ExtractScriptConfig>()
+               .ForMember(dest => dest.ExScriptId, opt => opt.MapFrom(src => src.Id))
+               .ReverseMap();
         }
     }
 }

performance/Performance.DtoModels/Request/ConsumeTimeRequest.cs

+using System;
+
+namespace Performance.DtoModels
+{
+    public class ConsumeTimeRequest
+    {
+        public int Year { get; set; } = DateTime.Now.Year;
+
+        public int Month { get; set; } = DateTime.Now.Month;
+
+        public int ExScriptId { get; set; }
+
+        public int ConfigId { get; set; }
+
+        public string ExecScript { get; set; }
+    }
+}

performance/Performance.DtoModels/Request/ExTypeRequest.cs

+namespace Performance.DtoModels
+{
+    public class ExTypeRequest
+    {
+        public int HospitalId { get; set; }
+
+        public int? SheetType { get; set; }
+
+        public string Search { get; set; }
+
+        public int PageNumber { get; set; }
+
+        public int PageSize { get; set; }
+    }
+}

performance/Performance.DtoModels/Response/ExtractConfigResponse.cs

+using System.Collections.Generic;
+
+namespace Performance.DtoModels
+{
+    public class ExtractConfigResponse
+    {
+        public int TypeId { get; set; }
+
+        public string EName { get; set; }
+
+        public string Description { get; set; }
+
+        public int Source { get; set; }
+
+        public string SheetType { get; set; }
+
+        public decimal TotalTime { get; set; }
+
+        public List<ExtractScriptConfig> Children { get; set; } = new List<ExtractScriptConfig>();
+    }
+
+    public class ExtractScriptConfig
+    {
+        public int ExScriptId { get; set; }
+
+        public string ExecScript { get; set; }
+
+        public int ConfigId { get; set; }
+
+        public string ConfigName { get; set; }
+
+        public int IsEnable { get; set; }
+
+        public int IsExecSuccess { get; set; }
+
+        public string ErrorMessage { get; set; }
+
+        public decimal TimeConsuming { get; set; }
+    }
+}

performance/Performance.EntityModels/Entity/ex_script.cs

@@ -39,5 +39,20 @@ public class ex_script
         /// 是否可用 1 可用 2 不可用
         /// </summary>
         public int IsEnable { get; set; }
+
+        /// <summary>
+        /// 是否执行通过
+        /// </summary>
+        public int IsExecSuccess { get; set; }
+
+        /// <summary>
+        /// 执行错误信息
+        /// </summary>
+        public string ErrorMessage { get; set; }
+
+        /// <summary>
+        /// 语句执行完成所需时间
+        /// </summary>
+        public decimal TimeConsuming { get; set; } = 0;
     }
 }

performance/Performance.Repository/PerforExtypeRepository.cs

-using Performance.EntityModels;
+using Microsoft.EntityFrameworkCore;
+using Performance.EntityModels;
 using Performance.Infrastructure.Models;
+using System.Linq;
 
 namespace Performance.Repository
 {
     public partial class PerforExtypeRepository
     {
-        public PageList<ex_type> GetPagingData()
+        public PageList<ex_type> GetPagingData(int hospitalId, int? sheetType, string search, int pageNumber, int pageSize)
         {
+            var query = _context.ex_type.AsNoTracking().Where(w => w.HospitalId == hospitalId);
+            if (sheetType.HasValue && sheetType.Value > 0)
+            {
+                query = query.Where(w => w.Source == sheetType);
+            }
+            if (!string.IsNullOrEmpty(search))
+            {
+                query = query.Where(w => w.EName.Contains(search));
+            }
 
+            return PageList<ex_type>.Create(query, pageNumber, pageSize);
         }
     }
 }

performance/Performance.Repository/Repository/PerforExtypeRepository.cs

@@ -12,8 +12,11 @@ namespace Performance.Repository
     /// </summary>
     public partial class PerforExtypeRepository : PerforRepository<ex_type>
     {
+        private readonly PerformanceDbContext _context;
+
         public PerforExtypeRepository(PerformanceDbContext context) : base(context)
         {
+            _context = context;
         }
     }
 }

performance/Performance.Services/ExtractExcelService/QueryService.cs

@@ -442,6 +442,26 @@ public IEnumerable<T> QueryData<T>(sys_hospitalconfig config, string execsql, pe
             return pairs;
         }
 
+        /// <summary>
+        /// 查询数据
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="config"></param>
+        /// <param name="execsql"></param>
+        /// <param name="param"></param>
+        /// <returns></returns>
+        public IEnumerable<T> QueryData<T>(sys_hospitalconfig config, string execsql, object param)
+        {
+            var connection = ConnectionBuilder.Create((DatabaseType)config.DataBaseType, config.DbSource, config.DbName, config.DbUser, config.DbPassword);
+
+            if (connection == null) return new List<T>();
+
+            if (connection.State == ConnectionState.Closed)
+                connection.Open();
+            var result = connection.Query<T>(execsql, param, commandTimeout: 20000);
+            return result;
+        }
+
         #endregion QueryData
     }
 }

performance/Performance.Services/HospitalService.cs

@@ -50,7 +50,7 @@ public List<HospitalResponse> GetUserHopital(int userid)
             var hosList = _hospitalRepository.GetEntities(t => joinList.Select(j => j.HospitalID).Contains(t.ID));
             var hosId = hosList?.Select(item => item.ID).ToList();
             //获取存在数据记录的hospital
-            hosId = _hospitalconfigRepository.GetEntities(t => hosId.Contains(t.HospitalId.Value))?.Select(t => t.HospitalId.Value).ToList();
+            hosId = _hospitalconfigRepository.GetEntities(t => hosId.Contains(t.HospitalId))?.Select(t => t.HospitalId).ToList();
             //获取已经上传过模板的hospital
             var firstId = _perfirstRepository.GetEntities(t => hosId.Contains(t.HospitalId.Value))?.Select(t => t.HospitalId.Value).ToList();