医院其他绩效类型和不公示医院其他绩效类型（增删改查）

performance/Performance.Api/Controllers/EmployeeController.cs

@@ -1193,12 +1193,10 @@ public ApiResponse<List<per_apr_amount_type>> GetAprTypeList([FromRoute] int all
         [HttpPost]
         public ApiResponse<AprTypeRequest> InsertAprType([FromBody] AprTypeRequest request)
         {
-            if (!string.IsNullOrEmpty(request.PerforType.Trim()))
-            {
-                request.CreateUser = claim.GetUserId();
-                return employeeService.InsertAprType(request);
-            }
-            else return new ApiResponse<AprTypeRequest>(ResponseType.Fail, "请填写类型");
+           
+                var createUser = claim.GetUserId();
+                return employeeService.InsertAprType(createUser, request);
+           
         }
 
         /// <summary>
@@ -1226,5 +1224,61 @@ public ApiResponse DeleteAprType([FromQuery] int typeId)
             return employeeService.DeleteAprType(typeId);
         }
         #endregion
+
+
+        #region 不公示医院其他绩效类型
+        /// <summary>
+        /// 不公示医院其他绩效类型清单
+        /// </summary>
+        /// <param name="allotId"></param>
+        /// <returns></returns>
+        [Route("apr/hide/type/list/{allotId}")]
+        [HttpPost]
+        public ApiResponse<List<per_apr_amount_hide_type>> GetAprTypeListHide([FromRoute] int allotId)
+        {
+
+            return employeeService.GetAprTypeListHide(allotId);
+        }
+
+        /// <summary>
+        /// 不公示医院其他绩效列表清单添加
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [Route("apr/hide/type/insert")]
+        [HttpPost]
+        public ApiResponse<AprTypeRequest> InsertAprTypeHide([FromBody] AprTypeRequest request)
+        {
+
+            var createUser = claim.GetUserId();
+            return employeeService.InsertAprTypeHide(createUser, request);
+
+        }
+
+        /// <summary>
+        /// 不公示医院其他绩效列表清单修改
+        /// </summary>
+        /// <param name="typeId"></param>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [Route("apr/hide/type/update")]
+        [HttpPost]
+        public ApiResponse<AprTypeRequest> UpdateAprTypehide([FromQuery] int typeId, [FromBody] AprTypeRequest request)
+        {
+            return employeeService.UpdateAprTypeHide(typeId, request);
+        }
+
+        /// <summary>
+        /// 不公示医院其他绩效列表清单删除
+        /// </summary>
+        /// <param name="typeId"></param>
+        /// <returns></returns>
+        [Route("apr/hide/type/delete")]
+        [HttpPost]
+        public ApiResponse DeleteAprTypeHide([FromQuery] int typeId)
+        {
+            return employeeService.DeleteAprTypeHide(typeId);
+        }
+        #endregion
     }
 }

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

@@ -1475,7 +1475,7 @@
         </member>
         <member name="M:Performance.Api.Controllers.EmployeeController.UpdateAprType(System.Int32,Performance.DtoModels.Request.AprTypeRequest)">
             <summary>
-            医院其他绩效列表清单
+            医院其他绩效列表清单修改
             </summary>
             <param name="typeId"></param>
             <param name="request"></param>
@@ -1483,7 +1483,36 @@
         </member>
         <member name="M:Performance.Api.Controllers.EmployeeController.DeleteAprType(System.Int32)">
             <summary>
-            医院其他绩效列表清单
+            医院其他绩效列表清单删除
+            </summary>
+            <param name="typeId"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.EmployeeController.GetAprTypeListHide(System.Int32)">
+            <summary>
+            不公示医院其他绩效类型清单
+            </summary>
+            <param name="allotId"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.EmployeeController.InsertAprTypeHide(Performance.DtoModels.Request.AprTypeRequest)">
+            <summary>
+            不公示医院其他绩效列表清单添加
+            </summary>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.EmployeeController.UpdateAprTypehide(System.Int32,Performance.DtoModels.Request.AprTypeRequest)">
+            <summary>
+            不公示医院其他绩效列表清单修改
+            </summary>
+            <param name="typeId"></param>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.EmployeeController.DeleteAprTypeHide(System.Int32)">
+            <summary>
+            不公示医院其他绩效列表清单删除
             </summary>
             <param name="typeId"></param>
             <returns></returns>

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

