From 265f38a3f69276ae97690da64fb8e42be3a940e5 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 16 七月 2021 14:02:28 +0800
Subject: [PATCH] 提交
---
zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs | 63 ++++++++++++++++---------------
1 files changed, 32 insertions(+), 31 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs b/zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs
index 62691b1..1fce48e 100644
--- a/zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs
@@ -222,46 +222,47 @@
else
{
admAskLeaveDTO.CreaterName = curentuser.UserName;
- admAskLeaveDTO.Tittle = "璇峰亣鐢宠锛�" + curentuser.UserName +"锛�";
- }
+ admAskLeaveDTO.Tittle = "璇峰亣鐢宠锛�" + curentuser.UserName + "锛�";
- if (!string.IsNullOrWhiteSpace(StratTimeName))
- {
- DateTime StratTimeName1;
- if(DateTime.TryParse(StratTimeName, out StratTimeName1))
+
+ if (!string.IsNullOrWhiteSpace(StratTimeName))
{
- admAskLeaveDTO.StratTimeName = StratTimeName1.AddHours(double.Parse(admAttendanceRuleDTO.WorkingStart.Split('.')[0])).AddMinutes(double.Parse(admAttendanceRuleDTO.WorkingStart.Split('.')[1])).ToString("yyyy-MM-dd HH:mm");
+ DateTime StratTimeName1;
+ if (DateTime.TryParse(StratTimeName, out StratTimeName1))
+ {
+ admAskLeaveDTO.StratTimeName = StratTimeName1.AddHours(double.Parse(admAttendanceRuleDTO.WorkingStart.Split('.')[0])).AddMinutes(double.Parse(admAttendanceRuleDTO.WorkingStart.Split('.')[1])).ToString("yyyy-MM-dd HH:mm");
+
+ }
+
+ }
+ else
+ {
+ admAskLeaveDTO.StratTimeName = DateTime.Now.Date.AddHours(double.Parse(admAttendanceRuleDTO.WorkingStart.Split('.')[0])).AddMinutes(double.Parse(admAttendanceRuleDTO.WorkingStart.Split('.')[1])).ToString("yyyy-MM-dd HH:mm");
}
- }
- else
- {
- admAskLeaveDTO.StratTimeName =DateTime.Now.Date.AddHours(double.Parse(admAttendanceRuleDTO.WorkingStart.Split('.')[0])).AddMinutes(double.Parse(admAttendanceRuleDTO.WorkingStart.Split('.')[1])).ToString("yyyy-MM-dd HH:mm");
-
- }
-
- if (!string.IsNullOrWhiteSpace(EndTimeName))
- {
- DateTime EndTimeName1;
- if (DateTime.TryParse(EndTimeName, out EndTimeName1))
+ if (!string.IsNullOrWhiteSpace(EndTimeName))
{
- admAskLeaveDTO.EndTimeName = EndTimeName1.AddHours(double.Parse(admAttendanceRuleDTO.OffworkEnd.Split('.')[0])).AddMinutes(double.Parse(admAttendanceRuleDTO.OffworkEnd.Split('.')[1])).ToString("yyyy-MM-dd HH:mm");
+ DateTime EndTimeName1;
+ if (DateTime.TryParse(EndTimeName, out EndTimeName1))
+ {
+ admAskLeaveDTO.EndTimeName = EndTimeName1.AddHours(double.Parse(admAttendanceRuleDTO.OffworkEnd.Split('.')[0])).AddMinutes(double.Parse(admAttendanceRuleDTO.OffworkEnd.Split('.')[1])).ToString("yyyy-MM-dd HH:mm");
+
+ }
+ }
+ else
+ {
+ admAskLeaveDTO.EndTimeName = DateTime.Now.Date.AddHours(double.Parse(admAttendanceRuleDTO.OffworkEnd.Split('.')[0])).AddMinutes(double.Parse(admAttendanceRuleDTO.OffworkEnd.Split('.')[1])).ToString("yyyy-MM-dd HH:mm");
}
+ AdmAskLeaveDTO admAsk = jisianChecktime(DateTime.Parse(admAskLeaveDTO.StratTimeName), DateTime.Parse(admAskLeaveDTO.EndTimeName));
+
+ admAskLeaveDTO.LaveDay = admAsk.LaveDay;
+ admAskLeaveDTO.LavehHour = admAsk.LavehHour;
}
- else
- {
- admAskLeaveDTO.EndTimeName = DateTime.Now.Date.AddHours(double.Parse(admAttendanceRuleDTO.OffworkEnd.Split('.')[0])).AddMinutes(double.Parse(admAttendanceRuleDTO.OffworkEnd.Split('.')[1])).ToString("yyyy-MM-dd HH:mm");
-
- }
-
- AdmAskLeaveDTO admAsk = jisianChecktime(DateTime.Parse(admAskLeaveDTO.StratTimeName), DateTime.Parse(admAskLeaveDTO.EndTimeName));
-
- admAskLeaveDTO.LaveDay = admAsk.LaveDay;
- admAskLeaveDTO.LavehHour = admAsk.LavehHour;
+
ViewData.Model = admAskLeaveDTO;
@@ -796,7 +797,7 @@
{
askLeaveOffDTO.CreaterName = curentuser.UserName;
askLeaveOffDTO.Tittle = "閿�鍋囩敵璇凤紙" + curentuser.UserName +"锛�";
- }
+
@@ -832,7 +833,7 @@
askLeaveOffDTO.EndTimeName = DateTime.Now.Date.AddHours(double.Parse(admAttendanceRuleDTO.OffworkEnd.Split('.')[0])).AddMinutes(double.Parse(admAttendanceRuleDTO.OffworkEnd.Split('.')[1])).ToString("yyyy-MM-dd HH:mm");
}
-
+ }
ResultDataEntity<SysAttachmentDTO> results = new ResultDataEntity<SysAttachmentDTO>();
if (!string.IsNullOrEmpty(id))
{
--
Gitblit v1.9.1