From 67a0042c5f29e4bb0e0b82f6190f2bc51480b45c Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 28 二月 2023 13:25:09 +0800
Subject: [PATCH] 工资绩效改版
---
zhengcaioa/Services/AdmAttendanceDtlService.cs | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/zhengcaioa/Services/AdmAttendanceDtlService.cs b/zhengcaioa/Services/AdmAttendanceDtlService.cs
index 8856b4f..221bf05 100644
--- a/zhengcaioa/Services/AdmAttendanceDtlService.cs
+++ b/zhengcaioa/Services/AdmAttendanceDtlService.cs
@@ -58,6 +58,7 @@
updatepltRole.Xiawuzaotuifenzhong = AdmAttendanceDtl.Xiawuzaotuifenzhong;
updatepltRole.Kuanggongtianshu = AdmAttendanceDtl.Kuanggongtianshu;
updatepltRole.Iswork = AdmAttendanceDtl.Iswork;
+ updatepltRole.Daixinjia = AdmAttendanceDtl.Daixinjia;
}
}
@@ -156,7 +157,7 @@
Createtime = a.Createtime,
Modifier = a.Modifier,
Modifytime = a.Modifytime,
-
+ Daixinjia = a.Daixinjia,
Shangwuchidaofenzhong = a.Shangwuchidaofenzhong,
Xiawuchidaofenzhong = a.Xiawuchidaofenzhong,
Shangwuzaotuifenzhong = a.Shangwuzaotuifenzhong,
@@ -193,7 +194,7 @@
AttendanceId = a.AttendanceId,
SgninDate = a.SgninDate,
MorningIn = a.MorningIn,
-
+ Daixinjia = a.Daixinjia,
MorningOut = a.MorningOut,
AfternoonIn = a.AfternoonIn,
AfternoonOut = a.AfternoonOut,
@@ -212,7 +213,15 @@
Shangwuzaotuifenzhong = a.Shangwuzaotuifenzhong,
Xiawuzaotuifenzhong = a.Xiawuzaotuifenzhong,
Kuanggongtianshu = a.Kuanggongtianshu,
- Iswork = a.Iswork
+ Iswork = a.Iswork,
+ SgninDateName = a.SgninDate.HasValue? a.SgninDate.Value.ToString("yyyy-MM-dd"):"",
+ MorningInName = a.MorningIn.HasValue ? a.MorningIn.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
+
+ MorningOutName = a.MorningOut.HasValue ? a.MorningOut.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
+ AfternoonInName = a.AfternoonIn.HasValue ? a.AfternoonIn.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
+ AfternoonOutName = a.AfternoonOut.HasValue ? a.AfternoonOut.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
+ OvertimeInName = a.OvertimeIn.HasValue ? a.OvertimeIn.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
+ OvertimeOutName = a.OvertimeOut.HasValue ? a.OvertimeOut.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
}).OrderBy(x => x.SgninDate).ToList();
//if (searchEntity.totalrows == 0)
--
Gitblit v1.9.1