@@ -6048,6 +6048,41 @@
             
             </summary>
         </member>
+        <member name="T:Performance.EntityModels.Entity.per_apr_amount_hide_type">
+            <summary>
+            不公示医院其他绩效类型
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.Entity.per_apr_amount_hide_type.Id">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.Entity.per_apr_amount_hide_type.AllotId">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.Entity.per_apr_amount_hide_type.PerforType">
+            <summary>
+            费用类型
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.Entity.per_apr_amount_hide_type.CreateDate">
+            <summary>
+            创建时间
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.Entity.per_apr_amount_hide_type.CreateUser">
+            <summary>
+            创建人
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.Entity.per_apr_amount_hide_type.UpdateTime">
+            <summary>
+            修改时间
+            </summary>
+        </member>
         <member name="T:Performance.EntityModels.Entity.per_apr_amount_type">
             <summary>
             医院其他绩效类型

performance/Performance.DtoModels/Request/AprTypeRequest.cs

@@ -10,7 +10,5 @@ public class AprTypeRequest
     {
         public int AllotId { get; set; }
         public string PerforType { get; set; }
-
-        public int CreateUser { get; set; }   
     }
 }

performance/Performance.EntityModels/Context/PerformanceDbContext.cs

@@ -259,6 +259,7 @@ public PerformanceDbContext(DbContextOptions<PerformanceDbContext> options)
         public virtual DbSet<per_allot_action> per_allot_action { get; set; }
 
         public virtual DbSet<per_apr_amount_type> per_apr_amount_type { get; set; }
+        public virtual DbSet<per_apr_amount_hide_type> per_apr_amount_hide_type { get; set; }
 
     }
 }

performance/Performance.EntityModels/Entity/per_apr_amount_hide_type.cs

+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Performance.EntityModels.Entity
+{
+    /// <summary>
+    /// 不公示医院其他绩效类型
+    /// </summary>
+    [Table("per_apr_amount_hide_type")]
+
+    public class per_apr_amount_hide_type
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        [Key]
+        public int Id { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int AllotId { get; set; }
+        /// <summary>
+        /// 费用类型
+        /// </summary>
+        public string PerforType { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateDate { get; set; }
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public int CreateUser { get; set; }
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        public DateTime UpdateTime { get; set; }
+
+
+    }
+}

performance/Performance.Repository/Repository/PerAprAmountTypeHideRepository.cs

+using Performance.EntityModels;
+using Performance.EntityModels.Entity;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Performance.Repository.Repository
+{
+    public partial class PerAprAmountTypeHideRepository : PerforRepository<per_apr_amount_hide_type>
+    {
+        /// <summary>
+        /// per_attendance_type Repository
+        /// </summary>
+        public PerAprAmountTypeHideRepository(PerformanceDbContext context) : base(context)
+        {
+        }
+    }
+}

performance/Performance.Services/EmployeeService.cs

@@ -52,10 +52,12 @@ public class EmployeeService : IAutoInjection
         private readonly UserService userService;
         private readonly DownloadService downloadService;
         private readonly PerAprAmountTypeRepository perAprAmountTypeRepository;
+        private readonly PerAprAmountTypeHideRepository perAprAmountTypeHIdeRepository;
         private readonly PerforPerapramountRepository perforPerapramountRepository;
 
 
 
+
         public EmployeeService(
             IMapper mapper,
             DapperService service,
@@ -86,7 +88,9 @@ public class EmployeeService : IAutoInjection
             UserService userService,
             DownloadService downloadService,
             PerAprAmountTypeRepository perAprAmountTypeRepository,
-            PerforPerapramountRepository perforPerapramountRepository)
+            PerforPerapramountRepository perforPerapramountRepository,
+            PerAprAmountTypeHideRepository perAprAmountTypeHideRepository
+            )
         {
             _mapper = mapper;
             _service = service;
@@ -118,6 +122,7 @@ public class EmployeeService : IAutoInjection
             this.downloadService = downloadService;
             this.perAprAmountTypeRepository = perAprAmountTypeRepository;
             this.perforPerapramountRepository = perforPerapramountRepository;
+            this.perAprAmountTypeHIdeRepository = perAprAmountTypeHideRepository;
         }
 
         #region 行政人员
@@ -911,6 +916,62 @@ public List<TitleValue> GetPerforTypeDict(int allotId)
             return others;
         }
         #endregion
+
+        #region 医院其他绩效类型
+        public ApiResponse<List<per_apr_amount_type>> GetAprTypeList(int allotId)
+        {
+            var result = perAprAmountTypeRepository.GetEntities(t => t.AllotId == allotId).ToList();
+            if (result != null)
+                return new ApiResponse<List<per_apr_amount_type>>(ResponseType.OK, result);
+            else return new ApiResponse<List<per_apr_amount_type>>(ResponseType.NotFound);
+        }
+
+        public ApiResponse<AprTypeRequest> InsertAprType(int createUser, AprTypeRequest request)
+        {
+            if (string.IsNullOrEmpty(request.PerforType.Trim()) || request.AllotId <= 0)
+                return new ApiResponse<AprTypeRequest>(ResponseType.ParameterError, "类型不能为空");
+            var tepm = perAprAmountTypeRepository.GetEntity(t => t.AllotId == request.AllotId && t.PerforType == request.PerforType);
+            if (tepm != null)
+                return new ApiResponse<AprTypeRequest>(ResponseType.ParameterError, "已存在该类型");
+            per_apr_amount_type per_Apr_Amount_Type = new per_apr_amount_type()
+            {
+                AllotId = request.AllotId,
+                PerforType = request.PerforType.Trim(),
+                CreateDate = DateTime.Now,
+                CreateUser = createUser,
+            };
+            if (perAprAmountTypeRepository.Add(per_Apr_Amount_Type)) return new ApiResponse<AprTypeRequest>(ResponseType.OK, "添加成功");
+            else return new ApiResponse<AprTypeRequest>(ResponseType.Fail, "添加失败");
+        }
+
+        public ApiResponse<AprTypeRequest> UpdateAprType(int typeId, AprTypeRequest request)
+        {
+            var tepm = perAprAmountTypeRepository.GetEntity(t => t.AllotId == request.AllotId && t.PerforType == request.PerforType);
+            if (tepm != null)
+                return new ApiResponse<AprTypeRequest>(ResponseType.ParameterError, "已存在该类型");
+            var res = perAprAmountTypeRepository.GetEntity(t => t.Id == typeId);
+            if (res == null)
+                return new ApiResponse<AprTypeRequest>(ResponseType.NotFound, "未查询到内容");
+            res.UpdateTime = DateTime.Now;
+            res.AllotId = request.AllotId;
+            res.PerforType = request.PerforType.Trim();
+            if (perAprAmountTypeRepository.Update(res)) return new ApiResponse<AprTypeRequest>(ResponseType.OK, "修改成功");
+            else return new ApiResponse<AprTypeRequest>(ResponseType.Fail, "修改失败");
+
+
+        }
+        public ApiResponse DeleteAprType(int typeId)
+        {
+            var any = perAprAmountTypeRepository.GetEntity(t => t.Id == typeId);
+            if (any == null) return new ApiResponse(ResponseType.NotFound, "没有该数据");
+            var use = perforPerapramountRepository.GetEntity(t => t.PerforType == any.PerforType);
+            if (use != null) return new ApiResponse(ResponseType.ParameterError, "该类型正在使用！");
+            if (perAprAmountTypeRepository.DeleteFromQuery(t => t.Id == typeId) > 0)
+                return new ApiResponse(ResponseType.OK, "删除成功");
+            else return new ApiResponse(ResponseType.Fail, "删除失败");
+        }
+        #endregion
+
         /// <summary>
         /// 根据人员工号获取人员信息
         /// </summary>
