From 0f5218bb8ed4ad8fa9b8b2f089efd624dc6e9f07 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 21 六月 2021 08:56:25 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa
---
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..21ba245 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 DateTime ValueStart { get; set; }
+ public DateTime 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