Skip to content

P
performance
Commit ce05cc2f by wyc
Options

‘考勤下发’注释 初始考勤，添加 科室确认详情（已下发结果展示列表）下载，修改 更新字段

parent 3fbe8d32
Showing with 133 additions and 89 deletions
performance/Performance.Api/Controllers/AttendanceController.cs
...@@ -36,20 +36,21 @@ public class AttendanceController : ControllerBase ...@@ -36,20 +36,21 @@ public class AttendanceController : ControllerBase
view_attendance 考勤视图 view_attendance 考勤视图
*/ */
/// <summary>
/// 查询绩效考勤记录
/// </summary>
/// <param name="allotId"></param>
/// <returns></returns>
[HttpGet("GetAttendance/{allotId}")]
public ApiResponse<List<AttendanceStatistics>> GetAttendance(int allotId)
{
// 查询考勤视图，并按照设计图做格式转换 仅查询开始结束
var userid = claim.GetUserId();
var result = _attendanceService.GetAttendance(allotId, userid);
return result; ///// <summary>
} ///// 查询绩效考勤记录
///// </summary>
///// <param name="allotId"></param>
///// <returns></returns>
//[HttpGet("GetAttendance/{allotId}")]
//public ApiResponse<List<AttendanceStatistics>> GetAttendance(int allotId)
//{
// // 查询考勤视图，并按照设计图做格式转换 仅查询开始结束
// var userid = claim.GetUserId();
// var result = _attendanceService.GetAttendance(allotId, userid);
// return result;
//}
#region 调动记录 #region 调动记录
...@@ -194,47 +195,49 @@ public ApiResponse<List<AttendanceStatistics>> GetAttendanceStatistics(int allot ...@@ -194,47 +195,49 @@ public ApiResponse<List<AttendanceStatistics>> GetAttendanceStatistics(int allot
return _attendanceService.GetAttendanceStatistics(allotId, userid); return _attendanceService.GetAttendanceStatistics(allotId, userid);
} }
#region 下载
/// <summary>
/// 初始考勤记录下载
/// </summary>
/// <param name="allotId"></param>
/// <returns></returns>
[HttpPost]
[Route("download/attendance/{allotId}")]
public IActionResult DownloadAttendance(int allotId)
{
List<ExcelDownloadHeads> excelDownloadHeads = new List<ExcelDownloadHeads>()
{
new ExcelDownloadHeads { Alias = "核算单元名称", Name = nameof(AttendanceStatistics.AccountingUnit) },
new ExcelDownloadHeads { Alias = "科室名称", Name = nameof(AttendanceStatistics.Department) },
new ExcelDownloadHeads { Alias = "姓名", Name = nameof(AttendanceStatistics.PersonnelName) },
new ExcelDownloadHeads { Alias = "员工号", Name = nameof(AttendanceStatistics.PersonnelNumber) },
new ExcelDownloadHeads { Alias = "人员类别", Name = nameof(AttendanceStatistics.UnitType) },
new ExcelDownloadHeads { Alias = "在科开始时问", Name = nameof(AttendanceStatistics.BeginDate) },
new ExcelDownloadHeads { Alias = "在科结束时间", Name = nameof(AttendanceStatistics.EndDate) },
};
var userid = claim.GetUserId();
var result = _attendanceService.GetAttendance(allotId, userid).Data;
var ser = JsonConvert.SerializeObject(result);
var rows = JsonConvert.DeserializeObject<List<Dictionary<string, object>>>(ser);
var filepath = _attendanceService.ExcelDownload(rows, "初始考勤记录", allotId, excelDownloadHeads);
var memoryStream = new MemoryStream(); #region 初始考勤记录下载
using (var stream = new FileStream(filepath, FileMode.Open)) ///// <summary>
{ ///// 初始考勤记录下载
stream.CopyToAsync(memoryStream).Wait(); ///// </summary>
} ///// <param name="allotId"></param>
memoryStream.Seek(0, SeekOrigin.Begin); ///// <returns></returns>
var provider = new FileExtensionContentTypeProvider(); //[HttpPost]
FileInfo fileInfo = new FileInfo(filepath); //[Route("download/attendance/{allotId}")]
var memi = provider.Mappings[".xlsx"]; //public IActionResult DownloadAttendance(int allotId)
return File(memoryStream, memi, Path.GetFileName(fileInfo.Name)); //{
} // List<ExcelDownloadHeads> excelDownloadHeads = new List<ExcelDownloadHeads>()
// {
// new ExcelDownloadHeads { Alias = "核算单元名称", Name = nameof(AttendanceStatistics.AccountingUnit) },
// new ExcelDownloadHeads { Alias = "科室名称", Name = nameof(AttendanceStatistics.Department) },
// new ExcelDownloadHeads { Alias = "姓名", Name = nameof(AttendanceStatistics.PersonnelName) },
// new ExcelDownloadHeads { Alias = "员工号", Name = nameof(AttendanceStatistics.PersonnelNumber) },
// new ExcelDownloadHeads { Alias = "人员类别", Name = nameof(AttendanceStatistics.UnitType) },
// new ExcelDownloadHeads { Alias = "在科开始时问", Name = nameof(AttendanceStatistics.BeginDate) },
// new ExcelDownloadHeads { Alias = "在科结束时间", Name = nameof(AttendanceStatistics.EndDate) },
// };
// var userid = claim.GetUserId();
// var result = _attendanceService.GetAttendance(allotId, userid).Data;
// var ser = JsonConvert.SerializeObject(result);
// var rows = JsonConvert.DeserializeObject<List<Dictionary<string, object>>>(ser);
// var filepath = _attendanceService.ExcelDownload(rows, "初始考勤记录", allotId, excelDownloadHeads);
// var memoryStream = new MemoryStream();
// using (var stream = new FileStream(filepath, FileMode.Open))
// {
// stream.CopyToAsync(memoryStream).Wait();
// }
// memoryStream.Seek(0, SeekOrigin.Begin);
// var provider = new FileExtensionContentTypeProvider();
// FileInfo fileInfo = new FileInfo(filepath);
// var memi = provider.Mappings[".xlsx"];
// return File(memoryStream, memi, Path.GetFileName(fileInfo.Name));
//}
#endregion
#region 下载
/// <summary> /// <summary>
/// 考勤记录下载 /// 考勤记录下载
/// </summary> /// </summary>
...@@ -364,6 +367,53 @@ public IActionResult DownloadStatistics(int allotId) ...@@ -364,6 +367,53 @@ public IActionResult DownloadStatistics(int allotId)
return File(memoryStream, memi, Path.GetFileName(path));*/ return File(memoryStream, memi, Path.GetFileName(path));*/
} }
/// <summary>
/// 科室确认详情(已下发结果展示列表)下载
/// </summary>
/// <param name="allotId"></param>
/// <param name="unitType">人员类别</param>
/// <param name="accountingUnit">核算单元</param>
/// <returns></returns>
[HttpPost]
[Route("download/auditDetail")]
public IActionResult DownloadAuditDetail(int allotId,string unitType,string accountingUnit)
{
List<ExcelDownloadHeads> excelDownloadHeads = new List<ExcelDownloadHeads>()
{
new ExcelDownloadHeads { Alias = "科室名称", Name = nameof(AttendanceStatistics.Department) },
new ExcelDownloadHeads { Alias = "姓名", Name = nameof(AttendanceStatistics.PersonnelName) },
new ExcelDownloadHeads { Alias = "员工号", Name = nameof(AttendanceStatistics.PersonnelNumber) },
new ExcelDownloadHeads { Alias = "人员类别", Name = nameof(AttendanceStatistics.UnitType) },
new ExcelDownloadHeads { Alias = "核算单元", Name = nameof(AttendanceStatistics.AccountingUnit) },
new ExcelDownloadHeads { Alias = "开始时问", Name = nameof(AttendanceStatistics.BeginDate) },
new ExcelDownloadHeads { Alias = "结束时间", Name = nameof(AttendanceStatistics.EndDate) },
};
var type = _attendanceService.GetAttendanceType(allotId);
foreach (var item in type.Data)
{
excelDownloadHeads.Add(new ExcelDownloadHeads() { Alias = item.AttendanceName, Name = item.AttendanceName });
}
excelDownloadHeads.Add(new ExcelDownloadHeads() { Alias = "考勤天数", Name = "AttendanceDays" });
var userid = claim.GetUserId();
var result = _attendanceService.AuditDetail(allotId, unitType, accountingUnit, userid).Data;
var ser = JsonConvert.SerializeObject(result);
var rows = JsonConvert.DeserializeObject<List<Dictionary<string, object>>>(ser);
var filepath = _attendanceService.ExcelDownload(rows, "最终考勤结果", allotId, excelDownloadHeads);
var memoryStream = new MemoryStream();
using (var stream = new FileStream(filepath, FileMode.Open))
{
stream.CopyToAsync(memoryStream).Wait();
}
memoryStream.Seek(0, SeekOrigin.Begin);
var provider = new FileExtensionContentTypeProvider();
FileInfo fileInfo = new FileInfo(filepath);
var memi = provider.Mappings[".xlsx"];
return File(memoryStream, memi, Path.GetFileName(fileInfo.Name));
}
#endregion #endregion
#region 最终考勤结果 #region 最终考勤结果
...@@ -384,6 +434,8 @@ public ApiResponse<List<AttendanceAuditList>> AuditList(int allotId, string unit ...@@ -384,6 +434,8 @@ public ApiResponse<List<AttendanceAuditList>> AuditList(int allotId, string unit
return _attendanceService.AuditList(allotId, unitType, accountingUnit, state); return _attendanceService.AuditList(allotId, unitType, accountingUnit, state);
} }
/// <summary> /// <summary>
/// 科室确认详情(已下发结果展示列表) /// 科室确认详情(已下发结果展示列表)
/// </summary> /// </summary>
...@@ -429,12 +481,11 @@ public ApiResponse IssueStatistics(int allotId) ...@@ -429,12 +481,11 @@ public ApiResponse IssueStatistics(int allotId)
return _attendanceService.IssueStatistics(allotId, userid, realName); return _attendanceService.IssueStatistics(allotId, userid, realName);
} }
/// <summary> /// <summary>
/// 最终考勤结果驳回或确认无误((批量操作) /// 最终考勤结果驳回或确认无误((批量操作)
/// </summary> /// </summary>
/// <param name="allotId"></param> /// <param name="attendanceIssueChoose"></param>
/// <param name="issueid">选择id</param>
/// <param name="state">操作类型 确认 = 2,驳回 = 3,</param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
[Route("issue/choose")] [Route("issue/choose")]
......
performance/Performance.Api/wwwroot/Performance.Api.xml
...@@ -302,13 +302,6 @@ ...@@ -302,13 +302,6 @@
记录创建、下发、归档、上传绩效 记录创建、下发、归档、上传绩效
</summary> </summary>
</member> </member>
<member name="M:Performance.Api.Controllers.AttendanceController.GetAttendance(System.Int32)">
<summary>
查询绩效考勤记录
</summary>
<param name="allotId"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.AttendanceController.GetCallIn(System.Int32)"> <member name="M:Performance.Api.Controllers.AttendanceController.GetCallIn(System.Int32)">
<summary> <summary>
查询绩效调动记录 查询绩效调动记录
...@@ -385,13 +378,6 @@ ...@@ -385,13 +378,6 @@
<param name="allotId"></param> <param name="allotId"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Performance.Api.Controllers.AttendanceController.DownloadAttendance(System.Int32)">
<summary>
初始考勤记录下载
</summary>
<param name="allotId"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.AttendanceController.DownloadVacation(System.Int32)"> <member name="M:Performance.Api.Controllers.AttendanceController.DownloadVacation(System.Int32)">
<summary> <summary>
考勤记录下载 考勤记录下载
...@@ -413,6 +399,15 @@ ...@@ -413,6 +399,15 @@
<param name="allotId"></param> <param name="allotId"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Performance.Api.Controllers.AttendanceController.DownloadAuditDetail(System.Int32,System.String,System.String)">
<summary>
科室确认详情(已下发结果展示列表)下载
</summary>
<param name="allotId"></param>
<param name="unitType"></param>
<param name="accountingUnit"></param>
<returns></returns>
</member>
<member name="M:Performance.Api.Controllers.AttendanceController.AuditList(System.Int32,System.String,System.String,Performance.DtoModels.Attendance.State)"> <member name="M:Performance.Api.Controllers.AttendanceController.AuditList(System.Int32,System.String,System.String,Performance.DtoModels.Attendance.State)">
<summary> <summary>
科室确认列表 科室确认列表
...@@ -453,9 +448,7 @@ ...@@ -453,9 +448,7 @@
<summary> <summary>
最终考勤结果驳回或确认无误((批量操作) 最终考勤结果驳回或确认无误((批量操作)
</summary> </summary>
<param name="allotId"></param> <param name="attendanceIssueChoose"></param>
<param name="issueid">选择id</param>
<param name="state">操作类型 确认 = 2,驳回 = 3,</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Performance.Api.Controllers.BudgetController.Query(Performance.DtoModels.Request.BudgetRequest)"> <member name="M:Performance.Api.Controllers.BudgetController.Query(Performance.DtoModels.Request.BudgetRequest)">
......
performance/Performance.Api/wwwroot/Performance.DtoModels.xml
...@@ -2978,14 +2978,14 @@ ...@@ -2978,14 +2978,14 @@
状态 未确认 = 1,确认 = 2,驳回 = 3 状态 未确认 = 1,确认 = 2,驳回 = 3
</summary> </summary>
</member> </member>
<member name="P:Performance.DtoModels.Response.AttendanceAuditDetail.UpdateUser"> <member name="P:Performance.DtoModels.Response.AttendanceAuditDetail.ConfirmUser">
<summary> <summary>
更新人 确定用户
</summary> </summary>
</member> </member>
<member name="P:Performance.DtoModels.Response.AttendanceAuditDetail.UpdateTime"> <member name="P:Performance.DtoModels.Response.AttendanceAuditDetail.ConfirmTime">
<summary> <summary>
更新时间 确定时间
</summary> </summary>
</member> </member>
<member name="P:Performance.DtoModels.Response.AttendanceAuditDetail.Remarks"> <member name="P:Performance.DtoModels.Response.AttendanceAuditDetail.Remarks">
......
performance/Performance.Api/wwwroot/Performance.EntityModels.xml
...@@ -6195,7 +6195,7 @@ ...@@ -6195,7 +6195,7 @@
</member> </member>
<member name="P:Performance.EntityModels.Entity.per_attendance_issue.CreateUser"> <member name="P:Performance.EntityModels.Entity.per_attendance_issue.CreateUser">
<summary> <summary>
创建人 创建用户
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.Entity.per_attendance_issue.CreateTime"> <member name="P:Performance.EntityModels.Entity.per_attendance_issue.CreateTime">
...@@ -6203,14 +6203,14 @@ ...@@ -6203,14 +6203,14 @@
创建时间 创建时间
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.Entity.per_attendance_issue.UpdateUser"> <member name="P:Performance.EntityModels.Entity.per_attendance_issue.ConfirmUser">
<summary> <summary>
更新人 确定用户
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.Entity.per_attendance_issue.UpdateTime"> <member name="P:Performance.EntityModels.Entity.per_attendance_issue.ConfirmTime">
<summary> <summary>
更新时间 确定时间
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.Entity.per_attendance_issue.Remarks"> <member name="P:Performance.EntityModels.Entity.per_attendance_issue.Remarks">
......
performance/Performance.DtoModels/Response/AttendanceAuditDetail.cs
...@@ -70,13 +70,13 @@ public class AttendanceAuditDetail ...@@ -70,13 +70,13 @@ public class AttendanceAuditDetail
/// </summary> /// </summary>
public int State { get; set; } public int State { get; set; }
/// <summary> /// <summary>
/// 更新人 /// 确定用户
/// </summary> /// </summary>
public string UpdateUser { get; set; } public string ConfirmUser { get; set; }
/// <summary> /// <summary>
/// 更新时间 /// 确定时间
/// </summary> /// </summary>
public DateTime? UpdateTime { get; set; } public DateTime? ConfirmTime { get; set; }
public List<AttendanceAuditDetails> Detial { get; set; } public List<AttendanceAuditDetails> Detial { get; set; }
/// <summary> /// <summary>
......
performance/Performance.EntityModels/Entity/per_attendance_issue.cs
...@@ -74,7 +74,7 @@ public class per_attendance_issue ...@@ -74,7 +74,7 @@ public class per_attendance_issue
/// </summary> /// </summary>
public int State { get; set; } public int State { get; set; }
/// <summary> /// <summary>
/// 创建人 /// 创建用户
/// </summary> /// </summary>
public string CreateUser { get; set; } public string CreateUser { get; set; }
/// <summary> /// <summary>
...@@ -82,13 +82,13 @@ public class per_attendance_issue ...@@ -82,13 +82,13 @@ public class per_attendance_issue
/// </summary> /// </summary>
public DateTime? CreateTime { get; set; } public DateTime? CreateTime { get; set; }
/// <summary> /// <summary>
/// 更新人 /// 确定用户
/// </summary> /// </summary>
public string UpdateUser { get; set; } public string ConfirmUser { get; set; }
/// <summary> /// <summary>
/// 更新时间 /// 确定时间
/// </summary> /// </summary>
public DateTime? UpdateTime { get; set; } public DateTime? ConfirmTime { get; set; }
/// <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