Skip to content

P
performance
Commit bb84d139 by ruyun.zhang@suvalue.com
Options

代码调整

parent 065e9d51
Showing with 0 additions and 184 deletions
performance/Performance.Api/Controllers/ConfigController.cs
......@@ -148,41 +148,6 @@ public ApiResponse Delete([CustomizeValidator(RuleSet = "Delete"), FromBody]Inco
}
#endregion
#region position
[Route("positionlist")]
[HttpPost]
public ApiResponse<List<PositionResponse>> GetPositionList([FromBody]ApiRequest request)
{
var list = _configService.GetPositionList();
return new ApiResponse<List<PositionResponse>>(ResponseType.OK, "ok", list);
}
[Route("posinsert")]
[HttpPost]
public ApiResponse<PositionResponse> PositionInsert([FromBody]PositionRequest request)
{
var position = _configService.PositionInsert(request);
return new ApiResponse<PositionResponse>(ResponseType.OK, position);
}
[Route("posupdate")]
[HttpPost]
public ApiResponse<PositionResponse> PositionUpdate([CustomizeValidator(RuleSet = "Update"), FromBody]PositionRequest request)
{
var position = _configService.PositionUpdate(request);
return new ApiResponse<PositionResponse>(ResponseType.OK, position);
}
[Route("posdelete")]
[HttpPost]
public ApiResponse PositionDelete([CustomizeValidator(RuleSet = "Delete"), FromBody]PositionRequest request)
{
if (!_configService.PositionDelete(request))
return new ApiResponse(ResponseType.Fail);
return new ApiResponse(ResponseType.OK);
}
#endregion
#region workyear
[Route("workyearlist")]
[HttpPost]
......
performance/Performance.EntityModels/Context/PerformanceDbContext.cs
......@@ -32,7 +32,6 @@ public PerformanceDbContext(DbContextOptions<PerformanceDbContext> options)
public virtual DbSet<cof_director> Cof_Director { get; set; }
public virtual DbSet<res_baiscnorm> Res_Baiscnorm { get; set; }
public virtual DbSet<res_compute> Res_Compute { get; set; }
public virtual DbSet<cof_position> Cof_Position { get; set; }
public virtual DbSet<cof_workyear> Cof_Workyear { get; set; }
public virtual DbSet<im_specialunit> Im_SpecialUnit { get; set; }
public virtual DbSet<res_specialunit> Res_SpecialUnit { get; set; }
......
performance/Performance.EntityModels/Entity/cof_position.cs deleted 100644 → 0
//-----------------------------------------------------------------------
// <copyright file=" cof_position.cs">
// * FileName: cof_position.cs
// * history : 2019-03-25 11:33:14
// </copyright>
//-----------------------------------------------------------------------
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels
{
/// <summary>
/// cof_position Entity Model
/// </summary>
[Table("cof_position")]
public class cof_position
{
/// <summary>
///
/// </summary>
[Key]
public int ID { get; set; }
/// <summary>
///
/// </summary>
public Nullable<int> AllotID { get; set; }
/// <summary>
/// 职位名称
/// </summary>
public string JobTitle { get; set; }
/// <summary>
/// 职位归类 1 院领导 2 行政中层 3 行政工勤 4 临床科室主任 5 临床科室副主任 6 临床科室护士长
/// </summary>
public Nullable<int> JobType { get; set; }
/// <summary>
/// 额外补偿系数
/// </summary>
public Nullable<decimal> ExtraFactor { get; set; }
/// <summary>
/// 职位类别 1 普通类别 2 基础绩效来源
/// </summary>
public Nullable<int> State { get; set; }
}
}
performance/Performance.Repository/PerforCofpositionRepository.cs deleted 100644 → 0
//-----------------------------------------------------------------------
// <copyright file=" dic_position.cs">
// * FileName: dic_position.cs
// * history : Created by T4 2019-03-22 15:48:55
// </copyright>
//-----------------------------------------------------------------------
using System;
using Performance.EntityModels;
namespace Performance.Repository
{
/// <summary>
/// dic_position Repository
/// </summary>
public class PerforCofpositionRepository : PerforRepository<cof_position>
{
public PerforCofpositionRepository(PerformanceDbContext context) : base(context)
{
}
}
}
performance/Performance.Services/ConfigService.cs
......@@ -14,18 +14,15 @@ public class ConfigService : IAutoInjection
private PerforCofdirectorRepository _directorRepository;
private PerforCofdrugpropRepository _drugpropRepository;
private PerforCofincomeRepository _incomeRepository;
private PerforCofpositionRepository _positionRepository;
private PerforCofworkyearRepository _workyearRepository;
public ConfigService(PerforCofdirectorRepository cofdirectorRepository,
PerforCofdrugpropRepository cofdrugpropRepository,
PerforCofincomeRepository cofincomeRepository,
PerforCofpositionRepository cofpositionRepository,
PerforCofworkyearRepository cofworkyearRepository)
{
this._directorRepository = cofdirectorRepository;
this._drugpropRepository = cofdrugpropRepository;
this._incomeRepository = cofincomeRepository;
this._positionRepository = cofpositionRepository;
this._workyearRepository = cofworkyearRepository;
}
......@@ -206,66 +203,6 @@ public bool IncomeDelete(IncomeRequest request)
}
#endregion
#region cof_position
/// <summary>
/// 获取cof_position列表
/// </summary>
/// <returns></returns>
public List<PositionResponse> GetPositionList()
{
var list = _positionRepository.GetEntities();
return Mapper.Map<List<PositionResponse>>(list);
}
/// <summary>
/// 添加数据
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
public PositionResponse PositionInsert(PositionRequest request)
{
var position = Mapper.Map<cof_position>(request);
if (!_positionRepository.Add(position))
throw new PerformanceException("保存失败");
return Mapper.Map<PositionResponse>(position);
}
/// <summary>
/// 更新数据
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
public PositionResponse PositionUpdate(PositionRequest request)
{
var position = _positionRepository.GetEntity(t => t.ID == request.ID);
if (null == position)
throw new PerformanceException($"ID不存在 ：{request.ID}");
position.JobTitle = request.JobTitle;
position.JobType = request.JobType;
position.ExtraFactor = request.ExtraFactor;
position.State = request.State;
if (!_positionRepository.Update(position))
throw new PerformanceException("保存失败");
return Mapper.Map<PositionResponse>(position);
}
/// <summary>
/// 删除数据
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
public bool PositionDelete(PositionRequest request)
{
var position = _positionRepository.GetEntity(t => t.ID == request.ID);
if (null == position)
throw new PerformanceException($"ID不存在 ：{request.ID}");
return _positionRepository.Remove(position);
}
#endregion
#region cof_workyear
/// <summary>
/// 获取cof_drugprop列表
......
performance/Performance.Services/PerExcelService/PerExcelService.cs
......@@ -24,7 +24,6 @@ public class PerExcelService : IAutoInjection
private PerforImEmployeeRepository _perforImEmployeeRepository;
private PerforImaccountbasicRepository _perforImaccountbasicRepository;
private PerforResAccountnurseRepository _perforResAccountnurseRepository;
private PerforCofpositionRepository _perforCofpositionRepository;
private PerforCofdirectorRepository _perforCofdirectorRepository;
private PerforCofdrugpropRepository _perforCofdrugpropRepository;
private PerforCofincomeRepository _perforCofincomeRepository;
......@@ -43,7 +42,6 @@ public class PerExcelService : IAutoInjection
PerforImEmployeeRepository perforImEmployeeRepository,
PerforImaccountbasicRepository perforImaccountbasicRepository,
PerforResAccountnurseRepository perforResAccountnurseRepository,
PerforCofpositionRepository perforCofpositionRepository,
PerforCofdirectorRepository perforCofdirectorRepository,
PerforCofdrugpropRepository perforCofdrugpropRepository,
PerforCofincomeRepository perforCofincomeRepository,
......@@ -63,7 +61,6 @@ public class PerExcelService : IAutoInjection
_perforImEmployeeRepository = perforImEmployeeRepository;
_perforImaccountbasicRepository = perforImaccountbasicRepository;
_perforResAccountnurseRepository = perforResAccountnurseRepository;
_perforCofpositionRepository = perforCofpositionRepository;
_perforResAccountdoctorRepository = perforResAccountdoctorRepository;
_perforCofdirectorRepository = perforCofdirectorRepository;
_perforCofdrugpropRepository = perforCofdrugpropRepository;
......@@ -174,9 +171,6 @@ public void Clear(int allotId)
var income = _perforCofincomeRepository.GetEntities(t => t.AllotID == allotId);
if (income != null)
_perforCofincomeRepository.RemoveRange(income.ToArray());
var position = _perforCofpositionRepository.GetEntities(t => t.AllotID == allotId);
if (position != null)
_perforCofpositionRepository.RemoveRange(position.ToArray());
var workyear = _perforCofworkyearRepository.GetEntities(t => t.AllotID == allotId);
if (workyear != null)
_perforCofworkyearRepository.RemoveRange(workyear.ToArray());
......@@ -249,12 +243,6 @@ public void Copy(per_allot allot)
var addData = income.Select(t => new cof_income { AllotID = allot.ID, SheetNameKeyword = t.SheetNameKeyword, UnitName = t.UnitName, Value = t.Value });
_perforCofincomeRepository.AddRange(addData.ToArray());
}
var position = _perforCofpositionRepository.GetEntities(t => t.AllotID == allotId);
if (position != null)
{
var addData = position.Select(t => new cof_position { AllotID = allot.ID, JobTitle = t.JobTitle, ExtraFactor = t.ExtraFactor, JobType = t.JobType, State = t.State });
_perforCofpositionRepository.AddRange(addData.ToArray());
}
var workyear = _perforCofworkyearRepository.GetEntities(t => t.AllotID == allotId);
if (workyear != null)
{
......@@ -467,8 +455,6 @@ public void Compute(per_allot allot, PerExcel excel, res_baiscnorm baiscnorm)
var sheetList = _perforImSheetRepository.GetEntities(t => t.AllotID == allot.ID);
//取出人员信息
var empolyeeList = _perforImEmployeeRepository.GetEntities(t => t.AllotID == allot.ID);
//人员身份字典
var positionList = _perforCofpositionRepository.GetEntities();
//年资系数
var workyearList = _perforCofworkyearRepository.GetEntities();
//规模绩效和效率绩效配置表
......
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