Skip to content

P
performance
Commit 6193a529 by ruyun.zhang@suvalue.com
Options

科室考勤统计

parent 0dd00ae3
Showing with 140 additions and 18 deletions
performance/Performance.Api/Controllers/AttendanceController.cs
......@@ -34,8 +34,8 @@ AttendanceService attendanceService
public ApiResponse GetAttendance(int allotId)
{
// 查询考勤视图，并按照设计图做格式转换 仅查询开始结束
var result =_attendanceService.GetAttendance(allotId);
if (result != null )
var result = _attendanceService.GetAttendance(allotId);
if (result != null)
{
return new ApiResponse(ResponseType.OK, result);
}
......@@ -69,7 +69,7 @@ public ApiResponse GetCallIn(int allotId)
public ApiResponse GetBatchCallInHandsonTable()
{
// 返回HandsonTable格式调动记录
return new ApiResponse(ResponseType.OK,_attendanceService.GetBatchCallInHandsonTable());
return new ApiResponse(ResponseType.OK, _attendanceService.GetBatchCallInHandsonTable());
}
/// <summary>
......@@ -80,7 +80,7 @@ public ApiResponse GetBatchCallInHandsonTable()
/// <param name="request"></param>
/// <returns></returns>
[HttpPost("CallIn/Batch/{allotId}")]
public ApiResponse BatchCallIn(int allotId,int hospitalId,SaveCollectData request)
public ApiResponse BatchCallIn(int allotId, int hospitalId, SaveCollectData request)
{
// obj自己定义结构
// 批量插入调动记录，插入前需要删除所有后重新插入
......@@ -89,7 +89,7 @@ public ApiResponse BatchCallIn(int allotId,int hospitalId,SaveCollectData reques
// 需要验证核算组别和核算单元是否与“核算单元及组别”（cof_accounting）完全匹配，不匹配则返回表格错误提示
// 表格错误提醒参考PersonService.CreatePerson方法
return _attendanceService.BatchCallIn(allotId,hospitalId,request);
return _attendanceService.BatchCallIn(allotId, hospitalId, request);
}
#endregion
......@@ -103,7 +103,7 @@ public ApiResponse BatchCallIn(int allotId,int hospitalId,SaveCollectData reques
[HttpGet("Type/{allotId},{hospitalId}")]
public ApiResponse GetAttendanceType(int allotId, int hospitalId)
{
return new ApiResponse(ResponseType.OK,_attendanceService.GetAttendanceType(allotId,hospitalId));
return new ApiResponse(ResponseType.OK, _attendanceService.GetAttendanceType(allotId, hospitalId));
}
/// <summary>
/// 新增或修改考勤类型
......@@ -113,7 +113,7 @@ public ApiResponse GetAttendanceType(int allotId, int hospitalId)
/// <param name="attendanceType"></param>
/// <returns></returns>
[HttpPost("Type/Edit/{allotId},{hospitalId}")]
public ApiResponse InsertAttendanceType(int allotId,int hospitalId, AttendanceType attendanceType)
public ApiResponse InsertAttendanceType(int allotId, int hospitalId, AttendanceType attendanceType)
{
// obj自己定义结构
return _attendanceService.InsertAttendanceType(allotId, hospitalId, attendanceType);
......@@ -140,7 +140,7 @@ public ApiResponse DeleteAttendanceType(int id)
public ApiResponse GetAttendanceVacationHandsonTable()
{
// 返回HandsonTable格式考勤记录
return new ApiResponse(ResponseType.OK,_attendanceService.GetAttendanceVacationHandsonTable());
return new ApiResponse(ResponseType.OK, _attendanceService.GetAttendanceVacationHandsonTable());
}
/// <summary>
......@@ -150,9 +150,9 @@ public ApiResponse GetAttendanceVacationHandsonTable()
/// <param name="hospitalId"></param>
/// <returns></returns>
[HttpGet("Vacation/{allotId},{hospitalId}")]
public ApiResponse GetAttendanceVacation(int allotId,int hospitalId)
public ApiResponse GetAttendanceVacation(int allotId, int hospitalId)
{
return new ApiResponse(ResponseType.OK, _attendanceService.GetAttendanceVacation(allotId,hospitalId));
return new ApiResponse(ResponseType.OK, _attendanceService.GetAttendanceVacation(allotId, hospitalId));
}
/// <summary>
......@@ -163,7 +163,7 @@ public ApiResponse GetAttendanceVacation(int allotId,int hospitalId)
/// <param name="request"></param>
/// <returns></returns>
[HttpPost("Vacation/Batch/{allotId}")]
public ApiResponse AttendanceBatch(int allotId,int hospitalId, SaveCollectData request)
public ApiResponse AttendanceBatch(int allotId, int hospitalId, SaveCollectData request)
{
// obj自己定义结构
// 批量插入考勤记录，插入前需要删除所有后重新插入
......@@ -171,21 +171,20 @@ public ApiResponse AttendanceBatch(int allotId,int hospitalId, SaveCollectData r
// 需要验证工号和姓名是否与“人员字典”（per_employee）完全匹配，不匹配则返回表格错误提示
// 表格错误提醒参考PersonService.CreatePerson方法
return new ApiResponse(ResponseType.OK,_attendanceService.AttendanceBatch(allotId,hospitalId,request));
return new ApiResponse(ResponseType.OK, _attendanceService.AttendanceBatch(allotId, hospitalId, request));
}
#endregion
/// <summary>
/// 考勤结果统计
/// </summary>
/// <param name="allotId"></param>
/// <param name="hospitalId"></param>
/// <param name="allotId"></param>
/// <returns></returns>
[HttpGet("statistics/{allotId}")]
public ApiResponse GetAttendanceStatistics(int allotId,int hospitalId)
public ApiResponse GetAttendanceStatistics(int allotId)
{
// 返回结果参考接口 employee/apr/getdeptdetail
return _attendanceService.GetAttendanceStatistics(allotId, hospitalId);
return _attendanceService.GetAttendanceStatistics(allotId);
}
}
}
performance/Performance.Api/wwwroot/Performance.EntityModels.xml
......@@ -6120,6 +6120,11 @@
验证失败描述
</summary>
</member>
<member name="P:Performance.EntityModels.Entity.per_attendance_type.IsDeduction">
<summary>
是否核减出勤 1 核减 2 不核减
</summary>
</member>
<member name="T:Performance.EntityModels.per_batch">
<summary>
分批发放记录
......@@ -8845,6 +8850,56 @@
</summary>
</member>
<member name="P:Performance.EntityModels.Other.AttendanceStatistics.UnitType">
<summary>
核算组别
</summary>
</member>
<member name="P:Performance.EntityModels.Other.AttendanceStatistics.AccountingUnit">
<summary>
核算单元
</summary>
</member>
<member name="P:Performance.EntityModels.Other.AttendanceStatistics.Department">
<summary>
科室名称
</summary>
</member>
<member name="P:Performance.EntityModels.Other.AttendanceStatistics.PersonnelNumber">
<summary>
工号
</summary>
</member>
<member name="P:Performance.EntityModels.Other.AttendanceStatistics.PersonnelName">
<summary>
姓名
</summary>
</member>
<member name="P:Performance.EntityModels.Other.AttendanceStatistics.BeginDate">
<summary>
在科开始时间
</summary>
</member>
<member name="P:Performance.EntityModels.Other.AttendanceStatistics.EndDate">
<summary>
在科结束时间
</summary>
</member>
<member name="P:Performance.EntityModels.Other.AttendanceStatisticsDetial.Value">
<summary>
请假天数
</summary>
</member>
<member name="P:Performance.EntityModels.Other.AttendanceStatisticsDetial.Title">
<summary>
考勤类型
</summary>
</member>
<member name="P:Performance.EntityModels.Other.AttendanceStatisticsDetial.Remark">
<summary>
备注
</summary>
</member>
<member name="P:Performance.EntityModels.HisData.HisDepartment">
<summary>
His科室
......
performance/Performance.DtoModels/Enum.cs
......@@ -155,4 +155,19 @@ public enum Status
超时 = 99,
}
}
public class Attendance
{
public enum Type
{
开始,
调入,
结束,
}
public enum Deduction
{
核减 = 1,
不核减 = 2,
}
}
}
performance/Performance.EntityModels/Entity/per_attendance_type.cs
......@@ -16,6 +16,9 @@ public class per_attendance_type
public int HospitalId { get; set; } //医院Id
public int AllotId { get; set; } //绩效Id
public string AttendanceName { get; set; } //考勤类型名称
public int IsDeduction { get; set; } //是否核减出勤 1 核减 2 不核减
/// <summary>
/// 是否核减出勤 1 核减 2 不核减
/// </summary>
public int IsDeduction { get; set; }
}
}
performance/Performance.EntityModels/Other/view_attendance.cs
......@@ -86,7 +86,57 @@ public class Detail
public DateTime EndDate { get; set; }
public int IsDeduction { get; set; }
public int VacationDays { get; set; }
}
public class AttendanceStatistics
{
public int AllotID { get; set; }
/// <summary>
/// 核算组别
/// </summary>
public string UnitType { get; set; }
/// <summary>
/// 核算单元
/// </summary>
public string AccountingUnit { get; set; }
/// <summary>
/// 科室名称
/// </summary>
public string Department { get; set; }
/// <summary>
/// 工号
/// </summary>
public string PersonnelNumber { get; set; }
/// <summary>
/// 姓名
/// </summary>
public string PersonnelName { get; set; }
/// <summary>
/// 在科开始时间
/// </summary>
public DateTime BeginDate { get; set; }
/// <summary>
/// 在科结束时间
/// </summary>
public DateTime EndDate { get; set; }
public List<AttendanceStatisticsDetial> Detial { get; set; }
}
public class AttendanceStatisticsDetial
{
/// <summary>
/// 请假天数
/// </summary>
public int Value { get; set; }
/// <summary>
/// 考勤类型
/// </summary>
public string Title { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { 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