二次绩效审核

performance/Performance.Api/Controllers/SecondAllotController.cs

@@ -27,6 +27,7 @@ public class SecondAllotController : ControllerBase
             this.secondAllotService = secondAllotService;
         }
 
+        #region 二次绩效列表、录入数据展示，保存数据
         /// <summary>
         /// 二次绩效列表（没有需要初始化）
         /// </summary>
@@ -104,6 +105,31 @@ public ApiResponse SaveCompute([FromBody]List<ag_compute> request)
         }
 
         /// <summary>
+        /// 二次绩效录入页面配置信息
+        /// </summary>
+        /// <returns></returns>
+        [Route("api/second/detail")]
+        [HttpPost]
+        public ApiResponse SecondDetail([CustomizeValidator(RuleSet = "Refresh"), FromBody]UseTempRequest request)
+        {
+            var result = secondAllotService.GetSecondDetail(request);
+            return new ApiResponse(ResponseType.OK, result);
+        }
+        #endregion
+
+        #region 模板使用
+        /// <summary>
+        /// 选择二次绩效模板
+        /// </summary>
+        /// <returns></returns> 
+        [HttpGet("api/temp/list/{hospitalid}")]
+        public ApiResponse<List<SecondTempResponse>> Temp(int hospitalid)
+        {
+            var result = secondAllotService.GetTemp(hospitalid);
+            return new ApiResponse<List<SecondTempResponse>>(ResponseType.OK, result);
+        }
+
+        /// <summary>
         /// 保存已选择二次绩效模板
         /// </summary>
         /// <returns></returns>
@@ -126,7 +152,9 @@ public ApiResponse RefreshTemp([CustomizeValidator(RuleSet = "Refresh"), FromBod
             secondAllotService.RefreshTemp(request);
             return new ApiResponse(ResponseType.OK);
         }
+        #endregion
 
+        #region 二次绩效工作量配置
         /// <summary>
         /// 二次绩效工作量列表
         /// </summary>
@@ -174,28 +202,54 @@ public ApiResponse WorkloadDelete([CustomizeValidator(RuleSet = "Delete"), FromB
             var result = secondAllotService.WorkloadDelete(request.Id);
             return new ApiResponse(result ? ResponseType.OK : ResponseType.Fail);
         }
+        #endregion
 
+        #region 二次绩效审核
         /// <summary>
-        /// 选择二次绩效模板
+        /// 提交审核
         /// </summary>
-        /// <returns></returns> 
-        [HttpGet("api/temp/list/{hospitalid}")]
-        public ApiResponse<List<SecondTempResponse>> Temp(int hospitalid)
+        /// <param name="secondid">二次绩效Id</param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("/api/second/audit/submit/{secondid}")]
+        public ApiResponse SubmitAudit(int secondid)
         {
-            var result = secondAllotService.GetTemp(hospitalid);
-            return new ApiResponse<List<SecondTempResponse>>(ResponseType.OK, result);
+            var second = secondAllotService.GetSecondallot(secondid);
+            if (second == null)
+                return new ApiResponse(ResponseType.ParameterError, "二次绩效Id无效");
+            if (second.Status == 3)
+                return new ApiResponse(ResponseType.Fail, "该绩效已\"审核通过\",无需再次提交");
+
+            var userid = claimService.GetUserId();
+            var result = secondAllotService.AuditSubmit(second);
+            return result ? new ApiResponse(ResponseType.OK, "提交成功") : new ApiResponse(ResponseType.Fail, "提交失败");
         }
 
         /// <summary>
-        /// 二次绩效录入页面配置信息
+        /// 二次绩效审核列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("/api/second/audit/list")]
+        public ApiResponse<List<ag_secondallot>> AuditList()
+        {
+            var userid = claimService.GetUserId();
+            var list = secondAllotService.AuditList(userid);
+            return new ApiResponse<List<ag_secondallot>>(ResponseType.OK, "审核列表", list);
+        }
+
+        /// <summary>
+        /// 二次绩效审核结果;驳回、成功
         /// </summary>
         /// <returns></returns>
-        [Route("api/second/detail")]
         [HttpPost]
-        public ApiResponse SecondDetail([CustomizeValidator(RuleSet = "Refresh"), FromBody]UseTempRequest request)
+        [Route("/api/second/audit/result")]
+        public ApiResponse AuditResult([FromBody] SecondAuditRequest request)
         {
-            var result = secondAllotService.GetSecondDetail(request);
-            return new ApiResponse(ResponseType.OK, result);
+            var userid = claimService.GetUserId();
+            var result = secondAllotService.ConfirmAudit(userid, request);
+            return result ? new ApiResponse(ResponseType.OK, "操作成功") : new ApiResponse(ResponseType.Fail, "操作失败");
         }
+        #endregion
     }
 }
