Merge branch 'sec_work' into 科室取值

# Conflicts:
#	performance/Performance.Services/SecondAllotService.cs

performance/Performance.Api/Controllers/SecondAllotController.cs

@@ -216,6 +216,59 @@ public ApiResponse WorkloadDelete([CustomizeValidator(RuleSet = "Delete"), FromB
             var result = secondAllotService.WorkloadDelete(request.Id);
             return new ApiResponse(result ? ResponseType.OK : ResponseType.Fail);
         }
+
+        /// <summary>
+        /// 二次绩效单例奖励列表
+        /// </summary>
+        /// <returns></returns>
+        [Route("api/second/single/list")]
+        [HttpPost]
+        public ApiResponse SingleAwards([FromBody]WorkloadRequest request)
+        {
+            var result = secondAllotService.GetSingleList(request);
+            return new ApiResponse(ResponseType.OK, result);
+        }
+
+        /// <summary>
+        /// 二次绩效工作量类型列表
+        /// </summary>
+        /// <returns></returns>
+        [Route("api/second/worktype/list")]
+        [HttpPost]
+        public ApiResponse WorkTypeList([FromBody]WorkloadRequest request)
+        {
+            var result = secondAllotService.WorkTypeList(request);
+            return new ApiResponse(ResponseType.OK, result);
+        }
+
+        /// <summary>
+        /// 保存二次绩效工作量类型
+        /// </summary>
+        /// <returns></returns>
+        [Route("api/second/worktype/save")]
+        [HttpPost]
+        public ApiResponse SingleSave([FromBody]ag_workload_type request)
+        {
+            if (request.HospitalId == 0)
+                return new ApiResponse(ResponseType.ParameterError, "医院信息无效");
+            if (string.IsNullOrEmpty(request.TypeName))
+                return new ApiResponse(ResponseType.ParameterError, "填写参数无效");
+
+            var result = secondAllotService.SaveWorkType(request);
+            return new ApiResponse(ResponseType.OK, result);
+        }
+
+        /// <summary>
+        /// 删除二次绩效工作量类型
+        /// </summary>
+        /// <returns></returns>
+        [Route("api/second/single/delete")]
+        [HttpPost]
+        public ApiResponse SingleDelete([CustomizeValidator(RuleSet = "Delete"), FromBody]WorkloadRequest request)
+        {
+            var result = secondAllotService.DeleteWorkType(request);
+            return result ? new ApiResponse(ResponseType.OK, "删除成功") : new ApiResponse(ResponseType.Fail, "删除失败");
+        }
         #endregion
 
         #region 二次绩效审核

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

@@ -840,6 +840,30 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.SecondAllotController.SingleAwards(Performance.DtoModels.WorkloadRequest)">
+            <summary>
+            二次绩效单例奖励列表
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.SecondAllotController.WorkTypeList(Performance.DtoModels.WorkloadRequest)">
+            <summary>
+            二次绩效工作量类型列表
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.SecondAllotController.SingleSave(Performance.EntityModels.ag_workload_type)">
+            <summary>
+            保存二次绩效工作量类型
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.SecondAllotController.SingleDelete(Performance.DtoModels.WorkloadRequest)">
+            <summary>
+            删除二次绩效工作量类型
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.SecondAllotController.SubmitAudit(Performance.DtoModels.SubmitAuditRequest)">
             <summary>
             提交审核

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

@@ -143,6 +143,16 @@
         <member name="F:Performance.DtoModels.AllotStates.GenerateAccomplish">
             <summary> 绩效结果解析成功 </summary>
         </member>
+        <member name="F:Performance.DtoModels.AgWorkloadType.SingleAwards">
+            <summary>
+            单项奖励
+            </summary>
+        </member>
+        <member name="F:Performance.DtoModels.AgWorkloadType.Workload">
+            <summary>
+            工作量
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.PerAgainData.RowNumber">
             <summary>
             行号
@@ -1955,6 +1965,11 @@
             
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.WorkloadRequest.WorkTypeId">
+            <summary>
+            1、工作量 2、其他
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.WorkyearRequest.MaxRange">
             <summary>
             最大工龄范围（小于）
@@ -2732,6 +2747,9 @@
         <member name="P:Performance.DtoModels.HeadItem.IsBring">
             <summary> 1 带出历史数据 2不带出 </summary>
         </member>
+        <member name="P:Performance.DtoModels.HeadItem.SpecialAttr">
+            <summary> 1 value相加值为1 </summary>
+        </member>
         <member name="P:Performance.DtoModels.SecondTempResponse.TempName">
             <summary>
             模板名称

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

@@ -43,6 +43,9 @@
         <member name="P:Performance.EntityModels.PerformanceDbContext.ag_workload">
             <summary> 二次绩效工作量绩效 </summary>
         </member>
+        <member name="P:Performance.EntityModels.PerformanceDbContext.ag_workload_type">
+            <summary>  </summary>
+        </member>
         <member name="P:Performance.EntityModels.PerformanceDbContext.as_assess">
             <summary> 考核类别 </summary>
         </member>
@@ -557,6 +560,11 @@
             1 自动带出 2 计算得出
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.ag_fixatitem.SpecialAttr">
+            <summary>
+            1 value相加值为1
+            </summary>
+        </member>
         <member name="T:Performance.EntityModels.ag_header">
             <summary>
             二次分配不固定列头数据
@@ -832,6 +840,11 @@
             1 带出历史数据 2不带出
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.ag_tempitem.SpecialAttr">
+            <summary>
+            1 value相加值为1
+            </summary>
+        </member>
         <member name="T:Performance.EntityModels.ag_usetemp">
             <summary>
             
@@ -907,6 +920,31 @@
             
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.ag_workload.WorkTypeId">
+            <summary>
+            1、单项奖励 2、工作量占比 ..（自定义占比）
+            </summary>
+        </member>
+        <member name="T:Performance.EntityModels.ag_workload_type">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.ag_workload_type.Id">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.ag_workload_type.HospitalId">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.ag_workload_type.TypeName">
+            <summary>
+            
+            </summary>
+        </member>
         <member name="T:Performance.EntityModels.as_assess">
             <summary>
             考核类别
@@ -2854,7 +2892,7 @@
         </member>
         <member name="P:Performance.EntityModels.per_budget_result.States">
             <summary>
-            1.初始 2.确认使用发放/调节系数 3.取消使用
+            1.初始 2. 确认使用发放/调节系数
             </summary>
         </member>
         <member name="P:Performance.EntityModels.per_budget_result.CreateDate">

performance/Performance.DtoModels/Enum.cs

@@ -81,4 +81,16 @@ public enum AllotStates
         [Description("数据验证通过")]
         GenerateAccomplish = 10,
     }
