检查核算单元

performance/Performance.Api/Controllers/AllotController.cs

@@ -301,7 +301,28 @@ public ApiResponse GenerateReport([CustomizeValidator(RuleSet = "Delete"), FromB
                     await Task.Delay(TimeSpan.FromSeconds(5), token);
                 }
             });
-            return new ApiResponse(ResponseType.OK);
+            return new ApiResponse(ResponseType.OK, "统计报表数据任务开始");
+        }
+
+        /// <summary>
+        /// 验证科室核算单元、工号
+        /// </summary>
+        /// <param name="allotId"></param>
+        /// <returns></returns>
+        [Route("accounting/verify/{allotId}")]
+        [HttpPost]
+        public ApiResponse AccountingVerify([FromRoute] int allotId)
+        {
+            _backgroundTaskQueue.QueueBackgroundWorkItem(async token =>
+            {
+                using (var scope = _serviceScopeFactory.CreateScope())
+                {
+                    var scopedServices = scope.ServiceProvider.GetRequiredService<AllotService>();
+                    scopedServices.AccoungtingVerify(allotId);
+                    await Task.Delay(TimeSpan.FromSeconds(5), token);
+                }
+            });
+            return new ApiResponse(ResponseType.OK, "核算单元及组别数据验证任务开始");
         }
 
         /*

performance/Performance.Api/Controllers/ConfigController.cs

@@ -594,19 +594,6 @@ public ApiResponse AccountingDelete([FromRoute] int accountingId)
                 return new ApiResponse(ResponseType.Fail);
             return new ApiResponse(ResponseType.OK);
         }
-
-        /// <summary>
-        /// 核算单元及组别数据验证
-        /// </summary>
-        /// <param name="allotId"></param>
-        /// <returns></returns>
-        [Route("accountingverify/{allotId}")]
-        [HttpPost]
-        public ApiResponse AccountingVerify([FromRoute] int allotId)
-        {
-            _configService.AccoungtingVerify(allotId);
-            return new ApiResponse(ResponseType.OK);
-        }
         #endregion
 
         /// <summary>

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

@@ -232,6 +232,13 @@
             <param name="request"></param>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.AllotController.AccountingVerify(System.Int32)">
+            <summary>
+            验证科室核算单元、工号
+            </summary>
+            <param name="allotId"></param>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.AllotController.Recalculation(Performance.DtoModels.RecalculationRequest)">
             <summary>
             重新计算院领导绩效
@@ -287,6 +294,12 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.AllotController.DownloadCurrentCalculationTable(Performance.DtoModels.AllotRequest)">
+            <summary>
+            下载当前测算表
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.BudgetController.Query(Performance.DtoModels.Request.BudgetRequest)">
             <summary>
             预算管理查询（包含金额、占比）
@@ -607,12 +620,11 @@
             <param name="request"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.ConfigController.GetAccountingList(System.Int32,System.Int32)">
+        <member name="M:Performance.Api.Controllers.ConfigController.GetAccountingList(Performance.DtoModels.AccoungingRequest)">
             <summary>
             获取cof_accounting列表
             </summary>
-            <param name="allotId"></param>
-            <param name="type">1 返回accounting列表 2 返回核算单元类型 3 返回核算单元</param>
+            <param name="request"></param>
             <returns></returns>
         </member>
         <member name="M:Performance.Api.Controllers.ConfigController.AccountingInsert(Performance.EntityModels.cof_accounting)">

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

@@ -1149,6 +1149,11 @@
             岗位系数
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.PerDataAccountBaisc.GiveFee">
+            <summary>
+            考核后绩效
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.PerDataClinicEmployee.UnitType">
             <summary>
             核算单元分类
@@ -1819,6 +1824,21 @@
             比率
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.AccoungingRequest.AllotId">
+            <summary>
+            绩效Id
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.AccoungingRequest.Type">
+            <summary>
+            1 返回accounting列表 2 返回核算单元类型 3 返回核算单元
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.AccoungingRequest.UnitType">
+            <summary>
+            核算单元类型、核算组别
+            </summary>
+        </member>
         <member name="T:Performance.DtoModels.AgainAllotRequest">
             <summary>
             二次分配请求

performance/Performance.Repository/PerforCofdirectorRepository.cs

@@ -219,11 +219,5 @@ union all
                 return flag;
             }
         }
-
-
-        public int VerifyAccountingAndUnittype(int allotId)
-        {
-            return Execute("call proc_verify_accoungingunit_unittype(@allotId);", new { allotId });
-        }
     }
 }

performance/Performance.Services/AllotService.cs

@@ -440,6 +440,8 @@ public void Generate(per_allot allot)
 
                 UpdateAllotStates(allot.ID, (int)AllotStates.GenerateAccomplish, EnumHelper.GetDescription(AllotStates.GenerateAccomplish), generate);
                 perforCofdirectorRepository.SupplementaryData(allot.ID);
+                // 验证科室核算单元、工号
+                AccoungtingVerify(allot.ID);
 
                 //logManageService.WriteMsg("正在生成报表数据", "正在生成报表数据", 1, allot.ID, "ReceiveMessage", true);
                 //var res = reportService.ImportData(allot);
@@ -474,6 +476,15 @@ public void GenerateReport(per_allot allot)
         }
 
         /// <summary>
+        /// 验证科室核算单元、工号
+        /// </summary>
+        /// <param name="allot"></param>
+        public void AccoungtingVerify(int allotId)
+        {
+            reportService.ExecProc("call proc_verify_accoungingunit_unittype(@allotId);", new { allotId });
+        }
+
+        /// <summary>
         /// 重新计算院领导绩效
         /// </summary>
         /// <param name="allotId"></param>

performance/Performance.Services/ConfigService.cs

@@ -706,17 +706,6 @@ public bool AccountingDelete(int accountingId)
             return cofaccountingRepository.Remove(entity);
         }
 
-
-        /// <summary>
-        /// 删除数据
-        /// </summary>
-        /// <param name="accountingId"></param>
-        /// <returns></returns>
-        public void AccoungtingVerify(int allotId)
-        {
-            _directorRepository.VerifyAccountingAndUnittype(allotId);
-        }
-
         #endregion
 
         #region Copy