\ No newline at end of file

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

@@ -757,6 +757,18 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.SecondAllotController.SecondDetail(Performance.DtoModels.UseTempRequest)">
+            <summary>
+            二次绩效录入页面配置信息
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.SecondAllotController.Temp(System.Int32)">
+            <summary>
+            选择二次绩效模板
+            </summary>
+            <returns></returns> 
+        </member>
         <member name="M:Performance.Api.Controllers.SecondAllotController.UseTemp(Performance.DtoModels.UseTempRequest)">
             <summary>
             保存已选择二次绩效模板
@@ -793,15 +805,22 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.SecondAllotController.Temp(System.Int32)">
+        <member name="M:Performance.Api.Controllers.SecondAllotController.SubmitAudit(System.Int32)">
             <summary>
-            选择二次绩效模板
+            提交审核
             </summary>
-            <returns></returns> 
+            <param name="secondid">二次绩效Id</param>
+            <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.SecondAllotController.SecondDetail(Performance.DtoModels.UseTempRequest)">
+        <member name="M:Performance.Api.Controllers.SecondAllotController.AuditList">
             <summary>
-            二次绩效录入页面配置信息
+            二次绩效审核列表
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.SecondAllotController.AuditResult(Performance.DtoModels.SecondAuditRequest)">
+            <summary>
+            二次绩效审核结果;驳回、成功
             </summary>
             <returns></returns>
         </member>

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

@@ -1464,6 +1464,15 @@
         <member name="P:Performance.DtoModels.ReportRequest.Month">
             <summary> 月 </summary>
         </member>
+        <member name="P:Performance.DtoModels.SecondAuditRequest.SecondId">
+            <summary> 二次绩效Id </summary>
+        </member>
+        <member name="P:Performance.DtoModels.SecondAuditRequest.IsPass">
+            <summary> 审核结果 1、审核通过 2、驳回 </summary>
+        </member>
+        <member name="P:Performance.DtoModels.SecondAuditRequest.Remark">
+            <summary> 备注 </summary>
+        </member>
         <member name="T:Performance.DtoModels.SetDepartmentRequest">
             <summary>
             登录请求

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

@@ -669,6 +669,11 @@
             审核人
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.ag_secondallot.Remark">
+            <summary>
+            备注
+            </summary>
+        </member>
         <member name="T:Performance.EntityModels.ag_temp">
             <summary>
             二次绩效模板

performance/Performance.DtoModels/Request/SecondAuditRequest.cs

+using FluentValidation;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Performance.DtoModels
+{
+    public class SecondAuditRequest
+    {
+        /// <summary> 二次绩效Id </summary>
+        public int SecondId { get; set; }
+
+        /// <summary> 审核结果 1、审核通过 2、驳回 </summary>
+        public int IsPass { get; set; }
+
+        /// <summary> 备注 </summary>
+        public string Remark { get; set; }
+    }
+    public class SecondAuditRequestValidator : AbstractValidator<SecondAuditRequest>
+    {
+        public SecondAuditRequestValidator()
+        {
+            RuleFor(x => x.SecondId).NotNull().NotEmpty().GreaterThan(0);
+            RuleFor(x => x.IsPass).NotNull().NotEmpty().InclusiveBetween(1, 2);
+            RuleFor(x => x.Remark).NotNull().NotEmpty();
+        }
+    }
+}

performance/Performance.EntityModels/Entity/ag_secondallot.cs

@@ -70,5 +70,10 @@ public class ag_secondallot
         /// 审核人
         /// </summary>
         public Nullable<int> AuditUser { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
     }
 }