From eacd4c4f0581f1c4b55f7f0c7f1092b3f965a6f8 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 29 三月 2023 14:04:58 +0800
Subject: [PATCH] 提交
---
zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs b/zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs
index 61c2aed..fb87020 100644
--- a/zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs
@@ -400,21 +400,21 @@
if(admAsk.Step == "鎻愪氦")
{
//璇峰亣鏃堕棿涓嶈兘閲嶅彔
- var qingjia = _signinService.GetAskLeaveChongdie(curentuser.Id, admAsk.StratTime.Value, admAsk.EndTime.Value);
- if (qingjia.Count > 0)
- {
- resultEntity.Result = false;
- resultEntity.Message = "璇ユ椂闂存宸茬粡鏈夎鍋囷紒";
- return JsonConvert.SerializeObject(resultEntity);
- }
+ //var qingjia = _signinService.GetAskLeaveChongdie(curentuser.Id, admAsk.StratTime.Value, admAsk.EndTime.Value);
+ // if (qingjia.Count > 0)
+ // {
+ // resultEntity.Result = false;
+ // resultEntity.Message = "璇ユ椂闂存宸茬粡鏈夎鍋囷紒";
+ // return JsonConvert.SerializeObject(resultEntity);
+ // }
- //璇峰亣瓒呰繃涓夊ぉ锛屽繀椤绘彁鍓嶄笁澶╀互涓婅鍋囷紒
- if (admAsk.LaveDay.Value >= 3 && admAsk.StratTime.Value.Date < DateTime.Now.Date.AddDays(3))
- {
- resultEntity.Result = false;
- resultEntity.Message = "璇峰亣瓒呰繃涓夊ぉ锛屽繀椤绘彁鍓嶄笁澶╀互涓婅鍋囷紒";
- return JsonConvert.SerializeObject(resultEntity);
- }
+ ////璇峰亣瓒呰繃涓夊ぉ锛屽繀椤绘彁鍓嶄笁澶╀互涓婅鍋囷紒
+ // if (admAsk.LaveDay.Value >= 3 && admAsk.StratTime.Value.Date < DateTime.Now.Date.AddDays(3))
+ // {
+ // resultEntity.Result = false;
+ // resultEntity.Message = "璇峰亣瓒呰繃涓夊ぉ锛屽繀椤绘彁鍓嶄笁澶╀互涓婅鍋囷紒";
+ // return JsonConvert.SerializeObject(resultEntity);
+ // }
//璇峰亣瓒呰繃涓冨ぉ锛屽繀椤绘彁鍓嶄竷澶╀互涓婅鍋囷紒
if (admAsk.LaveDay.Value >= 7 && admAsk.StratTime.Value.Date < DateTime.Now.Date.AddDays(7))
@@ -1021,7 +1021,7 @@
}
//閿�鍋囧繀椤讳笁澶╀互鍐�
- if (leaveOff.StratTime.Value.Date < DateTime.Now.Date.AddDays(-3))
+ if (leaveOff.StratTime.Value.Date < DateTime.Now.Date.AddDays(-4))
{
resultEntity.Result = false;
resultEntity.Message = "璇峰湪72灏忔椂鍐呰繘琛岄攢鍋囧鐞嗭紝瓒呰繃72灏忔椂鏃犳硶鎻愪氦";
--
Gitblit v1.9.1