修改下发功能

performance/Performance.Api/Controllers/AllotController.cs

@@ -423,14 +423,18 @@ public ApiResponse Issued([FromBody] AllotRequest request)
             var allot = _allotService.GetAllot(request.ID);
             if (null == allot)
                 throw new PerformanceException("当前绩效记录不存在");
-            _allotService.UpdateAllotStates(allot.ID, (int)AllotStates.GenerateSucceed, EnumHelper.GetDescription(AllotStates.GenerateSucceed));
+            
             // 科室下发
             bool isIssued = false;
             var result = _resultComputeService.IssuedPrompt(allot, request, ref isIssued);
 
-            //绩效划拨，下发驳回
+            //绩效状态修改;绩效划拨，下发驳回
             if (request.isIssued == 1 && isIssued)
+            {
+                _allotService.UpdateAllotStates(allot.ID, (int)AllotStates.GenerateSucceed, EnumHelper.GetDescription(AllotStates.GenerateSucceed));
                 costTransferService.RejectedApplicat(allot.ID);
+            }
+                
             return new ApiResponse(ResponseType.OK, result);
         }
 

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

@@ -3492,9 +3492,9 @@
             有效收入占比
             </summary>
         </member>
-        <member name="P:Performance.DtoModels.IssuedPromptResponse.Status">
+        <member name="P:Performance.DtoModels.IssuedPromptResponse.IssueStatus">
             <summary>
-            1 修改 2 删除
+            1 删除 2 驳回 3 修改 4 新增
             </summary>
         </member>
         <member name="P:Performance.DtoModels.MenuResponse.MenuName">

performance/Performance.DtoModels/Request/AllotRequest.cs

@@ -37,6 +37,8 @@ public class AllotRequest
         public int isIssued { get; set; }
 
         public string SearchQuery { get; set; }
+
+        public int? QueryStatus { get; set; }
     }
 
     public class AllotRequestValidator : AbstractValidator<AllotRequest>

performance/Performance.DtoModels/Response/IssuedPromptResponse.cs

@@ -7,11 +7,11 @@ namespace Performance.DtoModels
 {
     public class IssuedPromptResponse : ag_secondallot
     {
-        public decimal? Diff { get; set; }
+        public string StatusRemake { get; set; }
 
         /// <summary>
         /// 1 删除 2 驳回 3 修改 4 新增
         /// </summary>
-        public new int Status { get; set; }
+        public new int IssueStatus { get; set; }
     }
 }

performance/Performance.Services/EmployeeService.cs

@@ -1117,21 +1117,21 @@ public class ComparisonConfig
     {
         public static List<Heads> DeptHeads { get; } = new List<Heads>
         {
-            new Heads{Cloumon="科室类别",Name=nameof(view_check_dept.UnitType)},
+            new Heads{Cloumon="核算单元组别",Name=nameof(view_check_dept.UnitType)},
             new Heads{Cloumon="核算单元",Name=nameof(view_check_dept.AccountingUnit)},
-            new Heads{Cloumon="预发绩效",Name=nameof(view_check_dept.RealGiveFeeExecl)},
-            new Heads{Cloumon="实发绩效",Name=nameof(view_check_dept.RealGiveFeeCompute)},
+            new Heads{Cloumon="测算表实发",Name=nameof(view_check_dept.RealGiveFeeExecl)},
+            new Heads{Cloumon="软件实发",Name=nameof(view_check_dept.RealGiveFeeCompute)},
             new Heads{Cloumon="差额",Name=nameof(view_check_dept.Diff)},
         };
 
         public static List<Heads> EmpHeads { get; } = new List<Heads>
         {
-            new Heads{Cloumon="科室类别",Name=nameof(view_check_emp.UnitType)},
+            new Heads{Cloumon="核算单元组别",Name=nameof(view_check_emp.UnitType)},
             new Heads{Cloumon="核算单元",Name=nameof(view_check_emp.AccountingUnit)},
             new Heads{Cloumon="人员工号",Name=nameof(view_check_emp.JobNumber)},
             new Heads{Cloumon="姓名",Name=nameof(view_check_emp.EmployeeName)},
-            new Heads{Cloumon="预发绩效",Name=nameof(view_check_emp.RealGiveFeeExecl)},
-            new Heads{Cloumon="实发绩效",Name=nameof(view_check_emp.RealGiveFeeCompute)},
+            new Heads{Cloumon="测算表实发",Name=nameof(view_check_emp.RealGiveFeeExecl)},
+            new Heads{Cloumon="软件实发",Name=nameof(view_check_emp.RealGiveFeeCompute)},
             new Heads{Cloumon="差额",Name=nameof(view_check_emp.Diff)},
         };
     }