+
+    public enum AgWorkloadType
+    {
+        /// <summary>
+        /// 单项奖励
+        /// </summary>
+        SingleAwards = 1,
+        /// <summary>
+        /// 工作量
+        /// </summary>
+        Workload = 2,
+    }
 }

performance/Performance.DtoModels/Request/WorkloadRequest.cs

@@ -41,6 +41,11 @@ public class WorkloadRequest
         /// 
         /// </summary>
         public Nullable<decimal> Sort { get; set; }
+
+        /// <summary>
+        /// 1、工作量 2、其他
+        /// </summary>
+        public int WorkTypeId { get; set; }
     }
     public class WorkloadRequestValidator : AbstractValidator<WorkloadRequest>
     {
@@ -52,6 +57,7 @@ public WorkloadRequestValidator()
                 RuleFor(x => x.Department).NotNull().NotEmpty();
                 RuleFor(x => x.UnitType).NotNull().NotEmpty();
                 RuleFor(x => x.ItemName).NotNull().NotEmpty();
+                RuleFor(x => x.WorkTypeId).NotNull().GreaterThan(0);
             });
 
             RuleSet("Update", () =>
@@ -59,6 +65,7 @@ public WorkloadRequestValidator()
                 RuleFor(x => x.Id).NotNull().GreaterThan(0);
                 RuleFor(x => x.HospitalId).NotNull().GreaterThan(0);
                 RuleFor(x => x.ItemName).NotNull().NotEmpty();
+                RuleFor(x => x.WorkTypeId).NotNull().GreaterThan(0);
             });
 
             RuleSet("Delete", () =>

performance/Performance.DtoModels/Response/SecondResponse.cs

@@ -10,7 +10,7 @@ public class SecondResponse
         public List<BodyItem> BodyItems { get; set; }
     }
 
