提交审核接口，科室详情数据展示 接口调整

performance/Performance.Api/Controllers/CollectController.cs

@@ -110,7 +110,6 @@ public ApiResponse SaveCollectData(int allotId, [FromBody] SaveCollectData reque
             if (allotId <= 0)
                 return new ApiResponse(ResponseType.ParameterError, "参数无效");
             collectService.SaveCollectData(allotId, request, claim.GetUserId());
-
             return new ApiResponse(ResponseType.OK);
         }
 
@@ -119,12 +118,11 @@ public ApiResponse SaveCollectData(int allotId, [FromBody] SaveCollectData reque
         /// </summary>
         [HttpPost]
         [Route("submitcollectdata/{allotId}")]
-        public ApiResponse SubmitCollectData(int allotId, [FromQuery] string sheetName)
+        public ApiResponse SubmitCollectData(int allotId, [FromBody] SaveCollectData request)
         {
             if (allotId <= 0)
                 return new ApiResponse(ResponseType.ParameterError, "参数无效");
-
-            collectService.SubmitCollectData(allotId, sheetName, claim.GetUserId());
+            collectService.SaveCollectData(allotId, request, claim.GetUserId(), 2);
             return new ApiResponse(ResponseType.OK);
         }
 
@@ -177,10 +175,10 @@ public ApiResponse DepartmentList(int allotId, [FromQuery] int userId)
         [Route("collectdataaudit")]
         public ApiResponse CollectDataAudit([FromBody] CollectAuditRequest request)
         {
-            if (request == null || request.AllotId <= 0 || request.UserId <= 0 || new int[] { 3, 4 }.Contains(request.Status))
+            if (request == null || request.AllotId <= 0 || request.UserId <= 0 || !new int[] { 3, 4 }.Contains(request.Status))
                 return new ApiResponse(ResponseType.ParameterError, "参数无效");
 
-            var result = collectService.CollectDataAudit(request.AllotId, request.Status, request.Status);
+            var result = collectService.CollectDataAudit(request.AllotId, request.UserId, request.Status);
             string remark = request.Status == 3 ? "审核通过" : "驳回成功";
             return result ? new ApiResponse(ResponseType.OK, remark) : new ApiResponse(ResponseType.Fail, "操作失败");
         }

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

@@ -417,6 +417,11 @@
             科室显示列表
             </summary>
         </member>
+        <member name="M:Performance.Api.Controllers.CollectController.CollectDataAudit(Performance.DtoModels.CollectAuditRequest)">
+            <summary>
+            提交数据审核
+            </summary>
+        </member>
         <member name="M:Performance.Api.Controllers.ComputeController.GetCompute(Performance.DtoModels.ComputerRequest)">
             <summary>
             获取绩效发放列表

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

@@ -1968,6 +1968,11 @@
             参数值
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.CollectAuditRequest.Status">
+            <summary>
+            3 审核通过 4 驳回
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.ComputerRequest.ComputeId">
             <summary>
             绩效数据id

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

@@ -2278,7 +2278,7 @@
         </member>
         <member name="P:Performance.EntityModels.collect_data.Status">
             <summary>
-            1 保存 2 提交 3 审核通过 4 驳回 5 部分审核
+            1 保存 2 提交（等待审核） 3 审核通过 4 驳回
             </summary>
         </member>
         <member name="P:Performance.EntityModels.collect_data.SavedUser">

performance/Performance.DtoModels/HandsonTable.cs

@@ -26,6 +26,8 @@ public class HandsonTable : HandsonTableBase
     {
         private IEnumerable<collect_permission> _permissions;
 
+        public bool ReadOnly { get; set; } = false;
+
         public HandsonTable(int sheetType, string[] cols, List<collect_permission> permissions)
             : base()
         {