Skip to content

P
performance
Commit 28bf32c3 by 钟博
Options

划拨申请，审核

parent 986568cb
Showing with 360 additions and 28 deletions
performance/Performance.Api/Controllers/AllotController.cs
......@@ -34,6 +34,7 @@ public class AllotController : Controller
private ILogger<AllotController> _logger;
private ClaimService _claim;
private LogManageService _logManageService;
private readonly CostTransferService costTransferService;
private IBackgroundTaskQueue _backgroundTaskQueue;
private IServiceScopeFactory _serviceScopeFactory;
......@@ -45,7 +46,8 @@ public class AllotController : Controller
IBackgroundTaskQueue backgroundTaskQueue,
IServiceScopeFactory serviceScopeFactory,
ClaimService claim,
LogManageService logManageService)
LogManageService logManageService,
CostTransferService costTransferService)
{
_allotService = allotService;
_resultComputeService = resultComputeService;
......@@ -53,6 +55,7 @@ public class AllotController : Controller
_evn = evn;
_claim = claim;
_logManageService = logManageService;
this.costTransferService = costTransferService;
_configService = configService;
_backgroundTaskQueue = backgroundTaskQueue;
_serviceScopeFactory = serviceScopeFactory;
......@@ -96,6 +99,8 @@ public ApiResponse Insert([FromBody] AllotRequest request)
var userId = _claim.GetUserId();
var result = _allotService.InsertAllot(request, userId);
_configService.Copy(result);
//带出上月划拨记录
costTransferService.IntoLastTiemData(request.HospitalId.Value, request.ID);
return new ApiResponse(ResponseType.OK, result);
}
......@@ -421,6 +426,8 @@ public ApiResponse Issued([FromBody] AllotRequest request)
_allotService.UpdateAllotStates(allot.ID, (int)AllotStates.GenerateSucceed, EnumHelper.GetDescription(AllotStates.GenerateSucceed));
// 科室下发
_resultComputeService.GenerateSecondAllot(allot);
//绩效划拨，下发驳回
costTransferService.RejectedApplicat(allot.ID);
return new ApiResponse(ResponseType.OK);
}
......
performance/Performance.Api/Controllers/CostTransferController.cs
using Microsoft.AspNetCore.Mvc;
using Performance.DtoModels;
using Performance.EntityModels;
using Performance.Services;
using System;
using System.Collections.Generic;
using System.Linq;
......@@ -7,11 +9,104 @@
namespace Performance.Api.Controllers
{
[Route("api/costtransfer")]
[Route("api/[controller]")]
public class CostTransferController : Controller
{
public ApiResponse SubmitApplications()
private readonly CostTransferService costTransferService;
private readonly ClaimService claim;
private readonly RoleService roleService;
private readonly UserService userService;
public CostTransferController(
CostTransferService costTransferService,
ClaimService claim,
RoleService roleService,
UserService userService)
{
this.costTransferService = costTransferService;
this.claim = claim;
this.roleService = roleService;
this.userService = userService;
}
/// <summary>
/// 申请划拨
/// </summary>
/// <returns></returns>
[Route("submit")]
[HttpPost]
public ApiResponse SubmitApplications([FromBody] CostTransferRequest request)
{
if (request.AllotId <= 0)
return new ApiResponse(ResponseType.ParameterError, "参数AllotId无效！");
var result = costTransferService.Applicat(request);
return new ApiResponse(ResponseType.OK, result);
}
/// <summary>
///
/// </summary>
/// <returns></returns>
[Route("common/{hospitalId}/allot/{allotId}")]
[HttpPost]
public ApiResponse Common(int hospitalId, int allotId)
{
if (hospitalId <= 0)
return new ApiResponse(ResponseType.ParameterError, "参数HospitalId无效！");
if (allotId <= 0)
return new ApiResponse(ResponseType.ParameterError, "参数AllotId无效！");
var userid = claim.GetUserId();
var user = userService.GetUser(userid);
var result = costTransferService.Common(allotId, hospitalId);
result.deparment = user.Department ?? "";
return new ApiResponse(ResponseType.OK, result);
}
/// <summary>
/// 审核列表
/// </summary>
/// <param name="allotId"></param>
/// <returns></returns>
[Route("auditlist/{allotId}")]
[HttpPost]
public ApiResponse AuditList(int allotId)
{
if (allotId <= 0)
return new ApiResponse(ResponseType.ParameterError, "参数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);
return new ApiResponse(ResponseType.OK, result);
}
/// <summary>
/// 划拨审核
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[Route("costtransferaudit")]
[HttpPost]
public ApiResponse Audit([FromBody] CostTransferUpdateRequest request)
{
if (request.AllotId <= 0)
return new ApiResponse(ResponseType.ParameterError, "参数AllotId无效！");
var userid = claim.GetUserId();
var user = userService.GetUser(userid);
var role = roleService.GetARole(user.UserID);
var roleArr = new[] { 1, 2, 5 };
if (roleArr.Contains(role.Type.Value))
costTransferService.CostTransferAudit(request, true);
else
costTransferService.CostTransferAudit(request, false);
return new ApiResponse(ResponseType.OK);
}
}
......
performance/Performance.Api/Properties/PublishProfiles/FolderProfile.pubxml
......@@ -10,7 +10,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<PublishProvider>FileSystem</PublishProvider>
<PublishUrl>bin\Release\netcoreapp2.2\publish\</PublishUrl>
<PublishUrl>D:\publish\jx.suvalue.com2</PublishUrl>
<WebPublishMethod>FileSystem</WebPublishMethod>
<SiteUrlToLaunchAfterPublish />
<TargetFramework>netcoreapp2.2</TargetFramework>
......
performance/Performance.Api/wwwroot/Performance.Api.xml
......@@ -697,6 +697,32 @@
</summary>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.CostTransferController.SubmitApplications(Performance.DtoModels.CostTransferRequest)">
<summary>
申请划拨
</summary>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.CostTransferController.Common(System.Int32,System.Int32)">
<summary>
</summary>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.CostTransferController.AuditList(System.Int32)">
<summary>
审核列表
</summary>
<param name="allotId"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.CostTransferController.Audit(Performance.DtoModels.CostTransferUpdateRequest)">
<summary>
划拨审核
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.EmployeeController.GetEmployeeList(Performance.DtoModels.EmployeeRequest)">
<summary>
获取人员列表
......
performance/Performance.Api/wwwroot/Performance.DtoModels.xml
......@@ -158,11 +158,14 @@
<summary> 归档 </summary>
</member>
<member name="F:Performance.DtoModels.AllotStates.Wait">
<summary> 归档 </summary>
<summary> 等待 </summary>
</member>
<member name="F:Performance.DtoModels.AllotStates.GenerateAccomplish">
<summary> 绩效结果解析成功 </summary>
</member>
<member name="F:Performance.DtoModels.AllotStates.Issue">
<summary> 下发 </summary>
</member>
<member name="F:Performance.DtoModels.AgWorkloadType.SingleAwards">
<summary>
单项奖励
......
performance/Performance.Api/wwwroot/Performance.EntityModels.xml
......@@ -1181,7 +1181,7 @@
</member>
<member name="P:Performance.EntityModels.ag_secondallot.SubmitType">
<summary>
提交类型 1 使用模板 2 其他类型数据
提交类型 1使用模板 2 其他类型数据
</summary>
</member>
<member name="P:Performance.EntityModels.ag_secondallot.SubmitTime">
......@@ -1381,7 +1381,7 @@
</member>
<member name="P:Performance.EntityModels.ag_workload.WorkTypeId">
<summary>
1、单项奖励 2、工作量占比 ..（自定义占比）
-1、单项奖励 0、工作量占比 ..（自定义占比）
</summary>
</member>
<member name="T:Performance.EntityModels.ag_workload_source">
......@@ -1431,12 +1431,12 @@
</member>
<member name="P:Performance.EntityModels.ag_workload_source.WorkTypeId">
<summary>
1、单项奖励 2、工作量占比 ..（自定义占比）
-1、单项奖励 0、工作量占比 ..（自定义占比）
</summary>
</member>
<member name="T:Performance.EntityModels.ag_workload_type">
<summary>
二次绩效工作量绩效分类
</summary>
</member>
<member name="P:Performance.EntityModels.ag_workload_type.Id">
......@@ -1689,6 +1689,41 @@
参数值
</summary>
</member>
<member name="T:Performance.EntityModels.cof_alias">
<summary>
别名配置
</summary>
</member>
<member name="P:Performance.EntityModels.cof_alias.Id">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.cof_alias.Route">
<summary>
前端路由地址
</summary>
</member>
<member name="P:Performance.EntityModels.cof_alias.Name">
<summary>
描述名称
</summary>
</member>
<member name="P:Performance.EntityModels.cof_alias.OriginalName">
<summary>
原始名
</summary>
</member>
<member name="P:Performance.EntityModels.cof_alias.Alias">
<summary>
别名
</summary>
</member>
<member name="P:Performance.EntityModels.cof_alias.States">
<summary>
状态 1 可用 0 禁用
</summary>
</member>
<member name="T:Performance.EntityModels.cof_check">
<summary>
上传excel文件校验配置
......@@ -2194,6 +2229,111 @@
是否附带上次绩效 0 附带 1 不附带
</summary>
</member>
<member name="T:Performance.EntityModels.cost_transfer">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.cost_transfer.Id">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.cost_transfer.AllotId">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.cost_transfer.ApplicantUnitType">
<summary>
申请者核算单元类型
</summary>
</member>
<member name="P:Performance.EntityModels.cost_transfer.ApplicantDepartment">
<summary>
申请者科室
</summary>
</member>
<member name="P:Performance.EntityModels.cost_transfer.AdoptedUnitType">
<summary>
审核者核算单元类型
</summary>
</member>
<member name="P:Performance.EntityModels.cost_transfer.AdoptedDepartment">
<summary>
审核者科室
</summary>
</member>
<member name="P:Performance.EntityModels.cost_transfer.Status">
<summary>
0 未审核 1 部分审核 2 全部审核 3 未含有划拨明细
</summary>
</member>
<member name="T:Performance.EntityModels.cost_transfer_item">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.cost_transfer_item.Id">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.cost_transfer_item.TransferId">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.cost_transfer_item.Source">
<summary>
来源，sheet名称
</summary>
</member>
<member name="P:Performance.EntityModels.cost_transfer_item.Category">
<summary>
费用类型
</summary>
</member>
<member name="P:Performance.EntityModels.cost_transfer_item.Amount">
<summary>
金额
</summary>
</member>
<member name="P:Performance.EntityModels.cost_transfer_item.Ratio">
<summary>
分割比例
</summary>
</member>
<member name="P:Performance.EntityModels.cost_transfer_item.CalculationAmount">
<summary>
实际金额
</summary>
</member>
<member name="P:Performance.EntityModels.cost_transfer_item.IsUseRatio">
<summary>
是否使用分割比例
</summary>
</member>
<member name="P:Performance.EntityModels.cost_transfer_item.Remark">
<summary>
备注
</summary>
</member>
<member name="P:Performance.EntityModels.cost_transfer_item.Status">
<summary>
0 默认 1 通过 2 驳回 3 下发驳回
</summary>
</member>
<member name="P:Performance.EntityModels.cost_transfer_item.AdminStatus">
<summary>
0 默认 1 通过 2 驳回 3 下发驳回
</summary>
</member>
<member name="P:Performance.EntityModels.cost_transfer_item.IsWrited">
<summary>
数据是否被写入
</summary>
</member>
<member name="T:Performance.EntityModels.cust_script">
<summary>
自定义导出
......@@ -4416,7 +4556,7 @@
</member>
<member name="T:Performance.EntityModels.per_apr_amount_hide">
<summary>
医院其他绩效
</summary>
</member>
<member name="P:Performance.EntityModels.per_apr_amount_hide.Id">
......@@ -4944,24 +5084,24 @@
医院Id
</summary>
</member>
<member name="P:Performance.EntityModels.per_dept_dic.CreateTime">
<member name="P:Performance.EntityModels.per_dept_dic.IsVerify">
<summary>
0 未通过验证 1 通过验证
</summary>
</member>
<member name="P:Performance.EntityModels.per_dept_dic.CreateUser">
<member name="P:Performance.EntityModels.per_dept_dic.VerifyMessage">
<summary>
验证失败描述
</summary>
</member>
<member name="P:Performance.EntityModels.per_dept_dic.IsVerify">
<member name="P:Performance.EntityModels.per_dept_dic.CreateTime">
<summary>
0 未通过验证 1 通过验证
</summary>
</member>
<member name="P:Performance.EntityModels.per_dept_dic.VerifyMessage">
<member name="P:Performance.EntityModels.per_dept_dic.CreateUser">
<summary>
验证失败描述
</summary>
</member>
<member name="T:Performance.EntityModels.per_employee">
......@@ -5026,7 +5166,7 @@
</member>
<member name="P:Performance.EntityModels.per_employee.UnitType">
<summary>
核算单元类别
人员类别
</summary>
</member>
<member name="P:Performance.EntityModels.per_employee.Attendance">
......@@ -5079,24 +5219,24 @@
备注
</summary>
</member>
<member name="P:Performance.EntityModels.per_employee.CreateTime">
<member name="P:Performance.EntityModels.per_employee.IsVerify">
<summary>
0 未通过验证 1 通过验证
</summary>
</member>
<member name="P:Performance.EntityModels.per_employee.CreateUser">
<member name="P:Performance.EntityModels.per_employee.VerifyMessage">
<summary>
验证失败描述
</summary>
</member>
<member name="P:Performance.EntityModels.per_employee.IsVerify">
<member name="P:Performance.EntityModels.per_employee.CreateTime">
<summary>
0 未通过验证 1 通过验证
</summary>
</member>
<member name="P:Performance.EntityModels.per_employee.VerifyMessage">
<member name="P:Performance.EntityModels.per_employee.CreateUser">
<summary>
验证失败描述
</summary>
</member>
<member name="T:Performance.EntityModels.per_first">
......
performance/Performance.DtoModels/Enum.cs
......@@ -74,12 +74,15 @@ public enum AllotStates
/// <summary> 归档 </summary>
[Description("归档")]
Archive = 8,
/// <summary> 归档 </summary>
/// <summary> 等待 </summary>
[Description("等待")]
Wait = 9,
/// <summary> 绩效结果解析成功 </summary>
[Description("数据验证通过")]
GenerateAccomplish = 10,
/// <summary> 下发 </summary>
[Description("下发")]
Issue = 11
}
public enum AgWorkloadType
......
performance/Performance.DtoModels/Request/CostTransferRequest.cs
......@@ -27,6 +27,10 @@ public class CostTransferUpdateRequest : CostTransferRequest
{
public int TransferId { get; set; }
public int[] TransferItemId { get; set; }
public int Status { get; set; }
public new List<cost_transfer_item> Items { get; set; }
}
}
performance/Performance.DtoModels/Response/CostTransferResponse.cs 0 → 100644
using Performance.EntityModels;
using System;
using System.Collections.Generic;
using System.Text;
namespace Performance.DtoModels
{
public class CostTransferResponse
{
public int Id { get; set; }
public string AdoptedDepartment { get; set; }
public string AdoptedUnitType { get; set; }
public string ApplicantDepartment { get; set; }
public string ApplicantUnitType { get; set; }
public string Source { get; set; }
public string Category { get; set; }
public Nullable<decimal> Amount { get; set; }
public Nullable<decimal> Ratio { get; set; }
public Nullable<decimal> CalculationAmount { get; set; }
public string Remark { get; set; }
public int Status { get; set; }
public int AdminStatus { get; set; }
//public List<TransferItemResponse> costTransferItem { get; set; }
}
public class CommonResponse
{
public string deparment { get; set; }
public string unitType { get; set; }
public IEnumerable<TitleValue> drugType { get; set; }
public IEnumerable<TitleValue> sheets { get; set; }
//public List<cof_accounting> accounting { get; set; }
public IEnumerable<TitleValue> dept { get; set; }
}
}
performance/Performance.EntityModels/Context/PerformanceDbContext.cs
......@@ -92,6 +92,10 @@ public PerformanceDbContext(DbContextOptions<PerformanceDbContext> options)
public virtual DbSet<collect_data> collect_data { get; set; }
/// <summary> </summary>
public virtual DbSet<collect_permission> collect_permission { get; set; }
public virtual DbSet<cost_transfer> cost_transfer { get; set; }
public virtual DbSet<cost_transfer_item> cost_transfer_item { get; set; }
/// <summary> 自定义导出 </summary>
public virtual DbSet<cust_script> cust_script { get; set; }
/// <summary> </summary>
......
performance/Performance.EntityModels/Entity/cost_transfer_item.cs
......@@ -67,6 +67,10 @@ public class cost_transfer_item
public int Status { get; set; }
/// <summary>
/// 0 默认 1 通过 2 驳回 3 下发驳回
/// </summary>
public int AdminStatus { get; set; }
/// <summary>
/// 数据是否被写入
/// </summary>
public int IsWrited { get; set; }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment