Skip to content

P
performance
Commit 65dbd843 by ruyun.zhang@suvalue.com
Options

不公示其他绩效修改

parent f94808f2
Showing with 61 additions and 59 deletions
performance/Performance.Api/Controllers/EmployeeController.cs
......@@ -257,7 +257,7 @@ public ApiResponse Audit(int allotid)
#region 医院其他绩效
/// <summary>
/// 获取人员补充绩效列表
/// 获取医院其他绩效列表
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
......@@ -330,7 +330,7 @@ public ApiResponse GetAprDetail([FromBody] per_apr_amount request)
}
/// <summary>
/// 新增人员补充绩效
/// 新增医院其他绩效
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
......@@ -347,7 +347,7 @@ public ApiResponse InsertApr([FromBody] per_apr_amount request)
}
/// <summary>
/// 修改人员补充绩效
/// 修改医院其他绩效
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
......@@ -364,7 +364,7 @@ public ApiResponse UpdateApr([FromBody] per_apr_amount request)
}
/// <summary>
/// 删除人员补充绩效
/// 删除医院其他绩效
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
......@@ -394,7 +394,7 @@ public ApiResponse AuditResult([FromBody] AprAmountAuditRequest request)
}
/// <summary>
/// 上传人员绩效文件
/// 上传医院其他绩效文件
/// </summary>
/// <param name="form"></param>
/// <returns></returns>
......@@ -452,7 +452,7 @@ public ApiResponse<List<TitleValue>> GetPerforTypeDict([FromRoute] int allotId)
/// </summary>
/// <param name="allotId"></param>
/// <returns></returns>
[Route("/apr/overview/{allotId}")]
[Route("apr/overview/{allotId}")]
[HttpPost]
public ApiResponse AprOverview(int allotId)
{
......@@ -694,7 +694,7 @@ public ApiResponse<List<TitleValue>> GetPerforTypeDictHide([FromRoute] int allot
/// </summary>
/// <param name="allotId"></param>
/// <returns></returns>
[Route("/apr/hide/overview/{allotId}")]
[Route("apr/hide/overview/{allotId}")]
[HttpPost]
public ApiResponse AprHideOverview(int allotId)
{
......
performance/Performance.Api/wwwroot/Performance.Api.xml
......@@ -790,7 +790,7 @@
</member>
<member name="M:Performance.Api.Controllers.EmployeeController.GetAprList(Performance.DtoModels.AllotIdRequest)">
<summary>
获取人员补充绩效列表
获取医院其他绩效列表
</summary>
<param name="request"></param>
<returns></returns>
......@@ -811,21 +811,21 @@
</member>
<member name="M:Performance.Api.Controllers.EmployeeController.InsertApr(Performance.EntityModels.per_apr_amount)">
<summary>
新增人员补充绩效
新增医院其他绩效
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.EmployeeController.UpdateApr(Performance.EntityModels.per_apr_amount)">
<summary>
修改人员补充绩效
修改医院其他绩效
</summary>
<param name="request"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.EmployeeController.DeleteApr(Performance.DtoModels.IdRequest)">
<summary>
删除人员补充绩效
删除医院其他绩效
</summary>
<param name="request"></param>
<returns></returns>
......@@ -838,7 +838,7 @@
</member>
<member name="M:Performance.Api.Controllers.EmployeeController.Import(Microsoft.AspNetCore.Http.IFormCollection)">
<summary>
上传人员绩效文件
上传医院其他绩效文件
</summary>
<param name="form"></param>
<returns></returns>
......
performance/Performance.Repository/PerforPerapramountRepository.cs
......@@ -14,35 +14,36 @@ namespace Performance.Repository
/// per_apr_amount Repository
/// </summary>
public partial class PerforPerapramountRepository : PerforRepository<per_apr_amount>
{
{
public List<view_per_apr_amount> GetFullAmount(Func<per_apr_amount, bool> predicate)
{
var employees = this.context.Set<per_employee>().AsEnumerable();
var amounts = this.context.Set<per_apr_amount>().Where(predicate);
var res = amounts.Join(employees,
outer => new { outer.AllotId, outer.PersonnelNumber },
inner => new { AllotId = inner.AllotId ?? 0, inner.PersonnelNumber },
(outer, inner) => new view_per_apr_amount
{
Id = outer.Id,
AllotId = outer.AllotId,
PersonnelNumber = outer.PersonnelNumber,
DoctorName = outer.DoctorName,
PerforType = outer.PerforType,
Amount = outer.Amount,
AccountingUnit = inner.AccountingUnit,
UnitType = inner.UnitType,
TypeInDepartment = outer.TypeInDepartment,
Status = outer.Status,
AuditTime = outer.AuditTime,
AuditUser = outer.AuditUser,
CreateDate = outer.CreateDate,
CreateUser = outer.CreateUser,
Remark = outer.Remark,
IsVerify = outer.IsVerify,
VerifyMessage = outer.VerifyMessage,
});
var res = from outer in amounts
join inner in employees
on new { outer.AllotId, outer.PersonnelNumber } equals new { AllotId = inner.AllotId ?? 0, inner.PersonnelNumber } into temp
from tt in temp.DefaultIfEmpty()
select new view_per_apr_amount
{
Id = outer.Id,
AllotId = outer.AllotId,
PersonnelNumber = outer.PersonnelNumber,
DoctorName = outer.DoctorName,
PerforType = outer.PerforType,
Amount = outer.Amount,
AccountingUnit = tt?.AccountingUnit ?? "",
UnitType = tt?.UnitType ?? "",
TypeInDepartment = outer.TypeInDepartment,
Status = outer.Status,
AuditTime = outer.AuditTime,
AuditUser = outer.AuditUser,
CreateDate = outer.CreateDate,
CreateUser = outer.CreateUser,
Remark = outer.Remark,
IsVerify = outer.IsVerify,
VerifyMessage = outer.VerifyMessage,
};
return res.ToList() ?? new List<view_per_apr_amount>();
}
}
......
performance/Performance.Repository/PerforPerapramounthideRepository.cs
......@@ -20,29 +20,30 @@ public List<view_per_apr_amount> GetFullAmount(Func<per_apr_amount_hide, bool> p
var employees = this.context.Set<per_employee>().AsEnumerable();
var amounts = this.context.Set<per_apr_amount_hide>().Where(predicate);
var res = amounts.Join(employees,
outer => new { outer.AllotId, outer.PersonnelNumber },
inner => new { AllotId = inner.AllotId ?? 0, inner.PersonnelNumber },
(outer, inner) => new view_per_apr_amount
{
Id = outer.Id,
AllotId = outer.AllotId,
PersonnelNumber = outer.PersonnelNumber,
DoctorName = outer.DoctorName,
PerforType = outer.PerforType,
Amount = outer.Amount,
AccountingUnit = inner.AccountingUnit,
UnitType = inner.UnitType,
TypeInDepartment = outer.TypeInDepartment,
Status = outer.Status,
AuditTime = outer.AuditTime,
AuditUser = outer.AuditUser,
CreateDate = outer.CreateDate,
CreateUser = outer.CreateUser,
Remark = outer.Remark,
IsVerify = outer.IsVerify,
VerifyMessage = outer.VerifyMessage,
});
var res = from outer in amounts
join inner in employees
on new { outer.AllotId, outer.PersonnelNumber } equals new { AllotId = inner.AllotId ?? 0, inner.PersonnelNumber } into temp
from tt in temp.DefaultIfEmpty()
select new view_per_apr_amount
{
Id = outer.Id,
AllotId = outer.AllotId,
PersonnelNumber = outer.PersonnelNumber,
DoctorName = outer.DoctorName,
PerforType = outer.PerforType,
Amount = outer.Amount,
AccountingUnit = tt?.AccountingUnit ?? "",
UnitType = tt?.UnitType ?? "",
TypeInDepartment = outer.TypeInDepartment,
Status = outer.Status,
AuditTime = outer.AuditTime,
AuditUser = outer.AuditUser,
CreateDate = outer.CreateDate,
CreateUser = outer.CreateUser,
Remark = outer.Remark,
IsVerify = outer.IsVerify,
VerifyMessage = outer.VerifyMessage,
};
return res.ToList() ?? new List<view_per_apr_amount>();
}
}
......
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