-    public class HeadItem
+    public class HeadItem : ICloneable
     {
         public string FiledId { get; set; }
         public string FiledName { get; set; }
@@ -20,6 +20,14 @@ public class HeadItem
         public int SourceType { get; set; }
         /// <summary> 1 带出历史数据 2不带出 </summary>
         public Nullable<int> IsBring { get; set; }
+        /// <summary> 1 value相加值为1 </summary>
+        public Nullable<int> SpecialAttr { get; set; }
+        public Nullable<int> WorkType { get; set; }
+
+        public object Clone()
+        {
+            return MemberwiseClone();
+        }
     }
 
     public class BodyItem : HeadItem

performance/Performance.EntityModels/Context/PerformanceDbContext.cs

@@ -38,6 +38,8 @@ public PerformanceDbContext(DbContextOptions<PerformanceDbContext> options)
         public virtual DbSet<ag_usetemp> ag_usetemp { get; set; }
 		/// <summary> 二次绩效工作量绩效 </summary>
         public virtual DbSet<ag_workload> ag_workload { get; set; }
+		/// <summary>  </summary>
+        public virtual DbSet<ag_workload_type> ag_workload_type { get; set; }
 		/// <summary> 考核类别 </summary>
         public virtual DbSet<as_assess> as_assess { get; set; }
 		/// <summary> 考核列头 </summary>

performance/Performance.EntityModels/Entity/ag_fixatitem.cs

@@ -70,5 +70,10 @@ public class ag_fixatitem
         /// 1 自动带出 2 计算得出
         /// </summary>
         public Nullable<int> SourceType { get; set; }
+    
+        /// <summary>
+        /// 1 value相加值为1
+        /// </summary>
+        public Nullable<int> SpecialAttr { get; set; }
     }
 }

performance/Performance.EntityModels/Entity/ag_tempitem.cs

@@ -55,5 +55,10 @@ public class ag_tempitem
         /// 1 带出历史数据 2不带出
         /// </summary>
         public Nullable<int> IsBring { get; set; }
+    
+        /// <summary>
+        /// 1 value相加值为1
+        /// </summary>
+        public Nullable<int> SpecialAttr { get; set; }
     }
 }

performance/Performance.EntityModels/Entity/ag_workload.cs

@@ -55,5 +55,10 @@ public class ag_workload
         /// 
         /// </summary>
         public Nullable<decimal> Sort { get; set; }
+    
+        /// <summary>
+        /// 1、单项奖励 2、工作量占比 ..（自定义占比）
+        /// </summary>
+        public int WorkTypeId { get; set; }
     }
 }

performance/Performance.EntityModels/Entity/ag_workload_type.cs

+//-----------------------------------------------------------------------
+// <copyright file=" ag_workload_type.cs">
+// * FileName: .cs 
+// </copyright>
+//-----------------------------------------------------------------------
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Performance.EntityModels	
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    [Table("ag_workload_type")]
+	public class ag_workload_type
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        [Key]
+		public int Id { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public int HospitalId { get; set; }
+    
+        /// <summary>
+        /// 
+        /// </summary>
+        public string TypeName { get; set; }
+    }
+}

performance/Performance.EntityModels/Entity/per_budget_result.cs

@@ -152,7 +152,7 @@ public class per_budget_result
         public Nullable<decimal> NoPerformanceExpenditureRatio { get; set; }
     
         /// <summary>
-        /// 1.初始 2.确认使用发放/调节系数 3.取消使用
+        /// 1.初始 2. 确认使用发放/调节系数
         /// </summary>
         public int States { get; set; }
     

performance/Performance.Repository/Repository/PerforAgworkloadtypeRepository.cs

+//-----------------------------------------------------------------------
+// <copyright file=" ag_workload_type.cs">
+// * FileName: ag_workload_type.cs
+// </copyright>
+//-----------------------------------------------------------------------
+using System;
+using Performance.EntityModels;
+
+namespace Performance.Repository
+{
+    /// <summary>
+    /// ag_workload_type Repository
+    /// </summary>
+    public partial class PerforAgworkloadtypeRepository : PerforRepository<ag_workload_type>
+    {
+		public PerforAgworkloadtypeRepository(PerformanceDbContext context) : base(context)
+        {
+        }
+    }
+}