申请页面下拉选项修改，划拨数据写入修改

performance/Performance.Api/Controllers/CostTransferController.cs

@@ -50,7 +50,7 @@ public ApiResponse SubmitApplications([FromBody] CostTransferRequest request)
         /// <returns></returns>
         [Route("common/{hospitalId}/allot/{allotId}")]
         [HttpPost]
-        public ApiResponse Common(int hospitalId, int allotId)
+        public ApiResponse Common(int hospitalId, int allotId, [FromBody] DepartmentDetail detail)
         {
             if (hospitalId <= 0)
                 return new ApiResponse(ResponseType.ParameterError, "参数HospitalId无效！");
@@ -61,7 +61,7 @@ public ApiResponse Common(int hospitalId, int allotId)
             var user = userService.GetUser(userid);
             var role = roleService.GetARole(user.UserID);
 
-            var result = costTransferService.Common(allotId, hospitalId,role.Type.Value, user.Department);
+            var result = costTransferService.Common(allotId, hospitalId, role.Type.Value, user.Department, detail);
 
             result.deparment = user.Department ?? "";
             return new ApiResponse(ResponseType.OK, result);
@@ -75,7 +75,7 @@ public ApiResponse Common(int hospitalId, int allotId)
         /// <returns></returns>
         [Route("auditlist/{allotId}/menuType/{menuType}")]
         [HttpPost]
-        public ApiResponse AuditList(int allotId,int menuType)
+        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,int menuType)
             var userid = claim.GetUserId();
             var user = userService.GetUser(userid);
             var role = roleService.GetARole(user.UserID);
-            var result = costTransferService.GetAuditList(allotId,menuType, role.Type.Value, user.Department);
+            var result = costTransferService.GetAuditList(allotId, menuType, role.Type.Value, user.Department);
 
             return new ApiResponse(ResponseType.OK, result);
 

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

@@ -9,7 +9,7 @@
 
 namespace Performance.Services.ExtractExcelService.SheetDataWrite
 {
-    public class CostTransferDataWrite:IAutoInjection
+    public class CostTransferDataWrite : IAutoInjection
     {
         private readonly ILogger logger;
         private readonly PerforCosttransferRepository costtransferRepository;
@@ -38,7 +38,7 @@ public void WriteSheetData(ISheet sheet, PerSheetPoint point, ExcelStyle style,
                 var costTransfers = costtransferRepository.GetEntities(t => t.AllotId == allotId);
                 if (costTransfers == null || !costTransfers.Any()) return;
 
-                var costTransferItems = costtransferitemRepository.GetEntities(t => costTransfers.Select(c => c.Id).Contains(t.TransferId) && t.Status == 1 && t.AdminStatus == 1 && t.IsWrited == 0);
+                var costTransferItems = costtransferitemRepository.GetEntities(t => costTransfers.Select(c => c.Id).Contains(t.TransferId) && t.Status == 1 && t.AdminStatus == 1);
                 if (costTransferItems == null || !costTransferItems.Any()) return;
 
                 var columns = SupplySheetHeader(sheet, point);
@@ -90,7 +90,7 @@ public void WriteSheetData(ISheet sheet, PerSheetPoint point, ExcelStyle style,
                     var cell = header.CreateCell(index);
                     cell.SetCellValue(column);
 
-                    if (!pairs.ContainsKey(column)) 
+                    if (!pairs.ContainsKey(column))
                         pairs.Add(column, index);
 
                     index++;