考核管理优化

performance/Performance.Api/Controllers/AssessNewController.cs

@@ -38,9 +38,6 @@ public AssessNewController(AssessNewService service, ClaimService claim)
         /// 考核类别列表
         /// </summary>
         /// <param name="allotId"></param>
-        /// <remarks>
-        /// 接口很简单，只是展示了考核分类数据(per_assess_category)
-        /// </remarks>
         /// <returns></returns>
         [HttpPost]
         [Route("category/list")]
@@ -52,13 +49,10 @@ public ApiResponse<List<per_assess_category>> CategoryList([FromQuery] int allot
         /// 考核类别新增
         /// </summary>
         /// <param name="request"></param>
-        /// <remarks>
-        /// 编码自动生成，不能修改
-        /// </remarks>
         /// <returns></returns>
         [HttpPost]
         [Route("category/add")]
-        public ApiResponse<AddAssessCategoryRequest> CategoryAdd([FromBody] AddAssessCategoryRequest request)
+        public ApiResponse CategoryAdd([FromBody] AddAssessCategoryRequest request)
         {
             var userid = claim.GetUserId();
             return _service.CategoryAdd(request, userid);
@@ -67,13 +61,10 @@ public ApiResponse<AddAssessCategoryRequest> CategoryAdd([FromBody] AddAssessCat
         /// 考核类别修改
         /// </summary>
         /// <param name="request"></param>
-        /// <remarks>
-        /// 编码不能修改
-        /// </remarks>
         /// <returns></returns>
         [HttpPost]
         [Route("category/update")]
-        public ApiResponse<UpdateAssessCategoryRequest> CategoryUpdate([FromBody] UpdateAssessCategoryRequest request)
+        public ApiResponse CategoryUpdate([FromBody] UpdateAssessCategoryRequest request)
         {
             var userid = claim.GetUserId();
             return _service.CategoryUpdate(request, userid);
@@ -82,9 +73,6 @@ public ApiResponse<UpdateAssessCategoryRequest> CategoryUpdate([FromBody] Update
         /// 考核类别删除
         /// </summary>
         /// <param name="request"></param>
-        /// <remarks>
-        /// 允许批量删除，删除时要检查有没有外表引用，提示一起删除
-        /// </remarks>
         /// <returns></returns>
         [HttpPost]
         [Route("category/delete")]
@@ -97,29 +85,21 @@ public ApiResponse CategoryDelete([FromBody] BatchAssessCategoryRequest request)
         /// 考核下发（检查下发受影响的上报内容）
         /// </summary>
         /// <param name="request"></param>
-        /// <remarks>
-        /// 类似考勤下发，需要检查受影响的内容返回展示
-        /// </remarks>
         /// <returns></returns>
         [HttpPost]
         [Route("category/issue/check")]
-        public ApiResponse<List<PerAssessmentStatisticsResponse>> CategoryIssueCheck([FromBody] BatchAssessCategoryRequest request)
+        public ApiResponse<List<PerAssessmentStatisticsResponse>> CategoryIssueCheck([FromBody] UpdateAssessCategoryRequest request)
         {
             return _service.CategoryIssueCheck(request);
         }
         /// <summary>
         /// 考核下发（把当前考核类别下所有方案下发）
         /// </summary>
-        /// <remarks>
-        /// 下发分两类数据：
-        ///     责任科室总清单：考核分类/考核方案/考核指标 三种分类汇总集成到表中
-        ///     责任科室总清单明细：责任科室总清单 和 被考核核算单元 需要组合到一起存到明细表中
-        /// </remarks>
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost]
         [Route("category/issue/confirm")]
-        public ApiResponse CategoryIssueConfirm([FromBody] BatchAssessCategoryRequest request)
+        public ApiResponse CategoryIssueConfirm([FromBody] UpdateAssessCategoryRequest request)
         {
             var userid = claim.GetUserId();
             return _service.CategoryIssueConfirm(request, userid);
@@ -149,7 +129,7 @@ public ApiResponse SchemeList([FromBody] QuerySchemeList query)
         /// <returns></returns>
         [HttpPost]
         [Route("scheme/add")]
-        public ApiResponse<AddAssessSchemeRequest> SchemeAdd([FromBody] AddAssessSchemeRequest request)
+        public ApiResponse SchemeAdd([FromBody] AddAssessSchemeRequest request)
         {
             var userid = claim.GetUserId();
             return _service.SchemeAdd(request, userid);
@@ -357,9 +337,10 @@ public ApiResponse SchemeItemsUpload([FromQuery] int schemeId, int allotId, [Fro
         /// <returns></returns>
         [HttpPost]
         [Route("scheme/items/target/list")]
-        public ApiResponse<List<AssessSchemeTargetResponse>> SchemeItemsTargetList([FromBody] QuerySchemeItemsTargetList query)
+        [ProducesResponseType(typeof(PagedList<AssessSchemeTargetResponse>), StatusCodes.Status200OK)]
+        public ApiResponse SchemeItemsTargetList([FromBody] QuerySchemeItemsTargetList query)
         {
-            return _service.SchemeItemsTargetList(query);
+            return new ApiResponse(ResponseType.OK, "", _service.SchemeItemsTargetList(query));
         }
 
         /// <summary>

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

@@ -312,9 +312,6 @@
             考核类别列表
             </summary>
             <param name="allotId"></param>
-            <remarks>
-            接口很简单，只是展示了考核分类数据(per_assess_category)
-            </remarks>
             <returns></returns>
         </member>
         <member name="M:Performance.Api.Controllers.AssessNewController.CategoryAdd(Performance.DtoModels.Request.AddAssessCategoryRequest)">
@@ -322,9 +319,6 @@
             考核类别新增
             </summary>
             <param name="request"></param>
-            <remarks>
-            编码自动生成，不能修改
-            </remarks>
             <returns></returns>
         </member>
         <member name="M:Performance.Api.Controllers.AssessNewController.CategoryUpdate(Performance.DtoModels.Request.UpdateAssessCategoryRequest)">
@@ -332,9 +326,6 @@
             考核类别修改
             </summary>
             <param name="request"></param>
-            <remarks>
-            编码不能修改
-            </remarks>
             <returns></returns>
         </member>
         <member name="M:Performance.Api.Controllers.AssessNewController.CategoryDelete(Performance.DtoModels.Request.BatchAssessCategoryRequest)">
@@ -342,30 +333,19 @@
             考核类别删除
             </summary>
             <param name="request"></param>
-            <remarks>
-            允许批量删除，删除时要检查有没有外表引用，提示一起删除
-            </remarks>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.AssessNewController.CategoryIssueCheck(Performance.DtoModels.Request.BatchAssessCategoryRequest)">
+        <member name="M:Performance.Api.Controllers.AssessNewController.CategoryIssueCheck(Performance.DtoModels.Request.UpdateAssessCategoryRequest)">
             <summary>
             考核下发（检查下发受影响的上报内容）
             </summary>
             <param name="request"></param>
-            <remarks>
-            类似考勤下发，需要检查受影响的内容返回展示
-            </remarks>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.AssessNewController.CategoryIssueConfirm(Performance.DtoModels.Request.BatchAssessCategoryRequest)">
+        <member name="M:Performance.Api.Controllers.AssessNewController.CategoryIssueConfirm(Performance.DtoModels.Request.UpdateAssessCategoryRequest)">
             <summary>
             考核下发（把当前考核类别下所有方案下发）
             </summary>
-            <remarks>
-            下发分两类数据：
-                责任科室总清单：考核分类/考核方案/考核指标 三种分类汇总集成到表中
-                责任科室总清单明细：责任科室总清单 和 被考核核算单元 需要组合到一起存到明细表中
-            </remarks>
             <param name="request"></param>
             <returns></returns>
         </member>

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

@@ -2120,6 +2120,11 @@
             操作类型   未提交 = 1,待审核 = 2,审核通过 = 3,驳回 = 4,
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.Request.EditSchemeEnterAudit.AuditRemark">
+            <summary>
+            审核或驳回原因
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.Request.EditAssessSchemeEnterRequest.Score">
             <summary>
             考核扣分
@@ -3204,6 +3209,21 @@
             状态
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.AssessSchemeEnterListResponse.SubmitTime">
+            <summary>
+            提交时间
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.AssessSchemeEnterListResponse.AuditBy">
+            <summary>
+            审核人
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.AssessSchemeEnterListResponse.AuditTime">
+            <summary>
+            审核时间
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.AssessSchemeEnterListResponse.Count">
             <summary>
             总下发数
@@ -3319,6 +3339,11 @@
             审核时间
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.AssessSchemeEnterDetaiListResponse.AuditRemark">
+            <summary>
+            审核或驳回原因
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.AssessSchemeItemsUploadResponse.ItemName1">
             <summary>
             一级指标名称

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

@@ -6800,6 +6800,11 @@
             审核时间
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.per_assess_issue_scheme.AuditRemark">
+            <summary>
+            审核或驳回原因
+            </summary>
+        </member>
         <member name="T:Performance.EntityModels.per_assess_scheme">
             <summary>
             考核方案

performance/Performance.DtoModels/Request/AssessCategoryRequest.cs

@@ -13,6 +13,7 @@ public class AddAssessCategoryRequest
     }
     public class UpdateAssessCategoryRequest : AddAssessCategoryRequest
     {
+        public int SchemeId { get; set; }
         public int CategoryId { get; set; }
     }
     public class BatchAssessCategoryRequest

performance/Performance.DtoModels/Request/AssessSchemeEnterRequest.cs

@@ -29,6 +29,10 @@ public class EditSchemeEnterAudit
         /// 操作类型   未提交 = 1,待审核 = 2,审核通过 = 3,驳回 = 4,
         /// </summary>
         public Assess.AssessState State { get; set; }
+        /// <summary>
+        /// 审核或驳回原因
+        /// </summary>
+        public string? AuditRemark { get; set; }
     }
 
 

performance/Performance.DtoModels/Request/AssessSchemeItemsRequest.cs

@@ -46,8 +46,13 @@ public class BatchAssessSchemeItemsRequest
     public class QuerySchemeItemsTargetList
     {
         public int AllotId { get; set; }
+        public int AssessId { get; set; }
         public int SchemeId { get; set; }
         public Assess.SchemeItemsTarget SchemeItemsTarget { get; set; }
+        public string UnitType { get; set; }
+        public string AccountingUnit { get; set; }
+        public int Page { get; set; } = 1;
+        public int PageSize { get; set; } = 20;
     }
 
     public class QuerySchemeItemsList

performance/Performance.DtoModels/Response/AssessSchemeDataResponse.cs

@@ -48,6 +48,7 @@ public class AssessSchemeDataResponse
 
     public class AssessSchemeTargetResponse
     {
+        public int SchemeId { get; set; }
         /// <summary>
         /// 目标Id
         /// </summary>
@@ -121,6 +122,19 @@ public class AssessSchemeEnterListResponse
         /// </summary>
         public int State { get; set; }
         /// <summary>
+        /// 提交时间
+        /// </summary>
+        public DateTime? SubmitTime { get; set; }
+        /// <summary>
+        /// 审核人
+        /// </summary>
+        public string? AuditBy { get; set; }
+        /// <summary>
+        /// 审核时间
+        /// </summary>
+        public DateTime? AuditTime { get; set; }
+
+        /// <summary>
         /// 总下发数
         /// </summary>
         public int Count { get; set; }
@@ -216,6 +230,10 @@ public class AssessSchemeEnterDetaiListResponse
         /// 审核时间
         /// </summary>
         public DateTime? AuditTime { get; set; }
+        /// <summary>
+        /// 审核或驳回原因
+        /// </summary>
+        public string? AuditRemark { get; set; }
     }
     //上传
     public class AssessSchemeItemsUploadResponse

performance/Performance.DtoModels/Response/PerAssessmentStatisticsResponse.cs

@@ -65,9 +65,6 @@ public PerAssessmentStatisticsResponse(per_assess_issue_scheme item)
 
         }
 
-
-
-
         /// <summary>
         /// 
         /// </summary>

performance/Performance.EntityModels/Entity/per_assess_issue_scheme.cs

@@ -141,5 +141,9 @@ public class per_assess_issue_scheme
         /// 审核时间
         /// </summary>
         public DateTime? AuditTime { get; set; }
+        /// <summary>
+        /// 审核或驳回原因
+        /// </summary>
+        public string? AuditRemark { get; set; }
     }
 }

performance/Performance.Repository/PerforPerAllotRepository.cs

@@ -343,15 +343,15 @@ public IEnumerable<view_attendance> GetAttendance(int allotId)
         /// <param name="categoryId"></param>
         /// <param name="allotId"></param>
         /// <returns></returns>
-        public IEnumerable<view_assess_issue> GetAssessIssue(int[] categoryId, int allotId)
+        public IEnumerable<view_assess_issue> GetAssessIssue(int allotId)
         {
             var connection = context.Database.GetDbConnection();
 
             if (connection.State != ConnectionState.Open) connection.Open();
             try
             {
-                string query = $@"SELECT * FROM view_assess_issue where AssessId in @categoryId and AllotId = @allotId";
-                return connection.Query<view_assess_issue>(query, new { categoryId, allotId }, commandTimeout: 60 * 60);
+                string query = $@"SELECT * FROM view_assess_issue where AllotId = @allotId";
+                return connection.Query<view_assess_issue>(query, new { allotId }, commandTimeout: 60 * 60);
             }
             catch (Exception)
             {