导入报表数据

performance/Performance.Api/Controllers/AllotController.cs

@@ -29,17 +29,19 @@ public class AllotController : Controller
         private IHostingEnvironment _evn;
         private ILogger<AllotController> _logger;
         private ClaimService _claim;
+        private readonly LogManageService logManageService;
 
         public AllotController(AllotService allotService,
             HospitalService hospitalService, ConfigService configService,
             ILogger<AllotController> logger, IHostingEnvironment evn,
-            ClaimService claim)
+            ClaimService claim, LogManageService logManageService)
         {
             _allotService = allotService;
             _hospitalService = hospitalService;
             _logger = logger;
             _evn = evn;
             _claim = claim;
+            this.logManageService = logManageService;
             _configService = configService;
         }
 
@@ -164,7 +166,7 @@ public ApiResponse Generate([CustomizeValidator(RuleSet = "Delete"), FromBody]Al
                 _allotService.Generate(allot, email);
             else
                 BackgroundJob.Schedule(() => _allotService.Generate(allot, email), TimeSpan.FromSeconds(1));
-
+            logManageService.WriteMsg("等待绩效生成", $"等待绩效生成{allot.Year}-{allot.Month.ToString().PadLeft(2, '0')}月份绩效!", 1, allot.ID, "ReceiveMessage");
             //_allotService.Generate(allot, email);
             ////BackgroundJob.Enqueue(() => _allotService.Generate(allot, email));
             return new ApiResponse(ResponseType.OK);

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

@@ -715,6 +715,11 @@
             <param name="request"></param>
             <returns></returns>
         </member>
+        <member name="T:Performance.Api.Controllers.SecondAllotController">
+            <summary>
+            二次绩效
+            </summary>
+        </member>
         <member name="M:Performance.Api.Controllers.SecondAllotController.List">
             <summary>
             二次绩效列表（没有需要初始化）
@@ -729,19 +734,19 @@
         </member>
         <member name="M:Performance.Api.Controllers.SecondAllotController.SaveCompute(System.Collections.Generic.List{Performance.EntityModels.ag_compute})">
             <summary>
-            二次绩效分配结果保存
+            提交二次绩效分配结果
             </summary>
             <returns></returns>
         </member>
         <member name="M:Performance.Api.Controllers.SecondAllotController.UseTemp(Performance.DtoModels.UseTempRequest)">
             <summary>
-            使用二次绩效模板
+            保存已选择二次绩效模板
             </summary>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.SecondAllotController.RefreshTemp">
+        <member name="M:Performance.Api.Controllers.SecondAllotController.RefreshTemp(Performance.DtoModels.UseTempRequest)">
             <summary>
-            应用模板
+            刷新已选择模板
             </summary>
             <returns></returns>
         </member>
@@ -771,7 +776,13 @@
         </member>
         <member name="M:Performance.Api.Controllers.SecondAllotController.Temp">
             <summary>
-            二次绩效模板列表
+            选择二次绩效模板
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.SecondAllotController.SecondDetail(Performance.DtoModels.UseTempRequest)">
+            <summary>
+            二次绩效详情
             </summary>
             <returns></returns>
         </member>

performance/Performance.Repository/PerforPerAllotRepository.cs

@@ -21,5 +21,12 @@ public bool UpdateAllotStates(int allotId, int states, string remark)
             allot.Remark = remark;
             return Update(allot);
         }
+
+        public int ImportData(int allotId)
+        {
+            string sql = @"select * from view_report_allot_summary where allotid=@allotId;
+select * from view_report_original_income where allotid=@allotId;";
+            return Execute(sql, new { allotId });
+        }
     }
 }

performance/Performance.Services/AllotService.cs

@@ -38,6 +38,7 @@ public class AllotService : IAutoInjection
 
         //private readonly IHubContext<AllotLogHub> hubContext;
         private readonly LogManageService logManageService;
+        private readonly ReportService reportService;
 
         public AllotService(PerforPerallotRepository allotRepository,
              BaiscNormService baiscNormService,
@@ -55,7 +56,8 @@ public class AllotService : IAutoInjection
              PerforHospitalRepository perforHospitalRepository,
              PerforResbaiscnormRepository perforResbaiscnormRepository,
              //IHubContext<AllotLogHub> hubContext
-             LogManageService logManageService)
+             LogManageService logManageService,
+             ReportService reportService)
         {
             _allotRepository = allotRepository;
             _againallotRepository = againallotRepository;
@@ -75,6 +77,7 @@ public class AllotService : IAutoInjection
             this.perforResbaiscnormRepository = perforResbaiscnormRepository;
             //this.hubContext = hubContext;
             this.logManageService = logManageService;
+            this.reportService = reportService;
         }
 
         #region 基础功能
@@ -294,7 +297,13 @@ public void Generate(per_allot allot, string mail)
                 perforResbaiscnormRepository.AddRange(baiscnormList.ToArray());
 
                 UpdateAllotStates(allot.ID, (int)AllotStates.GenerateSucceed, EnumHelper.GetDescription(AllotStates.GenerateSucceed));
+
+                logManageService.WriteMsg("正在生成报表数据", "正在生成报表数据", 1, allot.ID, "ReceiveMessage", true);
+                var res = reportService.ImportData(allot.ID);
+                logManageService.WriteMsg("正在生成报表数据", $"报表数据生成完成；受影响：{res}行", 1, allot.ID, "ReceiveMessage", true);
+
                 //发送邮件
+                logManageService.WriteMsg("正在发送邮件", "正在发送邮件", 1, allot.ID, "ReceiveMessage", true);
                 SendEmail(allot, mail, 1, time);
                 //logdbug.Add(allot.ID, "绩效开始执行", "绩效生成成功");
                 logManageService.WriteMsg("绩效生成结束", "绩效生成成功", 5, allot.ID, "ReceiveMessage", true);

performance/Performance.Services/ReportService.cs

@@ -234,5 +234,15 @@ public List<PerReport> Income(int hospitalId, int isIndex)
             }
             return perforReportRepository.Income(hospitalId, date);
         }
+
+        internal int ImportData(int allotId)
+        {
+            try
+            {
+                return perforPerallotRepository.ImportData(allotId);
+            }
+            catch { }
+            return 0;
+        }
     }
 }