绩效划拨审核、状态，列表问题修改

performance/Performance.Api/Controllers/CostTransferController.cs

@@ -63,7 +63,6 @@ public ApiResponse Common(int hospitalId, int allotId)
 
             var result = costTransferService.Common(allotId, hospitalId,role.Type.Value, user.Department);
 
-            
             result.deparment = user.Department ?? "";
             return new ApiResponse(ResponseType.OK, result);
         }
@@ -72,10 +71,11 @@ public ApiResponse Common(int hospitalId, int allotId)
         /// 审核列表
         /// </summary>
         /// <param name="allotId"></param>
+        /// <param name="menuType"></param>
         /// <returns></returns>
-        [Route("auditlist/{allotId}")]
+        [Route("auditlist/{allotId}/menuType/{menuType}")]
         [HttpPost]
-        public ApiResponse AuditList(int allotId)
+        public ApiResponse AuditList(int allotId,int menuType)
         {
             if (allotId <= 0)
                 return new ApiResponse(ResponseType.ParameterError, "参数AllotId无效！");
@@ -83,7 +83,7 @@ public ApiResponse AuditList(int allotId)
             var userid = claim.GetUserId();
             var user = userService.GetUser(userid);
             var role = roleService.GetARole(user.UserID);
-            var result = costTransferService.GetAuditList(allotId, role.Type.Value, user.Department);
+            var result = costTransferService.GetAuditList(allotId,menuType, role.Type.Value, user.Department);
 
             return new ApiResponse(ResponseType.OK, result);
 
@@ -96,7 +96,7 @@ public ApiResponse AuditList(int allotId)
         /// <returns></returns>
         [Route("costtransferaudit")]
         [HttpPost]
-        public ApiResponse Audit([FromBody] CostTransferUpdateRequest request)
+        public ApiResponse Audit([FromBody] AuditRequest request)
         {
             if (request.AllotId <= 0)
                 return new ApiResponse(ResponseType.ParameterError, "参数AllotId无效！");

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

@@ -709,14 +709,15 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.CostTransferController.AuditList(System.Int32)">
+        <member name="M:Performance.Api.Controllers.CostTransferController.AuditList(System.Int32,System.Int32)">
             <summary>
             审核列表
             </summary>
             <param name="allotId"></param>
+            <param name="menuType"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.CostTransferController.Audit(Performance.DtoModels.CostTransferUpdateRequest)">
+        <member name="M:Performance.Api.Controllers.CostTransferController.Audit(Performance.DtoModels.AuditRequest)">
             <summary>
             划拨审核
             </summary>

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

@@ -2980,7 +2980,7 @@
         </member>
         <member name="P:Performance.DtoModels.CostTransferResponse.Status">
             <summary>
-            0 未审核 1 部分审核 2 全部审核 3 未含有划拨明细
+            0 未审核 1 部分审核 2 全部审核 
             </summary>
         </member>
         <member name="P:Performance.DtoModels.DeptDataDetails`1.Pandect">

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

@@ -2266,7 +2266,12 @@
         </member>
         <member name="P:Performance.EntityModels.cost_transfer.Status">
             <summary>
-            0 未审核 1 部分审核 2 全部审核 3 未含有划拨明细
+            0 未审核 1 全部通过 2 部分通过 3 全部驳回 
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.cost_transfer.AdminStatus">
+            <summary>
+            0 未审核 1 全部通过 2 部分通过 3 全部驳回 
             </summary>
         </member>
         <member name="T:Performance.EntityModels.cost_transfer_item">

performance/Performance.DtoModels/Request/CostTransferRequest.cs

@@ -27,10 +27,18 @@ public class CostTransferUpdateRequest : CostTransferRequest
     {
         public int TransferId { get; set; }
 
+        
+
+        public new List<cost_transfer_item> Items { get; set; }
+    }
+
+    public class AuditRequest
+    {
+        public int AllotId { get; set; }
         public int[] TransferItemId { get; set; }
 
         public int Status { get; set; }
 
-        public new List<cost_transfer_item> Items { get; set; }
+        public string Remake { get; set; }
     }
 }

performance/Performance.DtoModels/Response/CostTransferResponse.cs

@@ -63,7 +63,9 @@ public class Common
 
     public class Option : cost_transfer_item
     {
-        public string[] options { get; set; }   
+        public string[] options { get; set; }
+        public string ApplicantDepartment { get; set; }
+        public string AdoptedDepartment { get; set; }
     }
 
 }

performance/Performance.EntityModels/Entity/cost_transfer.cs

@@ -46,10 +46,13 @@ public class cost_transfer
         public string AdoptedDepartment { get; set; }
 
         /// <summary>
-        /// 0 未审核 1 部分审核 2 全部审核 
+        /// 0 未审核 1 全部通过 2 部分通过 3 全部驳回 4 含有下发驳回
         /// </summary>
         public int Status { get; set; }
 
+        /// <summary>
+        /// 0 未审核 1 全部通过 2 部分通过 3 全部驳回 4 含有下发驳回
+        /// </summary>
         public int AdminStatus { get; set; }
     }
 }

performance/Performance.Services/ExtractExcelService/SheetDataWrite/CostTransferDataWrite.cs

@@ -9,7 +9,7 @@
 
 namespace Performance.Services.ExtractExcelService.SheetDataWrite
 {
-    public class CostTransferDataWrite
+    public class CostTransferDataWrite:IAutoInjection
     {
         private readonly ILogger logger;
         private readonly PerforCosttransferRepository costtransferRepository;
@@ -75,7 +75,7 @@ public void WriteSheetData(ISheet sheet, PerSheetPoint point, ExcelStyle style,
                 var column = header.GetCell(i)?.GetDecodeEscapes().Replace("(", "（").Replace(")", "）");
                 if (!string.IsNullOrEmpty(column) && fixedColumns.Any(t => t == column))
                 {
-                    if (pairs.ContainsKey(column))
+                    if (!pairs.ContainsKey(column))
                         pairs.Add(column, i);
 
                     fixedColumns.Remove(column);
@@ -90,7 +90,8 @@ public void WriteSheetData(ISheet sheet, PerSheetPoint point, ExcelStyle style,
                     var cell = header.CreateCell(index);
                     cell.SetCellValue(column);
 
-                    if (pairs.ContainsKey(column)) pairs.Add(column, index);
+                    if (!pairs.ContainsKey(column)) 
+                        pairs.Add(column, index);
 
                     index++;
                 }