Skip to content

P
performance
Commit 937bdf51 by wyc
Options

医院其他绩效类型增删改查

parent 37f00eca
Showing with 222 additions and 13 deletions
performance/Performance.Api/Controllers/EmployeeController.cs
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
using Performance.DtoModels.Request; 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;
...@@ -1177,38 +1178,44 @@ public IActionResult DownloadGatherFile(string path) ...@@ -1177,38 +1178,44 @@ public IActionResult DownloadGatherFile(string path)
/// <returns></returns> /// <returns></returns>
[Route("apr/type/list/{allotId}")] [Route("apr/type/list/{allotId}")]
[HttpPost] [HttpPost]
public ApiResponse GetAprTypeList([FromRoute] int allotId) public ApiResponse<List<per_apr_amount_type>> GetAprTypeList([FromRoute] int allotId)
{ {
return new ApiResponse(ResponseType.OK);
return employeeService.GetAprTypeList(allotId);
} }
/// <summary> /// <summary>
/// 医院其他绩效列表清单 /// 医院其他绩效列表清单添加
/// </summary> /// </summary>
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[Route("apr/type/insert")] [Route("apr/type/insert")]
[HttpPost] [HttpPost]
public ApiResponse InsertAprType([FromBody] AprTypeRequest request) public ApiResponse<AprTypeRequest> InsertAprType([FromBody] AprTypeRequest request)
{ {
return new ApiResponse(ResponseType.OK); if (!string.IsNullOrEmpty(request.PerforType.Trim()))
{
request.CreateUser = claim.GetUserId();
return employeeService.InsertAprType(request);
}
else return new ApiResponse<AprTypeRequest>(ResponseType.Fail, "请填写类型");
} }
/// <summary> /// <summary>
/// 医院其他绩效列表清单 /// 医院其他绩效列表清单修改
/// </summary> /// </summary>
/// <param name="typeId"></param> /// <param name="typeId"></param>
/// <param name="request"></param> /// <param name="request"></param>
/// <returns></returns> /// <returns></returns>
[Route("apr/type/update")] [Route("apr/type/update")]
[HttpPost] [HttpPost]
public ApiResponse UpdateAprType([FromQuery] int typeId, [FromBody] AprTypeRequest request) public ApiResponse<AprTypeRequest> UpdateAprType([FromQuery] int typeId, [FromBody] AprTypeRequest request)
{ {
return new ApiResponse(ResponseType.OK); return employeeService.UpdateAprType(typeId, request);
} }
/// <summary> /// <summary>
/// 医院其他绩效列表清单 /// 医院其他绩效列表清单删除
/// </summary> /// </summary>
/// <param name="typeId"></param> /// <param name="typeId"></param>
/// <returns></returns> /// <returns></returns>
...@@ -1216,7 +1223,7 @@ public ApiResponse UpdateAprType([FromQuery] int typeId, [FromBody] AprTypeReque ...@@ -1216,7 +1223,7 @@ public ApiResponse UpdateAprType([FromQuery] int typeId, [FromBody] AprTypeReque
[HttpPost] [HttpPost]
public ApiResponse DeleteAprType([FromQuery] int typeId) public ApiResponse DeleteAprType([FromQuery] int typeId)
{ {
return new ApiResponse(ResponseType.OK); return employeeService.DeleteAprType(typeId);
} }
#endregion #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_performance_screen;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,35 @@ ...@@ -1459,6 +1459,35 @@
<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.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,41 @@ ...@@ -6048,6 +6048,41 @@
</summary> </summary>
</member> </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
...@@ -10,5 +10,7 @@ public class AprTypeRequest ...@@ -10,5 +10,7 @@ public class AprTypeRequest
{ {
public int AllotId { get; set; } public int AllotId { get; set; }
public string PerforType { get; set; } public string PerforType { get; set; }
public int CreateUser { get; set; }
} }
} }
performance/Performance.EntityModels/Context/PerformanceDbContext.cs
...@@ -257,6 +257,8 @@ public PerformanceDbContext(DbContextOptions<PerformanceDbContext> options) ...@@ -257,6 +257,8 @@ public PerformanceDbContext(DbContextOptions<PerformanceDbContext> options)
public virtual DbSet<per_attendance_type> per_attendance_type { get; set; } public virtual DbSet<per_attendance_type> per_attendance_type { get; set; }
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; }
} }
} }
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/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)
{
}
}
}
performance/Performance.Services/EmployeeService.cs
...@@ -5,10 +5,13 @@ ...@@ -5,10 +5,13 @@
using NPOI.SS.UserModel; using NPOI.SS.UserModel;
using NPOI.XSSF.UserModel; using NPOI.XSSF.UserModel;
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.Repository; using Performance.Repository;
using Performance.Repository.Repository;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
...@@ -48,6 +51,10 @@ public class EmployeeService : IAutoInjection ...@@ -48,6 +51,10 @@ public class EmployeeService : IAutoInjection
private readonly RoleService roleService; private readonly RoleService roleService;
private readonly UserService userService; private readonly UserService userService;
private readonly DownloadService downloadService; private readonly DownloadService downloadService;
private readonly PerAprAmountTypeRepository perAprAmountTypeRepository;
private readonly PerforPerapramountRepository perforPerapramountRepository;
public EmployeeService( public EmployeeService(
IMapper mapper, IMapper mapper,
...@@ -77,7 +84,9 @@ public class EmployeeService : IAutoInjection ...@@ -77,7 +84,9 @@ public class EmployeeService : IAutoInjection
ILogger<EmployeeService> logger, ILogger<EmployeeService> logger,
RoleService roleService, RoleService roleService,
UserService userService, UserService userService,
DownloadService downloadService) DownloadService downloadService,
PerAprAmountTypeRepository perAprAmountTypeRepository,
PerforPerapramountRepository perforPerapramountRepository)
{ {
_mapper = mapper; _mapper = mapper;
_service = service; _service = service;
...@@ -107,6 +116,8 @@ public class EmployeeService : IAutoInjection ...@@ -107,6 +116,8 @@ public class EmployeeService : IAutoInjection
this.roleService = roleService; this.roleService = roleService;
this.userService = userService; this.userService = userService;
this.downloadService = downloadService; this.downloadService = downloadService;
this.perAprAmountTypeRepository = perAprAmountTypeRepository;
this.perforPerapramountRepository = perforPerapramountRepository;
} }
#region 行政人员 #region 行政人员
...@@ -1060,6 +1071,67 @@ public List<OhterAmountAuditResponse> GetAprHideList(int allotId, int userId, in ...@@ -1060,6 +1071,67 @@ public List<OhterAmountAuditResponse> GetAprHideList(int allotId, int userId, in
return result.ToList(); return result.ToList();
} }
#region 医院其他绩效类型
public ApiResponse<List<per_apr_amount_type>> GetAprTypeList(int allotId)
{
var result = perAprAmountTypeRepository.GetEntities(t => t.AllotId == allotId).ToList();
if (result != null)
return new ApiResponse<List<per_apr_amount_type>>(ResponseType.OK, result);
else
{
return new ApiResponse<List<per_apr_amount_type>>(ResponseType.Fail);
}
}
public ApiResponse<AprTypeRequest> InsertAprType(AprTypeRequest request)
{
var tepm = perAprAmountTypeRepository.GetEntities().FirstOrDefault(t => t.AllotId == request.AllotId && t.PerforType == request.PerforType);
if (tepm != null)
return new ApiResponse<AprTypeRequest>(ResponseType.Fail, "已存在该类型");
per_apr_amount_type per_Apr_Amount_Type = new per_apr_amount_type()
{
AllotId = request.AllotId,
PerforType = request.PerforType.Trim(),
CreateDate = DateTime.Now,
CreateUser = request.CreateUser,
};
if (perAprAmountTypeRepository.Add(per_Apr_Amount_Type)) return new ApiResponse<AprTypeRequest>(ResponseType.OK, "添加成功");
else return new ApiResponse<AprTypeRequest>(ResponseType.Fail, "添加失败");
}
public ApiResponse<AprTypeRequest> UpdateAprType(int typeId, AprTypeRequest request)
{
var tepm = perAprAmountTypeRepository.GetEntities().FirstOrDefault(t => t.Id == typeId && t.PerforType == request.PerforType);
if (tepm != null)
{
tepm.UpdateTime = DateTime.Now;
tepm.AllotId = request.AllotId;
tepm.PerforType = request.PerforType.Trim();
if (perAprAmountTypeRepository.Update(tepm)) return new ApiResponse<AprTypeRequest>(ResponseType.OK, "修改成功");
else return new ApiResponse<AprTypeRequest>(ResponseType.Fail, "修改失败");
}
else return new ApiResponse<AprTypeRequest>(ResponseType.Fail, "未查询到内容或已存在该类型");
}
public ApiResponse DeleteAprType(int typeId)
{
var any = perAprAmountTypeRepository.GetEntity(t => t.Id == typeId);
if (any == null) return new ApiResponse(ResponseType.Fail, "没有该数据");
var use = perforPerapramountRepository.GetEntity(t => t.PerforType == any.PerforType);
if (use != null) return new ApiResponse(ResponseType.Fail, "该类型正在使用！");
if (any != null && use == null)
{
if (perAprAmountTypeRepository.DeleteFromQuery(t => t.Id == typeId) > 0) return new ApiResponse(ResponseType.OK, "删除成功");
else return new ApiResponse(ResponseType.Fail, "删除失败");
}
else return new ApiResponse(ResponseType.Fail, "删除失败");
}
#endregion
/// <summary> /// <summary>
/// 不公示其他绩效提交 /// 不公示其他绩效提交
/// </summary> /// </summary>
......
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