From 2b2ef5f1a07b3632546aef59046e7a048b3b3d8e Mon Sep 17 00:00:00 2001 From: username@email.com <yzy2002yzy@163.com> Date: 星期一, 07 六月 2021 16:44:45 +0800 Subject: [PATCH] 专家管理 前台申请专家 ,后台审批专家 ,评审品目为下拉多选框 项目录入 专家替换字符:'(组长)','(组长)',',','(评审组长)','(评审组长)',';','评审组长:','组长:' --- zhengcaioa/DTO/AdmAttendanceRuleDTO.cs | 57 +++++++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 45 insertions(+), 12 deletions(-) diff --git a/zhengcaioa/DTO/AdmAttendanceRuleDTO.cs b/zhengcaioa/DTO/AdmAttendanceRuleDTO.cs index 80c52c3..9b3c0fb 100644 --- a/zhengcaioa/DTO/AdmAttendanceRuleDTO.cs +++ b/zhengcaioa/DTO/AdmAttendanceRuleDTO.cs @@ -8,14 +8,46 @@ public partial class AdmAttendanceRuleDTO { public string Id { get; set; } - public string Code { get; set; } - public string Name { get; set; } - public string Remark { get; set; } + public int WeekStart { get; set; } + public int WeekEnd { get; set; } + public string WorkingStart { get; set; } + public string WorkingEnd { get; set; } + public string OffworkStart { get; set; } + public string OffworkEnd { get; set; } + public decimal FullAttendance { get; set; } + public decimal LatePayment1 { get; set; } + public decimal LatePayment2 { get; set; } + public decimal LatePayment3 { get; set; } + public decimal LatePayment4 { get; set; } + public decimal Absenteeism { get; set; } + public decimal AbsenteeismPayment1 { get; set; } + public decimal AbsenteeismPayment2 { get; set; } + public decimal PersonalPayment1 { get; set; } + public decimal PersonalPayment2 { get; set; } + public decimal PersonalPayment3 { get; set; } + public decimal PersonalPayment4 { get; set; } + public decimal SickPayment1 { get; set; } + public decimal SickPayment2 { get; set; } + public decimal SickPayment3 { get; set; } + public decimal SickPayment4 { get; set; } + public string Holiday { get; set; } + public string Rest { get; set; } + public int Gala { get; set; } + public int Weekend1 { get; set; } + public int Usually { get; set; } public string RecStatus { get; set; } public string Creater { get; set; } public DateTime Createtime { get; set; } public string Modifier { get; set; } public DateTime Modifytime { get; set; } + + public string[] holiday_s { get; set; } + public string[] holiday_e { get; set; } + + public string[] rest_s { get; set; } + public string[] rest_e { get; set; } + public List<AdmAttendanceRulesDtlDTO> admAttendanceRulesDtlDTOs { get; set; } + } @@ -23,16 +55,17 @@ /// 鏄庣粏 /// </summary> public partial class AdmAttendanceRulesDtlDTO - { - + { + public string Id { get; set; } public string Pid { get; set; } - public string Value1 { get; set; } - public string Value2 { get; set; } - public string Value3 { get; set; } - public string Value4 { get; set; } - public string Value5 { get; set; } - public string Value6 { get; set; } - public string RecStatus { get; set; } + public string ValueStart { get; set; } + public string ValueEnd { get; set; } + public string Name { get; set; } + public string RecStatus { get; set; } + public string Creater { get; set; } + public DateTime Createtime { get; set; } + public string Modifier { get; set; } + public DateTime Modifytime { get; set; } } } -- Gitblit v1.9.1