表结构调整

performance/Performance.DtoModels/AutoMapper/AutoMapperConfigs.cs

@@ -49,18 +49,18 @@ public AutoMapperConfigs()
                 .ForMember(dest => dest.MenuID, opt => opt.MapFrom(src => src.ID));
 
             // 绩效 请求
-            CreateMap<AllotRequest, sys_allot>();
-            CreateMap<sys_allot, AllotRequest>();
+            CreateMap<AllotRequest, per_allot>();
+            CreateMap<per_allot, AllotRequest>();
 
             // 绩效 响应
-            CreateMap<AllotResponse, sys_allot>();
-            CreateMap<sys_allot, AllotResponse>();
+            CreateMap<AllotResponse, per_allot>();
+            CreateMap<per_allot, AllotResponse>();
 
 
             // sheet 响应
-            CreateMap<SheetResponse, im_sheet>()
+            CreateMap<SheetResponse, per_sheet>()
                  .ForMember(dest => dest.ID, opt => opt.MapFrom(src => src.SheetID));
-            CreateMap<im_sheet, SheetResponse>()
+            CreateMap<per_sheet, SheetResponse>()
                 .ForMember(dest => dest.SheetID, opt => opt.MapFrom(src => src.ID));
 
             CreateMap<PerHeader, im_header>()
@@ -96,8 +96,8 @@ public AutoMapperConfigs()
                 .ForMember(dest => dest.AdjustFactor, opt => opt.MapFrom(src => src.NurseAdjustFactor));
 
             CreateMap<PerDataAccountBaisc, im_accountbasic>();
-            CreateMap<PerDataAccountDoctor, im_accountdoctor>();
-            CreateMap<PerDataAccountNurse, im_accountnurse>();
+            CreateMap<PerDataAccountDoctor, res_accountdoctor>();
+            CreateMap<PerDataAccountNurse, res_accountnurse>();
         }
     }
 }

performance/Performance.EntityModels/Context/PerformanceDbContext.cs

@@ -19,14 +19,14 @@ public PerformanceDbContext(DbContextOptions<PerformanceDbContext> options)
         public virtual DbSet<sys_role> Sys_Role { get; set; }
         public virtual DbSet<sys_role_menu> Sys_Role_Menu { get; set; }
         public virtual DbSet<sys_user_role> Sys_User_Role { get; set; }
-        public virtual DbSet<sys_allot> Sys_Allot { get; set; }
-        public virtual DbSet<im_sheet> Im_Sheet { get; set; }
+        public virtual DbSet<per_allot> Sys_Allot { get; set; }
+        public virtual DbSet<per_sheet> Im_Sheet { get; set; }
         public virtual DbSet<im_employee> Im_Employee { get; set; }
         public virtual DbSet<im_header> Im_Header { get; set; }
         public virtual DbSet<im_data> Im_Data { get; set; }
         public virtual DbSet<im_accountbasic> Im_AccountBasic { get; set; }
-        public virtual DbSet<im_accountdoctor> Im_AccountDoctor { get; set; }
-        public virtual DbSet<im_accountnurse> Im_AccountNurse { get; set; }
+        public virtual DbSet<res_accountdoctor> Im_AccountDoctor { get; set; }
+        public virtual DbSet<res_accountnurse> Im_AccountNurse { get; set; }
         public virtual DbSet<cof_drugprop> Cof_DrugProp { get; set; }
         public virtual DbSet<cof_income> Cof_Income { get; set; }
     }

performance/Performance.EntityModels/Entity/sys_allot.cs → performance/Performance.EntityModels/Entity/per_allot.cs

@@ -12,7 +12,7 @@ namespace Performance.EntityModels
     /// <summary>
     /// sys_allot Entity Model
     /// </summary>
