From 760eede869d8bc0b1b5a4ff38b2d3d94f5e2cb86 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 04 八月 2021 14:29:15 +0800
Subject: [PATCH] 今日开发 专家派工-没有审批的专家不能派工 意向客户访问新增，短信发送不要红星 合作客户 在客户资料列表增加快捷访问链接 工作报表 修改排版 问题维护 试用法条 改为1000字， 问题查询打开直接默认未审核，不要停两秒再刷新 项目新增 增加字段：采购预算 万元 工作考评 考聘不称职当天无工资
---
zhengcaioa/DTO/AdmAttendanceRuleDTO.cs | 61 ++++++++++++++++++++++++------
1 files changed, 49 insertions(+), 12 deletions(-)
diff --git a/zhengcaioa/DTO/AdmAttendanceRuleDTO.cs b/zhengcaioa/DTO/AdmAttendanceRuleDTO.cs
index 80c52c3..2db522d 100644
--- a/zhengcaioa/DTO/AdmAttendanceRuleDTO.cs
+++ b/zhengcaioa/DTO/AdmAttendanceRuleDTO.cs
@@ -8,14 +8,50 @@
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 string[] jiaban_s { get; set; }
+ public string[] jiaban_e { get; set; }
+ public List<AdmAttendanceRulesDtlDTO> admAttendanceRulesDtlDTOs { get; set; }
+
}
@@ -23,16 +59,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