Skip to content

P
performance
Commit 0e8dd71e by ryun
Options

Merge branch 'feature/其他绩效类别' into develop

parents d84c2e13 9ab1441b
Showing with 383 additions and 1 deletions
performance/Performance.Api/Controllers/EmployeeController.cs
...@@ -5,8 +5,10 @@ ...@@ -5,8 +5,10 @@
using Microsoft.AspNetCore.StaticFiles; using Microsoft.AspNetCore.StaticFiles;
using Newtonsoft.Json; using Newtonsoft.Json;
using Performance.DtoModels; using Performance.DtoModels;
using Performance.DtoModels.Request;
using Performance.DtoModels.Response; using Performance.DtoModels.Response;
using Performance.EntityModels; using Performance.EntityModels;
using Performance.EntityModels.Entity;
using Performance.Infrastructure; using Performance.Infrastructure;
using Performance.Services; using Performance.Services;
using Performance.Services.ExtractExcelService; using Performance.Services.ExtractExcelService;
...@@ -1167,5 +1169,116 @@ public IActionResult DownloadGatherFile(string path) ...@@ -1167,5 +1169,116 @@ public IActionResult DownloadGatherFile(string path)
return File(memoryStream, memi, Path.GetFileName(fileInfo.Name)); return File(memoryStream, memi, Path.GetFileName(fileInfo.Name));
} }
#endregion #endregion
#region 医院其他绩效类型
/// <summary>
/// 医院其他绩效类型清单
/// </summary>
/// <param name="allotId"></param>
/// <returns></returns>
[Route("apr/type/list/{allotId}")]
[HttpPost]
public ApiResponse<List<per_apr_amount_type>> GetAprTypeList([FromRoute] int allotId)
{
return employeeService.GetAprTypeList(allotId);
}
/// <summary>
/// 医院其他绩效列表清单添加
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[Route("apr/type/insert")]
[HttpPost]
public ApiResponse<AprTypeRequest> InsertAprType([FromBody] AprTypeRequest request)
{
var createUser = claim.GetUserId();
return employeeService.InsertAprType(createUser, request);
}
/// <summary>
/// 医院其他绩效列表清单修改
/// </summary>
/// <param name="typeId"></param>
/// <param name="request"></param>
/// <returns></returns>
[Route("apr/type/update")]
[HttpPost]
public ApiResponse<AprTypeRequest> UpdateAprType([FromQuery] int typeId, [FromBody] AprTypeRequest request)
{
return employeeService.UpdateAprType(typeId, request);
}
/// <summary>
/// 医院其他绩效列表清单删除
/// </summary>
/// <param name="typeId"></param>
/// <returns></returns>
[Route("apr/type/delete")]
[HttpPost]
public ApiResponse DeleteAprType([FromQuery] int typeId)
{
return employeeService.DeleteAprType(typeId);
}
#endregion
#region 不公示医院其他绩效类型
/// <summary>
/// 不公示医院其他绩效类型清单
/// </summary>
/// <param name="allotId"></param>
/// <returns></returns>
[Route("apr/hide/type/list/{allotId}")]
[HttpPost]
public ApiResponse<List<per_apr_amount_hide_type>> GetAprTypeListHide([FromRoute] int allotId)
{
return employeeService.GetAprTypeListHide(allotId);
}
/// <summary>
/// 不公示医院其他绩效列表清单添加
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[Route("apr/hide/type/insert")]
[HttpPost]
public ApiResponse<AprTypeRequest> InsertAprTypeHide([FromBody] AprTypeRequest request)
{
var createUser = claim.GetUserId();
return employeeService.InsertAprTypeHide(createUser, request);
}
/// <summary>
/// 不公示医院其他绩效列表清单修改
/// </summary>
/// <param name="typeId"></param>
/// <param name="request"></param>
/// <returns></returns>
[Route("apr/hide/type/update")]
[HttpPost]
public ApiResponse<AprTypeRequest> UpdateAprTypehide([FromQuery] int typeId, [FromBody] AprTypeRequest request)
{
return employeeService.UpdateAprTypeHide(typeId, request);
}
/// <summary>
/// 不公示医院其他绩效列表清单删除
/// </summary>
/// <param name="typeId"></param>
/// <returns></returns>
[Route("apr/hide/type/delete")]
[HttpPost]
public ApiResponse DeleteAprTypeHide([FromQuery] int typeId)
{
return employeeService.DeleteAprTypeHide(typeId);
}
#endregion
} }
} }
performance/Performance.Api/appsettings.Localhost.json
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
}, },
"AppConnection": { "AppConnection": {
//"PerformanceConnectionString": "server=112.124.13.17;database=db_performance;uid=suvalue;pwd=suvalue2016;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;", //"PerformanceConnectionString": "server=112.124.13.17;database=db_performance;uid=suvalue;pwd=suvalue2016;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;",
"PerformanceConnectionString": "server=192.168.18.166;database=db_test_dingxieryuan;uid=root;pwd=1234qwer;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;" "PerformanceConnectionString": "server=192.168.18.166;database=db_test_beiliu;uid=root;pwd=1234qwer;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;"
//"PerformanceConnectionString": "server=116.62.245.55;database=db_performance;uid=root;pwd=1234qwer;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;" //"PerformanceConnectionString": "server=116.62.245.55;database=db_performance;uid=root;pwd=1234qwer;pooling=true;charset=utf8;convert zero datetime=true;port=3306;connection timeout=120;max pool size=512;allow user variables=true;"
}, },
"Application": { "Application": {
......
performance/Performance.Api/wwwroot/Performance.Api.xml
...@@ -1459,6 +1459,64 @@ ...@@ -1459,6 +1459,64 @@
<param name="path"></param> <param name="path"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Performance.Api.Controllers.EmployeeController.GetAprTypeList(System.Int32)">
<summary>
医院其他绩效类型清单
</summary>
<param name="allotId"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.EmployeeController.InsertAprType(Performance.DtoModels.Request.AprTypeRequest)">
<summary>
医院其他绩效列表清单添加
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.EmployeeController.UpdateAprType(System.Int32,Performance.DtoModels.Request.AprTypeRequest)">
<summary>
医院其他绩效列表清单修改
</summary>
<param name="typeId"></param>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.EmployeeController.DeleteAprType(System.Int32)">
<summary>
医院其他绩效列表清单删除
</summary>
<param name="typeId"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.EmployeeController.GetAprTypeListHide(System.Int32)">
<summary>
不公示医院其他绩效类型清单
</summary>
<param name="allotId"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.EmployeeController.InsertAprTypeHide(Performance.DtoModels.Request.AprTypeRequest)">
<summary>
不公示医院其他绩效列表清单添加
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.EmployeeController.UpdateAprTypehide(System.Int32,Performance.DtoModels.Request.AprTypeRequest)">
<summary>
不公示医院其他绩效列表清单修改
</summary>
<param name="typeId"></param>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.EmployeeController.DeleteAprTypeHide(System.Int32)">
<summary>
不公示医院其他绩效列表清单删除
</summary>
<param name="typeId"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.ExConfigController.Extract(Performance.DtoModels.ModModuleRequest)"> <member name="M:Performance.Api.Controllers.ExConfigController.Extract(Performance.DtoModels.ModModuleRequest)">
<summary> <summary>
绩效数据抽取模板 绩效数据抽取模板
......
performance/Performance.Api/wwwroot/Performance.EntityModels.xml
...@@ -6048,6 +6048,76 @@ ...@@ -6048,6 +6048,76 @@
</summary> </summary>
</member> </member>
<member name="T:Performance.EntityModels.Entity.per_apr_amount_hide_type">
<summary>
不公示医院其他绩效类型
</summary>
</member>
<member name="P:Performance.EntityModels.Entity.per_apr_amount_hide_type.Id">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.Entity.per_apr_amount_hide_type.AllotId">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.Entity.per_apr_amount_hide_type.PerforType">
<summary>
费用类型
</summary>
</member>
<member name="P:Performance.EntityModels.Entity.per_apr_amount_hide_type.CreateDate">
<summary>
创建时间
</summary>
</member>
<member name="P:Performance.EntityModels.Entity.per_apr_amount_hide_type.CreateUser">
<summary>
创建人
</summary>
</member>
<member name="P:Performance.EntityModels.Entity.per_apr_amount_hide_type.UpdateTime">
<summary>
修改时间
</summary>
</member>
<member name="T:Performance.EntityModels.Entity.per_apr_amount_type">
<summary>
医院其他绩效类型
</summary>
</member>
<member name="P:Performance.EntityModels.Entity.per_apr_amount_type.Id">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.Entity.per_apr_amount_type.AllotId">
<summary>
</summary>
</member>
<member name="P:Performance.EntityModels.Entity.per_apr_amount_type.PerforType">
<summary>
费用类型
</summary>
</member>
<member name="P:Performance.EntityModels.Entity.per_apr_amount_type.CreateDate">
<summary>
创建时间
</summary>
</member>
<member name="P:Performance.EntityModels.Entity.per_apr_amount_type.CreateUser">
<summary>
创建人
</summary>
</member>
<member name="P:Performance.EntityModels.Entity.per_apr_amount_type.UpdateTime">
<summary>
修改时间
</summary>
</member>
<member name="P:Performance.EntityModels.Entity.per_attendance_type.IsDeduction"> <member name="P:Performance.EntityModels.Entity.per_attendance_type.IsDeduction">
<summary> <summary>
是否核减出勤 1 核减 2 不核减 是否核减出勤 1 核减 2 不核减
......
performance/Performance.DtoModels/Request/AprTypeRequest.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Performance.DtoModels.Request
{
public class AprTypeRequest
{
public int AllotId { get; set; }
public string PerforType { get; set; }
}
}
performance/Performance.EntityModels/Context/PerformanceDbContext.cs
...@@ -258,5 +258,8 @@ public PerformanceDbContext(DbContextOptions<PerformanceDbContext> options) ...@@ -258,5 +258,8 @@ public PerformanceDbContext(DbContextOptions<PerformanceDbContext> options)
public virtual DbSet<per_attendance_vacation> per_attendance_vacation { get; set; } public virtual DbSet<per_attendance_vacation> per_attendance_vacation { get; set; }
public virtual DbSet<per_allot_action> per_allot_action { get; set; } public virtual DbSet<per_allot_action> per_allot_action { get; set; }
public virtual DbSet<per_apr_amount_type> per_apr_amount_type { get; set; }
public virtual DbSet<per_apr_amount_hide_type> per_apr_amount_hide_type { get; set; }
} }
} }
performance/Performance.EntityModels/Entity/per_apr_amount_hide_type.cs 0 → 100644
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels.Entity
{
/// <summary>
/// 不公示医院其他绩效类型
/// </summary>
[Table("per_apr_amount_hide_type")]
public class per_apr_amount_hide_type
{
/// <summary>
///
/// </summary>
[Key]
public int Id { get; set; }
/// <summary>
///
/// </summary>
public int AllotId { get; set; }
/// <summary>
/// 费用类型
/// </summary>
public string PerforType { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime CreateDate { get; set; }
/// <summary>
/// 创建人
/// </summary>
public int CreateUser { get; set; }
/// <summary>
/// 修改时间
/// </summary>
public DateTime UpdateTime { get; set; }
}
}
performance/Performance.EntityModels/Entity/per_apr_amount_type.cs 0 → 100644
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels.Entity
{
/// <summary>
/// 医院其他绩效类型
/// </summary>
[Table("per_apr_amount_type")]
public class per_apr_amount_type
{
/// <summary>
///
/// </summary>
[Key]
public int Id { get; set; }
/// <summary>
///
/// </summary>
public int AllotId { get; set; }
/// <summary>
/// 费用类型
/// </summary>
public string PerforType { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime CreateDate { get; set; }
/// <summary>
/// 创建人
/// </summary>
public int CreateUser { get; set; }
/// <summary>
/// 修改时间
/// </summary>
public DateTime UpdateTime { get; set; }
}
}
performance/Performance.Repository/Repository/PerAprAmountTypeHideRepository.cs 0 → 100644
using Performance.EntityModels;
using Performance.EntityModels.Entity;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Performance.Repository.Repository
{
public partial class PerAprAmountTypeHideRepository : PerforRepository<per_apr_amount_hide_type>
{
/// <summary>
/// per_attendance_type Repository
/// </summary>
public PerAprAmountTypeHideRepository(PerformanceDbContext context) : base(context)
{
}
}
}
performance/Performance.Repository/Repository/PerAprAmountTypeRepository.cs 0 → 100644
using Performance.EntityModels;
using Performance.EntityModels.Entity;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Performance.Repository.Repository
{
public partial class PerAprAmountTypeRepository : PerforRepository<per_apr_amount_type>
{
/// <summary>
/// per_attendance_type Repository
/// </summary>
public PerAprAmountTypeRepository(PerformanceDbContext context) : base(context)
{
}
}
}
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