@@ -1071,65 +1132,8 @@ public List<OhterAmountAuditResponse> GetAprHideList(int allotId, int userId, in
 
             return result.ToList();
         }
-        #region 医院其他绩效类型
-        public ApiResponse<List<per_apr_amount_type>> GetAprTypeList(int allotId)
-        {
-            var result = perAprAmountTypeRepository.GetEntities(t => t.AllotId == allotId).ToList();
-            if (result != null)
-                return new ApiResponse<List<per_apr_amount_type>>(ResponseType.OK, result);
-            else
-            {
-                return new ApiResponse<List<per_apr_amount_type>>(ResponseType.Fail);
 
-            }
-        }
 
-        public ApiResponse<AprTypeRequest> InsertAprType(AprTypeRequest request)
-        {
-            var tepm = perAprAmountTypeRepository.GetEntities().FirstOrDefault(t => t.AllotId == request.AllotId && t.PerforType == request.PerforType);
-            if (tepm != null)
-                return new ApiResponse<AprTypeRequest>(ResponseType.Fail, "已存在该类型");
-            per_apr_amount_type per_Apr_Amount_Type = new per_apr_amount_type()
-            {
-                AllotId = request.AllotId,
-                PerforType = request.PerforType.Trim(),
-                CreateDate = DateTime.Now,
-                CreateUser = request.CreateUser,
-            };
-            if (perAprAmountTypeRepository.Add(per_Apr_Amount_Type)) return new ApiResponse<AprTypeRequest>(ResponseType.OK, "添加成功");
-            else return new ApiResponse<AprTypeRequest>(ResponseType.Fail, "添加失败");
-        }
-
-        public ApiResponse<AprTypeRequest> UpdateAprType(int typeId, AprTypeRequest request)
-        {
-            var tepm = perAprAmountTypeRepository.GetEntities().FirstOrDefault(t => t.Id == typeId && t.PerforType == request.PerforType);
-            if (tepm != null)
-            {
-                tepm.UpdateTime = DateTime.Now;
-                tepm.AllotId = request.AllotId;
-                tepm.PerforType = request.PerforType.Trim();
-                if (perAprAmountTypeRepository.Update(tepm)) return new ApiResponse<AprTypeRequest>(ResponseType.OK, "修改成功");
-                else return new ApiResponse<AprTypeRequest>(ResponseType.Fail, "修改失败");
-            }
-            else return new ApiResponse<AprTypeRequest>(ResponseType.Fail, "未查询到内容或已存在该类型");
-        }
-        public ApiResponse DeleteAprType(int typeId)
-        {
-            var any = perAprAmountTypeRepository.GetEntity(t => t.Id == typeId);
-
-            if (any == null) return new ApiResponse(ResponseType.Fail, "没有该数据");
-
-            var use = perforPerapramountRepository.GetEntity(t => t.PerforType == any.PerforType);
-            if (use != null) return new ApiResponse(ResponseType.Fail, "该类型正在使用！");
-
-            if (any != null && use == null)
-            {
-                if (perAprAmountTypeRepository.DeleteFromQuery(t => t.Id == typeId) > 0) return new ApiResponse(ResponseType.OK, "删除成功");
-                else return new ApiResponse(ResponseType.Fail, "删除失败");
-            }
-            else return new ApiResponse(ResponseType.Fail, "删除失败");
-        }
-        #endregion
 
 
         /// <summary>
