Merge branch 'hotfix/下发功能重做'

performance/Performance.Api/Controllers/AllotController.cs

@@ -425,18 +425,36 @@ public ApiResponse Issued([FromBody] AllotRequest request)
             if (null == allot)
                 throw new PerformanceException("当前绩效记录不存在");
 
-            // 科室下发
-            bool isIssued = false;
-            var result = _resultComputeService.IssuedPrompt(allot, request, ref isIssued);
-
-            //绩效状态修改;绩效划拨，下发驳回
-            if (request.isIssued == 1 && isIssued)
+            var seconds = _resultComputeService.GetSeconds(allot);
+            if (request.isIssued == 1)
+            {
+                // 确认下发
+                var isIssued = _resultComputeService.IssuedChangeSecond(allot, seconds);
+                if (isIssued)
                 {
                     _allotService.UpdateAllotStates(allot.ID, (int)AllotStates.GenerateSucceed, EnumHelper.GetDescription(AllotStates.GenerateSucceed));
                     costTransferService.RejectedApplicat(allot.ID);
+                    return new ApiResponse(ResponseType.OK, "下发成功");
+                }
+                else
+                {
+                    return new ApiResponse(ResponseType.Fail, "下发失败");
+                }
             }
+            else
+            {
+                // 获取二次分配差异数据 
+                var orgChangeSecond = _resultComputeService.GetChangeSecond(seconds);
 
-            return new ApiResponse(ResponseType.OK, result);
+                if (!string.IsNullOrEmpty(request.SearchQuery))
+                    orgChangeSecond = orgChangeSecond?.Where(t => t.Department.Contains(request.SearchQuery)).ToList() ?? new List<IssuedPromptResponse>();
+                if (!string.IsNullOrEmpty(request.QueryStatus.ToString()))
+                    orgChangeSecond = orgChangeSecond?.Where(t => t.IssueStatus == request.QueryStatus).ToList() ?? new List<IssuedPromptResponse>();
+
+                orgChangeSecond.ForEach(item => item.UnitType = UnitTypeUtil.GetOffice(item.UnitType));
+                orgChangeSecond = orgChangeSecond?.OrderBy(t => t.IssueStatus).ToList();
+                return new ApiResponse(ResponseType.OK, orgChangeSecond);
+            }
         }
 
         /// <summary>

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.Services/AllotService.cs

@@ -450,8 +450,8 @@ public void Generate(per_allot allot)
                 //logManageService.WriteMsg("正在生成绩效", "保存预留绩效金额", 1, allot.ID, "ReceiveMessage", true);
                 //resultComputeService.SaveReserved(allot, allot.HospitalId);
 
-                // 科室下发
-                resultComputeService.GenerateSecondAllot(allot);
+                //// 科室下发
+                //resultComputeService.GenerateSecondAllot(allot);
 
                 UpdateAllotStates(allot.ID, (int)AllotStates.GenerateAccomplish, EnumHelper.GetDescription(AllotStates.GenerateAccomplish), generate);
                 perforCofdirectorRepository.SupplementaryData(allot.ID);
@@ -465,7 +465,6 @@ public void Generate(per_allot allot)
                 //logManageService.WriteMsg("正在生成报表数据", $"报表数据生成完成；受影响：{res}行", 1, allot.ID, "ReceiveMessage", true);
                 //reportService.ExecProc("call proc_report_performance(@hospitalid, @year, @month);", new { allot.HospitalId, allot.Year, allot.Month });
 
-
                 ////发送邮件
                 //logManageService.WriteMsg("正在发送邮件", "正在发送邮件", 1, allot.ID, "ReceiveMessage", true);
                 //SendEmail(allot, mail, 1, time);

performance/Performance.Services/UnitTypeUtil.cs

@@ -31,6 +31,16 @@ public static bool IsOffice(string unit)
         }
 
         /// <summary>
+        /// 获得标准名 行政后勤/工勤
+        /// </summary>
+        /// <param name="unit"></param>
+        /// <returns></returns>
+        public static string GetOffice(string unit)
+        {
+            return string.IsNullOrEmpty(unit) ? "" : unit.Replace("行政后勤", "行政工勤");
+        }
+
+        /// <summary>
         /// 核算单元类型是否相同
         /// </summary>
         /// <param name="left"></param>