重载功能补充，获取、编辑工作量修改

performance/Performance.Api/Controllers/SecondAllotController.cs

@@ -23,21 +23,18 @@ public class SecondAllotController : ControllerBase
         private readonly SecondAllotService secondAllotService;
         private readonly ResultComputeService resultComputeService;
         private readonly SecondAllotDetails secondAllotDetails;
-        private readonly Services.SecondAllot.SecondAllotService secondAllot;
 
         public SecondAllotController(
             ClaimService claimService,
             SecondAllotService secondAllotService,
             ResultComputeService resultComputeService,
-            SecondAllotDetails secondAllotDetails,
-            Services.SecondAllot.SecondAllotService secondAllot
+            SecondAllotDetails secondAllotDetails
             )
         {
             this.claimService = claimService;
             this.secondAllotService = secondAllotService;
             this.resultComputeService = resultComputeService;
             this.secondAllotDetails = secondAllotDetails;
-            this.secondAllot = secondAllot;
         }
 
         #region 二次绩效列表、录入数据展示，保存数据
@@ -155,7 +152,8 @@ public ApiResponse SecondDetail([CustomizeValidator(RuleSet = "Refresh"), FromBo
         [HttpPost]
         public ApiResponse AutoComplete([FromBody] SecondEmpRequest request)
         {
-            var result = secondAllotService.AutoComplete(request, claimService.GetUserId());
+            //var result = secondAllotService.AutoComplete(request, claimService.GetUserId());
+            var result = secondAllotService.AutoComplete(request.SecondId, request.JobNumber);
             return new ApiResponse(ResponseType.OK, result);
         }
 
@@ -478,7 +476,7 @@ public ApiResponse DeptComputeDetail(int allotId)
         [HttpPost("api/second/detail/{secondId}/{employeeSource}")]
         public ApiResponse GetSecondAllotDetail([FromRoute] int secondId, int employeeSource)
         {
-            var detail = secondAllot.GetSecondSavedData(claimService.GetUserId(), secondId, employeeSource);
+            var detail = secondAllotService.GetSecondSavedData(claimService.GetUserId(), secondId, employeeSource);
             return new ApiResponse(ResponseType.OK, detail);
         }
 
@@ -490,7 +488,7 @@ public ApiResponse GetSecondAllotDetail([FromRoute] int secondId, int employeeSo
         [HttpPost("api/second/worktype/{secondId}")]
         public ApiResponse GetWorktypeDict([FromRoute] int secondId)
         {
-            var detail = secondAllot.GetWorkTypeDict(secondId);
+            var detail = secondAllotService.GetWorkTypeDict(secondId);
             return new ApiResponse(ResponseType.OK, detail);
         }
 
@@ -502,7 +500,7 @@ public ApiResponse GetWorktypeDict([FromRoute] int secondId)
         [HttpPost("api/second/workload/{secondId}")]
         public ApiResponse GetWorkloadDict([FromRoute] int secondId)
         {
-            var detail = secondAllot.GetWorkloadDict(secondId);
+            var detail = secondAllotService.GetWorkloadDict(secondId);
             return new ApiResponse(ResponseType.OK, detail);
         }
 
@@ -516,7 +514,7 @@ public ApiResponse GetWorkloadDict([FromRoute] int secondId)
         [AllowAnonymous]
         public ApiResponse SaveValue([FromRoute] int secondId, [FromBody] dynamic request)
         {
-            secondAllot.SaveSecondAllotData(secondId, request);
+            secondAllotService.SaveSecondAllotData(secondId, request);
             return new ApiResponse(ResponseType.OK);
         }
     }

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

@@ -2426,7 +2426,12 @@
         </member>
         <member name="P:Performance.DtoModels.WorkloadRequest.WorkTypeId">
             <summary>
-            1、工作量 2、其他
+            自定义工作量类型Id（不包括默认工作量绩效类型、单项奖励）
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.WorkloadRequest.IsSingleAwards">
+            <summary>
+            是否是单项奖励
             </summary>
         </member>
         <member name="P:Performance.DtoModels.WorkyearRequest.MaxRange">
@@ -3439,6 +3444,11 @@
             8 归档 9 等待生成 10 绩效结果解析成功
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.Detail.Status">
+            <summary>
+            状态 1 未提交  2 等待审核 3 审核通过 4 驳回
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.SecondListResponse.IsArchive">
             <summary> 是否归档 </summary>
         </member>

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

@@ -953,12 +953,12 @@
             年资职称绩效
             </summary>
         </member>
-        <member name="P:Performance.EntityModels.ag_headsource.PerformanceShareTheWorkload">
+        <member name="P:Performance.EntityModels.ag_headsource.Workload_Ratio_Default">
             <summary>
             工作量绩效占比
             </summary>
         </member>
-        <member name="P:Performance.EntityModels.ag_headsource.PerformanceWorkloadDistributionAmount">
+        <member name="P:Performance.EntityModels.ag_headsource.Workload_Amount_Default">
             <summary>
             工作量分配绩效金额
             </summary>

performance/Performance.DtoModels/Enum.cs

@@ -91,7 +91,7 @@ public enum AgWorkloadType
         /// <summary>
         /// 工作量
         /// </summary>
-        Workload = 2,
+        Workload = 0,
     }
     public enum DataFormat
     {

performance/Performance.DtoModels/Request/SecondEmpRequest.cs

@@ -20,7 +20,7 @@ public class SecondEmpRequestValidator : AbstractValidator<SecondEmpRequest>
     {
         public SecondEmpRequestValidator()
         {
-            RuleFor(x => x.TempId).NotNull().GreaterThan(0);
+            //RuleFor(x => x.TempId).NotNull().GreaterThan(0);
             RuleFor(x => x.SecondId).NotNull().GreaterThan(0);
         }
     }

performance/Performance.DtoModels/Request/WorkloadRequest.cs

@@ -43,9 +43,14 @@ public class WorkloadRequest
         public Nullable<decimal> Sort { get; set; }
 
         /// <summary>
-        /// 1、工作量 2、其他
+        /// 自定义工作量类型Id（不包括默认工作量绩效类型、单项奖励）
         /// </summary>
         public int WorkTypeId { get; set; }
+
+        /// <summary>
+        /// 是否是单项奖励
+        /// </summary>
+        public bool IsSingleAwards { get; set; }
     }
     public class WorkloadRequestValidator : AbstractValidator<WorkloadRequest>
     {

performance/Performance.DtoModels/Response/SecondAllotResponse.cs

@@ -26,6 +26,9 @@ public class Detail
         /// </summary>
         public int States { get; set; }
 
+        /// <summary>
+        /// 状态 1 未提交  2 等待审核 3 审核通过 4 驳回
+        /// </summary>
         public int Status { get; set; }
 
         public string Department { get; set; }

performance/Performance.EntityModels/Entity/ag_headsource.cs

@@ -74,12 +74,12 @@ public class ag_headsource
         /// <summary>
         /// 工作量绩效占比
         /// </summary>
-        public Nullable<decimal> PerformanceShareTheWorkload { get; set; }
+        public Nullable<decimal> Workload_Ratio_Default { get; set; }
 
         /// <summary>
         /// 工作量分配绩效金额
         /// </summary>
-        public Nullable<decimal> PerformanceWorkloadDistributionAmount { get; set; }
+        public Nullable<decimal> Workload_Amount_Default { get; set; }
 
         /// <summary>
         /// 满勤天数