@@ -1435,6 +1439,61 @@ public List<TitleValue> GetPerforTypeDictHide(int allotId)
         }
         #endregion
 
+        #region 不公式医院其他绩效类型
+        public ApiResponse<List<per_apr_amount_hide_type>> GetAprTypeListHide(int allotId)
+        {
+            var result = perAprAmountTypeHIdeRepository.GetEntities(t => t.AllotId == allotId).ToList();
+            if (result != null)
+                return new ApiResponse<List<per_apr_amount_hide_type>>(ResponseType.OK, result);
+            else return new ApiResponse<List<per_apr_amount_hide_type>>(ResponseType.NotFound);
+        }
+
+        public ApiResponse<AprTypeRequest> InsertAprTypeHide(int createUser, AprTypeRequest request)
+        {
+            if (string.IsNullOrEmpty(request.PerforType.Trim()) || request.AllotId <= 0)
+                return new ApiResponse<AprTypeRequest>(ResponseType.ParameterError, "类型不能为空");
+            var tepm = perAprAmountTypeHIdeRepository.GetEntity(t => t.AllotId == request.AllotId && t.PerforType == request.PerforType);
+            if (tepm != null)
+                return new ApiResponse<AprTypeRequest>(ResponseType.ParameterError, "已存在该类型");
+            per_apr_amount_hide_type per_apr_amount_hide_type = new per_apr_amount_hide_type()
+            {
+                AllotId = request.AllotId,
+                PerforType = request.PerforType.Trim(),
+                CreateDate = DateTime.Now,
+                CreateUser = createUser,
+            };
+            if (perAprAmountTypeHIdeRepository.Add(per_apr_amount_hide_type)) return new ApiResponse<AprTypeRequest>(ResponseType.OK, "添加成功");
+            else return new ApiResponse<AprTypeRequest>(ResponseType.Fail, "添加失败");
+        }
+
+        public ApiResponse<AprTypeRequest> UpdateAprTypeHide(int typeId, AprTypeRequest request)
+        {
+            var tepm = perAprAmountTypeHIdeRepository.GetEntity(t => t.AllotId == request.AllotId && t.PerforType == request.PerforType);
+            if (tepm != null)
+                return new ApiResponse<AprTypeRequest>(ResponseType.ParameterError, "已存在该类型");
+            var res = perAprAmountTypeHIdeRepository.GetEntity(t => t.Id == typeId);
+            if (res == null)
+                return new ApiResponse<AprTypeRequest>(ResponseType.NotFound, "未查询到内容");
+            res.UpdateTime = DateTime.Now;
+            res.AllotId = request.AllotId;
+            res.PerforType = request.PerforType.Trim();
+            if (perAprAmountTypeHIdeRepository.Update(res)) return new ApiResponse<AprTypeRequest>(ResponseType.OK, "修改成功");
+            else return new ApiResponse<AprTypeRequest>(ResponseType.Fail, "修改失败");
+
+
+        }
+        public ApiResponse DeleteAprTypeHide(int typeId)
+        {
+            var any = perAprAmountTypeHIdeRepository.GetEntity(t => t.Id == typeId);
+            if (any == null) return new ApiResponse(ResponseType.NotFound, "没有该数据");
+            var use = perforPerapramountRepository.GetEntity(t => t.PerforType == any.PerforType);
+            if (use != null) return new ApiResponse(ResponseType.ParameterError, "该类型正在使用！");
+            if (perAprAmountTypeHIdeRepository.DeleteFromQuery(t => t.Id == typeId) > 0)
+                return new ApiResponse(ResponseType.OK, "删除成功");
+            else return new ApiResponse(ResponseType.Fail, "删除失败");
+        }
+        #endregion
+
         public ComparisonResponse<DtoModels.Comparison<view_check_emp>> GetComparison(ComparisonPagingRequest request)
         {
             var result = new ComparisonResponse<DtoModels.Comparison<view_check_emp>>();