Merge branch 'feature/划拨' into release/v20210625二次绩效划拨合并

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,13 +61,29 @@ 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);
         }
 
         /// <summary>
+        /// 撤回提交
+        /// </summary>
+        /// <param name="itemId"></param>
+        /// <returns></returns>
+        [Route("withdrawsubmit/{itemId}")]
+        [HttpPost]
+        public ApiResponse WithdrawSubmit(int itemId)
+        {
+            if (itemId <= 0)
+                return new ApiResponse(ResponseType.ParameterError, "参数itemId无效!");
+
+            costTransferService.WithdrawSubmit(itemId);
+            return new ApiResponse(ResponseType.OK);
+        }
+
+        /// <summary>
         /// 审核列表
         /// </summary>
         /// <param name="allotId"></param>
@@ -75,7 +91,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 +99,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.Api/wwwroot/Performance.Api.xml

@@ -703,12 +703,19 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.CostTransferController.Common(System.Int32,System.Int32)">
+        <member name="M:Performance.Api.Controllers.CostTransferController.Common(System.Int32,System.Int32,Performance.DtoModels.DepartmentDetail)">
             <summary>
             
             </summary>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.CostTransferController.WithdrawSubmit(System.Int32)">
+            <summary>
+            撤回提交
+            </summary>
+            <param name="itemId"></param>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.CostTransferController.AuditList(System.Int32,System.Int32)">
             <summary>
             审核列表

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

@@ -2314,19 +2314,29 @@
             是否使用分割比例
             </summary>
         </member>
-        <member name="P:Performance.EntityModels.cost_transfer_item.Remark">
+        <member name="P:Performance.EntityModels.cost_transfer_item.ApplicationRemark">
             <summary>
-            备注
+            申请理由
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.cost_transfer_item.DepartmentRemark">
+            <summary>
+            科室备注
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.cost_transfer_item.AdminRemark">
+            <summary>
+            管理员备注
             </summary>
         </member>
         <member name="P:Performance.EntityModels.cost_transfer_item.Status">
             <summary>
-            0 默认 1 通过 2 驳回 3 下发驳回
+            0 默认 1 通过 2 驳回 3 下发驳回 4 撤回
             </summary>
         </member>
         <member name="P:Performance.EntityModels.cost_transfer_item.AdminStatus">
             <summary>
-            0 默认 1 通过 2 驳回 3 下发驳回
+            0 默认 1 通过 2 驳回 3 下发驳回 4 撤回
             </summary>
         </member>
         <member name="P:Performance.EntityModels.cost_transfer_item.IsWrited">

performance/Performance.DtoModels/Enum.cs

@@ -80,9 +80,6 @@ public enum AllotStates
         /// <summary> 绩效结果解析成功 </summary>
         [Description("数据验证通过")]
         GenerateAccomplish = 10,
-        /// <summary> 下发 </summary>
-        [Description("下发")]
-        Issue = 11
     }
 
     public enum AgWorkloadType

performance/Performance.DtoModels/Request/CostTransferItemRequest.cs

@@ -18,6 +18,6 @@ public class CostTransferItemRequest
 
         public int IsUseRatio { get; set; }
 
-        public string Remark { get; set; }
+        public string ApplicationRemark { get; set; }
     }
 }

performance/Performance.DtoModels/Response/CostTransferResponse.cs

@@ -41,6 +41,8 @@ public class CostTransferResponse
 
         public int AdminStatus { get; set; }
 
+        public decimal AmountSum { get; set; }
+
         public List<Option> Items { get; set; }
     }
 

performance/Performance.EntityModels/Entity/cost_transfer_item.cs

@@ -57,17 +57,27 @@ public class cost_transfer_item
         public int IsUseRatio { get; set; }
                 
         /// <summary>
-        /// 备注
+        /// 申请理由
         /// </summary>
-        public string Remark { get; set; }
+        public string ApplicationRemark { get; set; }
 
         /// <summary>
-        /// 0 默认 1 通过 2 驳回 3 下发驳回
+        /// 科室备注
+        /// </summary>
+        public string DepartmentRemark { get; set; }
+
+        /// <summary>
+        /// 管理员备注
+        /// </summary>
+        public string AdminRemark { get; set; }
+        
+        /// <summary>
+        /// 0 默认 1 通过 2 驳回 3 下发驳回 4 撤回
         /// </summary>
         public int Status { get; set; }
 
         /// <summary>
-        /// 0 默认 1 通过 2 驳回 3 下发驳回
+        /// 0 默认 1 通过 2 驳回 3 下发驳回 4 撤回
         /// </summary>
         public int AdminStatus { get; set; }
 

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

@@ -41,7 +41,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 departments = costTransfers.Select(t => t.AdoptedDepartment ?? "").Union(costTransfers.Select(t => t.ApplicantDepartment ?? "")).Distinct().ToList();