From 3b9bf8c309d77d9817e973aa036e045695c78d70 Mon Sep 17 00:00:00 2001 From: username@email.com <yzy2002yzy@163.com> Date: 星期一, 26 七月 2021 16:17:45 +0800 Subject: [PATCH] 今日开发 加班申请· 统计报表:没有任何工作的人,不显示。显示人员的 部门 职位 姓名 工作时间 在计算考勤的时候只有有加班申请的加班才算加班 --- zhengcaioa/Model/AdmAttendanceDtl.cs | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/zhengcaioa/Model/AdmAttendanceDtl.cs b/zhengcaioa/Model/AdmAttendanceDtl.cs index 1cb2d45..9804a04 100644 --- a/zhengcaioa/Model/AdmAttendanceDtl.cs +++ b/zhengcaioa/Model/AdmAttendanceDtl.cs @@ -23,8 +23,12 @@ public DateTime Createtime { get; set; } public string Modifier { get; set; } public DateTime Modifytime { get; set; } - public decimal Chidaofenzhong { get; set; } - public decimal Zaotuifenzhong { get; set; } + public decimal Shangwuchidaofenzhong { get; set; } + public decimal Xiawuchidaofenzhong { get; set; } + public decimal Shangwuzaotuifenzhong { get; set; } + public decimal Xiawuzaotuifenzhong { get; set; } public decimal Kuanggongtianshu { get; set; } + + public string Iswork { get; set; } } } -- Gitblit v1.9.1