-    public class sys_allot
+    public class per_allot
     {
         /// <summary>
         /// ID

performance/Performance.EntityModels/Entity/im_sheet.cs → performance/Performance.EntityModels/Entity/per_sheet.cs

@@ -12,7 +12,7 @@ namespace Performance.EntityModels
     /// <summary>
     /// im_sheet Entity Model
     /// </summary>
-    public class im_sheet
+    public class per_sheet
     {
         /// <summary>
         /// ID

performance/Performance.EntityModels/Entity/im_accountdoctor.cs → performance/Performance.EntityModels/Entity/res_accountdoctor.cs

@@ -12,7 +12,7 @@ namespace Performance.EntityModels
     /// <summary>
     /// im_accountdoctor Entity Model
     /// </summary>
-    public class im_accountdoctor
+    public class res_accountdoctor
     {
         /// <summary>
         /// 

performance/Performance.EntityModels/Entity/im_accountnurse.cs → performance/Performance.EntityModels/Entity/res_accountnurse.cs

@@ -12,7 +12,7 @@ namespace Performance.EntityModels
     /// <summary>
     /// im_accountnurse Entity Model
     /// </summary>
-    public class im_accountnurse
+    public class res_accountnurse
     {
         /// <summary>
         /// 

performance/Performance.Repository/PerforAllotRepository.cs → performance/Performance.Repository/PerforPerAllotRepository.cs

@@ -12,9 +12,9 @@ namespace Performance.Repository
     /// <summary>
     /// sys_allot Repository
     /// </summary>
-    public class PerforAllotRepository : PerforRepository<sys_allot>
+    public class PerforPerAllotRepository : PerforRepository<per_allot>
     {
-		public PerforAllotRepository(PerformanceDbContext context) : base(context)
+		public PerforPerAllotRepository(PerformanceDbContext context) : base(context)
         {
         }
     }

performance/Performance.Repository/PerforImSheetRepository.cs → performance/Performance.Repository/PerforPerSheetRepository.cs

@@ -12,9 +12,9 @@ namespace Performance.Repository
     /// <summary>
     /// im_sheet Repository
     /// </summary>
-    public class PerforImSheetRepository : PerforRepository<im_sheet>
+    public class PerforPerSheetRepository : PerforRepository<per_sheet>
     {
-		public PerforImSheetRepository(PerformanceDbContext context) : base(context)
+		public PerforPerSheetRepository(PerformanceDbContext context) : base(context)
         {
         }
     }

performance/Performance.Repository/PerforImaccountdoctorRepository.cs → performance/Performance.Repository/PerforResAccountdoctorRepository.cs

@@ -12,9 +12,9 @@ namespace Performance.Repository
     /// <summary>
     /// im_accountdoctor Repository
     /// </summary>
-    public class PerforImaccountdoctorRepository : PerforRepository<im_accountdoctor>
+    public class PerforResAccountdoctorRepository : PerforRepository<res_accountdoctor>
     {
-		public PerforImaccountdoctorRepository(PerformanceDbContext context) : base(context)
+		public PerforResAccountdoctorRepository(PerformanceDbContext context) : base(context)
         {
         }
     }

performance/Performance.Repository/PerforImaccountnurseRepository.cs → performance/Performance.Repository/PerforResAccountnurseRepository.cs

@@ -12,9 +12,9 @@ namespace Performance.Repository
     /// <summary>
     /// im_accountnurse Repository
     /// </summary>
-    public class PerforImaccountnurseRepository : PerforRepository<im_accountnurse>
+    public class PerforResAccountnurseRepository : PerforRepository<res_accountnurse>
     {
-		public PerforImaccountnurseRepository(PerformanceDbContext context) : base(context)
+		public PerforResAccountnurseRepository(PerformanceDbContext context) : base(context)
         {
         }
     }

performance/Performance.Services/AllotService.cs

@@ -15,11 +15,11 @@ namespace Performance.Services
 {
     public class AllotService : IAutoInjection
     {
-        private PerforAllotRepository _allotRepository;
+        private PerforPerAllotRepository _allotRepository;
         private IHostingEnvironment _evn;
         private ILogger<AllotService> _logger;
 
-        public AllotService(PerforAllotRepository allotRepository,
+        public AllotService(PerforPerAllotRepository allotRepository,
              IHostingEnvironment evn,
              ILogger<AllotService> logger)
         {
@@ -53,7 +53,7 @@ public AllotResponse InsertAllot(AllotRequest request, int userID)
             if (repAllot != null && repAllot.Count() > 0)
                 throw new PerformanceException("当前绩效记录已存在");
 
-            var allot = Mapper.Map<sys_allot>(request);
+            var allot = Mapper.Map<per_allot>(request);
             allot.CreateDate = DateTime.Now;
             allot.CreateUser = userID;
             allot.States = 0;
@@ -129,7 +129,7 @@ public bool DeleteAllot(int iD)
         /// </summary>
         /// <param name="allotId"></param>
         /// <returns></returns>
-        public sys_allot GetAllot(int allotId)
+        public per_allot GetAllot(int allotId)
         {
             return _allotRepository.GetEntity(t => t.ID == allotId);
         }
@@ -139,7 +139,7 @@ public sys_allot GetAllot(int allotId)
         /// </summary>
         /// <param name="allot"></param>
         /// <returns></returns>
-        public bool Update(sys_allot allot)
+        public bool Update(per_allot allot)
         {
             return _allotRepository.Update(allot);
         }

performance/Performance.Services/PerExcelService/PerExcelService.cs

@@ -18,22 +18,22 @@ public class PerExcelService : IAutoInjection
     {
         private PerSheetService _perSheetService;
         private PerHeaderService _perHeaderService;
-        private PerforImSheetRepository _perforImSheetRepository;
+        private PerforPerSheetRepository _perforImSheetRepository;
         private PerforImDataRepository _perforImDataRepository;
         private PerforImHeaderRepository _perforImHeaderRepository;
         private PerforImEmployeeRepository _perforImEmployeeRepository;
         private PerforImaccountbasicRepository _perforImaccountbasicRepository;
-        private PerforImaccountdoctorRepository _perforImaccountdoctorRepository;
-        private PerforImaccountnurseRepository _perforImaccountnurseRepository;
+        private PerforResAccountdoctorRepository _perforImaccountdoctorRepository;
+        private PerforResAccountnurseRepository _perforImaccountnurseRepository;
         public PerExcelService(PerSheetService perSheetService,
             PerHeaderService perHeaderService,
-            PerforImSheetRepository perforImSheetRepository,
+            PerforPerSheetRepository perforImSheetRepository,
             PerforImDataRepository perforImDataRepository,
             PerforImHeaderRepository perforImHeaderRepository,
             PerforImEmployeeRepository perforImEmployeeRepository,
             PerforImaccountbasicRepository perforImaccountbasicRepository,
-            PerforImaccountdoctorRepository perforImaccountdoctorRepository,
-            PerforImaccountnurseRepository perforImaccountnurseRepository)
+            PerforResAccountdoctorRepository perforImaccountdoctorRepository,
+            PerforResAccountnurseRepository perforImaccountnurseRepository)
         {
             _perSheetService = perSheetService;
             _perHeaderService = perHeaderService;
@@ -46,7 +46,7 @@ public class PerExcelService : IAutoInjection
             _perforImaccountnurseRepository = perforImaccountnurseRepository;
         }
 
-        public void Execute(sys_allot allot)
+        public void Execute(per_allot allot)
         {
             //清空当前绩效下数据
             Clear(allot.ID);
@@ -73,7 +73,7 @@ public void Execute(sys_allot allot)
             SendEmail(allot);
         }
 
-        private void SendEmail(sys_allot allot)
+        private void SendEmail(per_allot allot)
         {
 
         }
@@ -145,7 +145,7 @@ public void Save(List<PerSheet> perSheets, int allotId, int source)
         {
             foreach (var sheet in perSheets)
             {
-                var imsheet = new im_sheet { AllotID = allotId, SheetName = sheet.SheetName, Source = source, SheetType = (int)sheet.SheetType };
+                var imsheet = new per_sheet { AllotID = allotId, SheetName = sheet.SheetName, Source = source, SheetType = (int)sheet.SheetType };
                 _perforImSheetRepository.Add(imsheet);
                 if (sheet.SheetType == SheetType.Employee)
                 {
@@ -172,7 +172,7 @@ public void Save(List<PerSheet> perSheets, int allotId, int source)
                     var dataList = sheet.PerData.Select(t => (PerDataAccountDoctor)t);
                     foreach (var data in dataList)
                     {
-                        var imdata = Mapper.Map<im_accountdoctor>(data);
+                        var imdata = Mapper.Map<res_accountdoctor>(data);
                         imdata.SheetID = imsheet.ID;
                         _perforImaccountdoctorRepository.Add(imdata);
                     }
@@ -182,7 +182,7 @@ public void Save(List<PerSheet> perSheets, int allotId, int source)
                     var dataList = sheet.PerData.Select(t => (PerDataAccountNurse)t);
                     foreach (var data in dataList)
                     {
-                        var imdata = Mapper.Map<im_accountnurse>(data);
+                        var imdata = Mapper.Map<res_accountnurse>(data);
                         imdata.SheetID = imsheet.ID;
                         _perforImaccountnurseRepository.Add(imdata);
                     }
@@ -293,25 +293,14 @@ private IRow CreateRow(ICellStyle cellstyle, ISheet exportSheet, IRow row, PerHe
         /// 计算最终数据
         /// </summary>
         /// <param name="excel"></param>
-        public void Compute(sys_allot allot, PerExcel excel)
+        public void Compute(per_allot allot, PerExcel excel)
         {
             var sheetList = _perforImSheetRepository.GetEntities(t => t.AllotID == allot.ID);
             //取出人员信息
             var empolyeeList = _perforImEmployeeRepository.GetEntities(t => sheetList.Select(s => s.ID).Contains(t.SheetID.Value));
 
             //根据不同人员执行不同算法
-            ComputeDirector computeDirector = new ComputeDirector();
-            computeDirector.Compute(empolyeeList);
-
-            ComputeDeputyDirector computeDeputyDirector = new ComputeDeputyDirector();
-            computeDeputyDirector.Compute(empolyeeList);
-
-            ComputeNurse computeNurse = new ComputeNurse();
-            computeNurse.Compute(empolyeeList);
-
-
-            ComputeMedicalTechnician computeMedicalTechnician = new ComputeMedicalTechnician();
-            computeMedicalTechnician.Compute(empolyeeList);
+         
 
             //计算院领导、中层管理、工勤人员
 

performance/Performance.Services/SheetSevice.cs

@@ -14,23 +14,23 @@ namespace Performance.Services
     /// </summary>
     public class SheetSevice : IAutoInjection
     {
-        private PerforAllotRepository _perforAllotRepository;
-        private PerforImSheetRepository _perforImSheetRepository;
+        private PerforPerAllotRepository _perforAllotRepository;
+        private PerforPerSheetRepository _perforImSheetRepository;
         private PerforImDataRepository _perforImDataRepository;
         private PerforImHeaderRepository _perforImHeaderRepository;
         private PerforImEmployeeRepository _perforImEmployeeRepository;
         private PerforImaccountbasicRepository _perforImaccountbasicRepository;
-        private PerforImaccountdoctorRepository _perforImaccountdoctorRepository;
-        private PerforImaccountnurseRepository _perforImaccountnurseRepository;
+        private PerforResAccountdoctorRepository _perforImaccountdoctorRepository;
+        private PerforResAccountnurseRepository _perforImaccountnurseRepository;
 
-        public SheetSevice(PerforAllotRepository perforAllotRepository,
-            PerforImSheetRepository perforImSheetRepository,
+        public SheetSevice(PerforPerAllotRepository perforAllotRepository,
+            PerforPerSheetRepository perforImSheetRepository,
             PerforImDataRepository perforImDataRepository,
             PerforImHeaderRepository perforImHeaderRepository,
             PerforImEmployeeRepository perforImEmployeeRepository,
             PerforImaccountbasicRepository perforImaccountbasicRepository,
-            PerforImaccountdoctorRepository perforImaccountdoctorRepository,
-            PerforImaccountnurseRepository perforImaccountnurseRepository)
+            PerforResAccountdoctorRepository perforImaccountdoctorRepository,
+            PerforResAccountnurseRepository perforImaccountnurseRepository)
         {
             _perforAllotRepository = perforAllotRepository;
             _perforImSheetRepository = perforImSheetRepository;