Skip to content

P
performance
Commit 07fb0ab9 by ruyun.zhang
Options

考勤上报

parent ff8b0c58
Showing with 712 additions and 22 deletions
performance/Performance.Api/wwwroot/Performance.DtoModels.xml
...@@ -177,6 +177,11 @@ ...@@ -177,6 +177,11 @@
<member name="F:Performance.DtoModels.DataFormat.日期YYYYMMDD"> <member name="F:Performance.DtoModels.DataFormat.日期YYYYMMDD">
<summary> 日期 </summary> <summary> 日期 </summary>
</member> </member>
<member name="T:Performance.DtoModels.Attendance.Report">
<summary>
考勤上报
</summary>
</member>
<member name="P:Performance.DtoModels.HistoryData.Year"> <member name="P:Performance.DtoModels.HistoryData.Year">
<summary> <summary>
年 年
...@@ -2095,6 +2100,86 @@ ...@@ -2095,6 +2100,86 @@
<member name="P:Performance.DtoModels.AprAmountMarkRequest.TypeInDepartments"> <member name="P:Performance.DtoModels.AprAmountMarkRequest.TypeInDepartments">
<summary> 需要审计的科室，支持多个科室一起审计 </summary> <summary> 需要审计的科室，支持多个科室一起审计 </summary>
</member> </member>
<member name="P:Performance.DtoModels.Request.AttendanceDeptAudit.State">
<summary>
状态(通过 = 3,驳回 = 4)
</summary>
</member>
<member name="P:Performance.DtoModels.Request.AttendanceDeptAudit.Remark">
<summary>
说明
</summary>
</member>
<member name="P:Performance.DtoModels.Request.AttendanceDept.PersonnelNumber">
<summary>
工号
</summary>
</member>
<member name="P:Performance.DtoModels.Request.AttendanceDept.PersonnelName">
<summary>
姓名
</summary>
</member>
<member name="P:Performance.DtoModels.Request.AttendanceDept.PermanentStaff">
<summary>
人员系数
</summary>
</member>
<member name="P:Performance.DtoModels.Request.AttendanceDept.Day01">
<summary>
01日
</summary>
</member>
<member name="P:Performance.DtoModels.Request.AttendanceDeptMore.AllotId">
<summary>
绩效Id
</summary>
</member>
<member name="P:Performance.DtoModels.Request.AttendanceDeptMore.Code">
<summary>
核算单元编码
</summary>
</member>
<member name="P:Performance.DtoModels.Request.AttendanceDeptMore.UnitType">
<summary>
人员类别
</summary>
</member>
<member name="P:Performance.DtoModels.Request.AttendanceDeptMore.AccountingUnit">
<summary>
核算单元
</summary>
</member>
<member name="P:Performance.DtoModels.Request.AttendanceDeptMore.State">
<summary>
状态(未提交 = 1,提交 = 2,通过 = 3,驳回 = 4)
</summary>
</member>
<member name="P:Performance.DtoModels.Request.AttendanceDeptMore.SubmitUser">
<summary>
提交用户
</summary>
</member>
<member name="P:Performance.DtoModels.Request.AttendanceDeptMore.SubmitTime">
<summary>
提交时间
</summary>
</member>
<member name="P:Performance.DtoModels.Request.AttendanceDeptMore.AuditUser">
<summary>
审核用户
</summary>
</member>
<member name="P:Performance.DtoModels.Request.AttendanceDeptMore.AuditTime">
<summary>
审核时间
</summary>
</member>
<member name="P:Performance.DtoModels.Request.AttendanceDeptMore.Remarks">
<summary>
备注
</summary>
</member>
<member name="P:Performance.DtoModels.Request.BatchRequest.Batch"> <member name="P:Performance.DtoModels.Request.BatchRequest.Batch">
<summary> <summary>
批次号 批次号
...@@ -3103,6 +3188,71 @@ ...@@ -3103,6 +3188,71 @@
调入时间 调入时间
</summary> </summary>
</member> </member>
<member name="P:Performance.DtoModels.Response.AttendanceDeptAuditList.Code">
<summary>
编码
</summary>
</member>
<member name="P:Performance.DtoModels.Response.AttendanceDeptAuditList.UnitType">
<summary>
核算组别
</summary>
</member>
<member name="P:Performance.DtoModels.Response.AttendanceDeptAuditList.AccountingUnit">
<summary>
核算单元
</summary>
</member>
<member name="P:Performance.DtoModels.Response.AttendanceDeptAuditList.Count">
<summary>
总下发数
</summary>
</member>
<member name="P:Performance.DtoModels.Response.AttendanceDeptAuditList.ConfirmCount">
<summary>
确认数
</summary>
</member>
<member name="P:Performance.DtoModels.Response.AttendanceDeptAuditList.FinishCount">
<summary>
通过数
</summary>
</member>
<member name="P:Performance.DtoModels.Response.AttendanceDeptAuditList.RejectCount">
<summary>
驳回数
</summary>
</member>
<member name="P:Performance.DtoModels.Response.AttendanceDeptAuditList.State">
<summary>
状态(未提交 = 1,提交 = 2,通过 = 3,驳回 = 4)
</summary>
</member>
<member name="P:Performance.DtoModels.Response.AttendanceDeptAuditList.SubmitUser">
<summary>
提交人
</summary>
</member>
<member name="P:Performance.DtoModels.Response.AttendanceDeptAuditList.SubmitTime">
<summary>
提交时间
</summary>
</member>
<member name="P:Performance.DtoModels.Response.AttendanceDeptAuditList.AuditUser">
<summary>
审核人
</summary>
</member>
<member name="P:Performance.DtoModels.Response.AttendanceDeptAuditList.AuditTime">
<summary>
审核时间
</summary>
</member>
<member name="P:Performance.DtoModels.Response.AttendanceDeptAuditList.Remarks">
<summary>
状态描述
</summary>
</member>
<member name="P:Performance.DtoModels.Response.AttendanceIssueChoose.AllotId"> <member name="P:Performance.DtoModels.Response.AttendanceIssueChoose.AllotId">
<summary> <summary>
绩效Id 绩效Id
......
performance/Performance.Api/wwwroot/Performance.EntityModels.xml
...@@ -6123,6 +6123,86 @@ ...@@ -6123,6 +6123,86 @@
人员系数 人员系数
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.Entity.per_attendance_dept.Id">
<summary>
自增主键
</summary>
</member>
<member name="P:Performance.EntityModels.Entity.per_attendance_dept.HospitalId">
<summary>
医院Id,可空
</summary>
</member>
<member name="P:Performance.EntityModels.Entity.per_attendance_dept.AllotId">
<summary>
绩效Id
</summary>
</member>
<member name="P:Performance.EntityModels.Entity.per_attendance_dept.PersonnelNumber">
<summary>
工号
</summary>
</member>
<member name="P:Performance.EntityModels.Entity.per_attendance_dept.PersonnelName">
<summary>
姓名
</summary>
</member>
<member name="P:Performance.EntityModels.Entity.per_attendance_dept.PermanentStaff">
<summary>
人员系数
</summary>
</member>
<member name="P:Performance.EntityModels.Entity.per_attendance_dept.Code">
<summary>
核算单元编码
</summary>
</member>
<member name="P:Performance.EntityModels.Entity.per_attendance_dept.UnitType">
<summary>
人员类别
</summary>
</member>
<member name="P:Performance.EntityModels.Entity.per_attendance_dept.AccountingUnit">
<summary>
核算单元
</summary>
</member>
<member name="P:Performance.EntityModels.Entity.per_attendance_dept.State">
<summary>
状态(未提交 = 0,提交 = 1,通过 = 2,驳回 = 3)
</summary>
</member>
<member name="P:Performance.EntityModels.Entity.per_attendance_dept.SubmitUser">
<summary>
提交用户
</summary>
</member>
<member name="P:Performance.EntityModels.Entity.per_attendance_dept.SubmitTime">
<summary>
提交时间
</summary>
</member>
<member name="P:Performance.EntityModels.Entity.per_attendance_dept.AuditUser">
<summary>
审核用户
</summary>
</member>
<member name="P:Performance.EntityModels.Entity.per_attendance_dept.AuditTime">
<summary>
审核时间
</summary>
</member>
<member name="P:Performance.EntityModels.Entity.per_attendance_dept.Remarks">
<summary>
备注
</summary>
</member>
<member name="P:Performance.EntityModels.Entity.per_attendance_dept.Day01">
<summary>
01日
</summary>
</member>
<member name="P:Performance.EntityModels.Entity.per_attendance_issue.HospitalId"> <member name="P:Performance.EntityModels.Entity.per_attendance_issue.HospitalId">
<summary> <summary>
医院Id 医院Id
......
performance/Performance.DtoModels/Enum.cs
...@@ -124,6 +124,16 @@ public enum State ...@@ -124,6 +124,16 @@ public enum State
确认 = 2, 确认 = 2,
驳回 = 3, 驳回 = 3,
} }
/// <summary>
/// 考勤上报
/// </summary>
public enum Report
{
未提交 = 1,
提交 = 2,
通过 = 3,
驳回 = 4,
}
public enum OperationType public enum OperationType
{ {
全部 = 0, 全部 = 0,
......
performance/Performance.DtoModels/Request/AttendanceDept.cs 0 → 100644
using System;
using System.Collections.Generic;
namespace Performance.DtoModels.Request
{
public class AttendanceDeptAudit
{
/// <summary>
/// 状态(通过 = 3,驳回 = 4)
/// </summary>
public int State { get; set; }
/// <summary>
/// 说明
/// </summary>
public string Remark { get; set; }
}
public class AttendanceDept
{
/// <summary>
/// 工号
/// </summary>
public string PersonnelNumber { get; set; }
/// <summary>
/// 姓名
/// </summary>
public string PersonnelName { get; set; }
/// <summary>
/// 人员系数
/// </summary>
public decimal? PermanentStaff { get; set; }
/// <summary>
/// 01日
/// </summary>
public string Day01 { get; set; }
public string Day02 { get; set; }
public string Day03 { get; set; }
public string Day04 { get; set; }
public string Day05 { get; set; }
public string Day06 { get; set; }
public string Day07 { get; set; }
public string Day08 { get; set; }
public string Day09 { get; set; }
public string Day10 { get; set; }
public string Day11 { get; set; }
public string Day12 { get; set; }
public string Day13 { get; set; }
public string Day14 { get; set; }
public string Day15 { get; set; }
public string Day16 { get; set; }
public string Day17 { get; set; }
public string Day18 { get; set; }
public string Day19 { get; set; }
public string Day20 { get; set; }
public string Day21 { get; set; }
public string Day22 { get; set; }
public string Day23 { get; set; }
public string Day24 { get; set; }
public string Day25 { get; set; }
public string Day26 { get; set; }
public string Day27 { get; set; }
public string Day28 { get; set; }
public string Day29 { get; set; }
public string Day30 { get; set; }
public string Day31 { get; set; }
}
public class AttendanceDeptMore : AttendanceDept
{
/// <summary>
/// 绩效Id
/// </summary>
public int AllotId { get; set; }
/// <summary>
/// 核算单元编码
/// </summary>
public string Code { get; set; }
/// <summary>
/// 人员类别
/// </summary>
public string UnitType { get; set; }
/// <summary>
/// 核算单元
/// </summary>
public string AccountingUnit { get; set; }
/// <summary>
/// 状态(未提交 = 1,提交 = 2,通过 = 3,驳回 = 4)
/// </summary>
public int State { get; set; }
/// <summary>
/// 提交用户
/// </summary>
public string SubmitUser { get; set; }
/// <summary>
/// 提交时间
/// </summary>
public DateTime? SubmitTime { get; set; }
/// <summary>
/// 审核用户
/// </summary>
public string AuditUser { get; set; }
/// <summary>
/// 审核时间
/// </summary>
public DateTime? AuditTime { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remarks { get; set; }
}
public class AttendanceDeptDetail
{
public List<TColumn> Columns { get; set; }
public List<AttendanceDeptMore> Data { get; set; }
}
}
performance/Performance.DtoModels/Response/AttendanceDeptAuditList.cs 0 → 100644
using System;
namespace Performance.DtoModels.Response
{
public class AttendanceDeptAuditList
{
/// <summary>
/// 编码
/// </summary>
public string Code { get; set; }
/// <summary>
/// 核算组别
/// </summary>
public string UnitType { get; set; }
/// <summary>
/// 核算单元
/// </summary>
public string AccountingUnit { get; set; }
/// <summary>
/// 总下发数
/// </summary>
public int Count { get; set; }
/// <summary>
/// 确认数
/// </summary>
public int ConfirmCount { get; set; }
/// <summary>
/// 通过数
/// </summary>
public int FinishCount { get; set; }
/// <summary>
/// 驳回数
/// </summary>
public int RejectCount { get; set; }
/// <summary>
/// 状态(未提交 = 1,提交 = 2,通过 = 3,驳回 = 4)
/// </summary>
public int State { get; set; }
/// <summary>
/// 提交人
/// </summary>
public string SubmitUser { get; set; }
/// <summary>
/// 提交时间
/// </summary>
public DateTime? SubmitTime { get; set; }
/// <summary>
/// 审核人
/// </summary>
public string AuditUser { get; set; }
/// <summary>
/// 审核时间
/// </summary>
public DateTime? AuditTime { get; set; }
/// <summary>
/// 状态描述
/// </summary>
public string Remarks { get; set; }
}
}
performance/Performance.DtoModels/TColumn.cs 0 → 100644
namespace Performance.DtoModels
{
public class TColumn
{
public TColumn()
{
}
public TColumn(string field, string title, int width = 80, string @fixed = "", bool sortable = false)
{
Field = field;
Title = title;
Width = width;
Fixed = @fixed;
Sortable = sortable;
}
public string Field { get; set; }
public string Title { get; set; }
public int Width { get; set; }
public string Fixed { get; set; }
public bool Sortable { get; set; }
}
}
performance/Performance.EntityModels/Context/PerformanceDbContext.cs
...@@ -254,6 +254,7 @@ public PerformanceDbContext(DbContextOptions<PerformanceDbContext> options) ...@@ -254,6 +254,7 @@ public PerformanceDbContext(DbContextOptions<PerformanceDbContext> options)
public virtual DbSet<sys_user_role> sys_user_role { get; set; } public virtual DbSet<sys_user_role> sys_user_role { get; set; }
public virtual DbSet<sys_version> sys_version { get; set; } public virtual DbSet<sys_version> sys_version { get; set; }
public virtual DbSet<per_attendance> per_attendance { get; set; } public virtual DbSet<per_attendance> per_attendance { get; set; }
public virtual DbSet<per_attendance_dept> per_attendance_dept { get; set; }
public virtual DbSet<per_attendance_issue> per_attendance_issue { get; set; } public virtual DbSet<per_attendance_issue> per_attendance_issue { get; set; }
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; }
......
performance/Performance.EntityModels/Entity/per_attendance_dept.cs 0 → 100644
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace Performance.EntityModels.Entity
{
[Table("per_attendance_dept")]
public class per_attendance_dept
{
/// <summary>
/// 自增主键
/// </summary>
[Key]
public int Id { get; set; }
/// <summary>
/// 医院Id,可空
/// </summary>
public int? HospitalId { get; set; }
/// <summary>
/// 绩效Id
/// </summary>
public int AllotId { get; set; }
/// <summary>
/// 工号
/// </summary>
public string PersonnelNumber { get; set; }
/// <summary>
/// 姓名
/// </summary>
public string PersonnelName { get; set; }
/// <summary>
/// 人员系数
/// </summary>
public decimal? PermanentStaff { get; set; }
/// <summary>
/// 核算单元编码
/// </summary>
public string Code { get; set; }
/// <summary>
/// 人员类别
/// </summary>
public string UnitType { get; set; }
/// <summary>
/// 核算单元
/// </summary>
public string AccountingUnit { get; set; }
/// <summary>
/// 状态(未提交 = 0,提交 = 1,通过 = 2,驳回 = 3)
/// </summary>
public int State { get; set; }
/// <summary>
/// 提交用户
/// </summary>
public string SubmitUser { get; set; }
/// <summary>
/// 提交时间
/// </summary>
public DateTime? SubmitTime { get; set; }
/// <summary>
/// 审核用户
/// </summary>
public string AuditUser { get; set; }
/// <summary>
/// 审核时间
/// </summary>
public DateTime? AuditTime { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remarks { get; set; }
/// <summary>
/// 01日
/// </summary>
public int? Day01 { get; set; }
public int? Day02 { get; set; }
public int? Day03 { get; set; }
public int? Day04 { get; set; }
public int? Day05 { get; set; }
public int? Day06 { get; set; }
public int? Day07 { get; set; }
public int? Day08 { get; set; }
public int? Day09 { get; set; }
public int? Day10 { get; set; }
public int? Day11 { get; set; }
public int? Day12 { get; set; }
public int? Day13 { get; set; }
public int? Day14 { get; set; }
public int? Day15 { get; set; }
public int? Day16 { get; set; }
public int? Day17 { get; set; }
public int? Day18 { get; set; }
public int? Day19 { get; set; }
public int? Day20 { get; set; }
public int? Day21 { get; set; }
public int? Day22 { get; set; }
public int? Day23 { get; set; }
public int? Day24 { get; set; }
public int? Day25 { get; set; }
public int? Day26 { get; set; }
public int? Day27 { get; set; }
public int? Day28 { get; set; }
public int? Day29 { get; set; }
public int? Day30 { get; set; }
public int? Day31 { get; set; }
}
}
\ No newline at end of file
performance/Performance.EntityModels/Other/AccountUnit.cs 0 → 100644
namespace Performance.EntityModels
{
public class AccountUnit
{
public string AccountingUnit { get; set; }
public string UnitType { get; set; }
}
}
performance/Performance.Infrastructure/Extensions/Extensions.String.cs
...@@ -2,10 +2,9 @@ ...@@ -2,10 +2,9 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
namespace Performance.Infrastructure
public static partial class UtilExtensions
{ {
public static partial class UtilExtensions
{
public static string RemoveLineBreak(this string text) public static string RemoveLineBreak(this string text)
{ {
return text.Replace("\n", ""); return text.Replace("\n", "");
...@@ -15,6 +14,15 @@ public static string RemoveEnter(this string text) ...@@ -15,6 +14,15 @@ public static string RemoveEnter(this string text)
{ {
return text.Replace("\r", ""); return text.Replace("\r", "");
} }
public static string RemoveSpace(this string text)
{
return text.Replace(" ", "");
}
public static string Clean(this string text)
{
return text.Trim().RemoveEnter().RemoveLineBreak().RemoveSpace();
}
/// <summary> /// <summary>
/// 分隔 移除空项 /// 分隔 移除空项
...@@ -48,5 +56,4 @@ public static bool EqualsIgnoreCase(this string text, string value) ...@@ -48,5 +56,4 @@ public static bool EqualsIgnoreCase(this string text, string value)
{ {
return text.Equals(value, StringComparison.OrdinalIgnoreCase); return text.Equals(value, StringComparison.OrdinalIgnoreCase);
} }
}
} }
performance/Performance.Repository/PerforPeremployeeRepository.cs
...@@ -29,6 +29,14 @@ public new PageList<per_employee> GetEntitiesForPaging(int pageNumber, int pageS ...@@ -29,6 +29,14 @@ public new PageList<per_employee> GetEntitiesForPaging(int pageNumber, int pageS
return PageList<per_employee>.Create(queryableAuthors, pageNumber, pageSize); return PageList<per_employee>.Create(queryableAuthors, pageNumber, pageSize);
} }
public new List<AccountUnit> GetEmployeeUnit(Expression<Func<per_employee, bool>> exp)
{
return context.Set<per_employee>()
.Where(exp)
.Select(w => new AccountUnit { UnitType = w.UnitType, AccountingUnit = w.AccountingUnit })
.Distinct()
.ToList();
}
//public Comparison GetComparison(ComparisonPagingRequest request) //public Comparison GetComparison(ComparisonPagingRequest request)
//{ //{
......
performance/Performance.Repository/Repository/PerforPerAttendanceDeptRepository.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 PerforPerAttendanceDeptRepository : PerforRepository<per_attendance_dept>
{
/// <summary>
/// per_attendance Repository
/// </summary>
public PerforPerAttendanceDeptRepository(PerformanceDbContext context) : base(context)
{
}
}
}
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