From 5bf3139b3c70c7fd5ce92a6f895a92fa7ebf1d95 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 27 十二月 2022 13:33:43 +0800
Subject: [PATCH] 提交
---
zhengcaioa/Services/ProjectService.cs | 23 +++++++++++
zhengcaioa/zhengcaioa/Views/Project/ADDZhengfuProject.cshtml | 29 ++++++++++++++
zhengcaioa/IServices/IProjectService.cs | 3 +
zhengcaioa/zhengcaioa/Controllers/ProjectController.cs | 15 +++++++
zhengcaioa/Services/AdmSigninService.cs | 4 +-
5 files changed, 70 insertions(+), 4 deletions(-)
diff --git a/zhengcaioa/IServices/IProjectService.cs b/zhengcaioa/IServices/IProjectService.cs
index 8586fe5..33aafb7 100644
--- a/zhengcaioa/IServices/IProjectService.cs
+++ b/zhengcaioa/IServices/IProjectService.cs
@@ -57,6 +57,7 @@
ResultEntity saveZhengfuProjectDTO(ZhengfuProjectDTO dto);
- ResultEntity GetZhengfuProjectDTOByPageurl(string Pageurl,string id);
+ ResultEntity GetZhengfuProjectDTOByPageurl(string Pageurl,string Id);
+ ResultEntity GetZhengfuProjectDTOByTitle(string Title, string Id,DateTime? NoticeTime);
}
}
diff --git a/zhengcaioa/Services/AdmSigninService.cs b/zhengcaioa/Services/AdmSigninService.cs
index 2713363..8ce3646 100644
--- a/zhengcaioa/Services/AdmSigninService.cs
+++ b/zhengcaioa/Services/AdmSigninService.cs
@@ -303,7 +303,7 @@
entity.Remark = admAsk.Remark;
entity.Lavetype = admAsk.Lavetype;
entity.StratTime = admAsk.StratTime;
- entity.EndTime = admAsk.StratTime;
+ entity.EndTime = admAsk.EndTime;
entity.Modifier = admAsk.Modifier;
entity.Modifytime = DateTime.Now;
}
@@ -348,7 +348,7 @@
entity.Remark = leaveOff.Remark;
entity.Lavetype = leaveOff.Lavetype;
entity.StratTime = leaveOff.StratTime;
- entity.EndTime = leaveOff.StratTime;
+ entity.EndTime = leaveOff.EndTime;
entity.Modifier = leaveOff.Modifier;
entity.Modifytime = DateTime.Now;
}
diff --git a/zhengcaioa/Services/ProjectService.cs b/zhengcaioa/Services/ProjectService.cs
index 6fcde97..3653cb2 100644
--- a/zhengcaioa/Services/ProjectService.cs
+++ b/zhengcaioa/Services/ProjectService.cs
@@ -1400,5 +1400,28 @@
return resultEntity;
}
+
+
+ public ResultEntity GetZhengfuProjectDTOByTitle(string Title, string Id, DateTime? NoticeTime)
+ {
+ ResultEntity resultEntity = new ResultEntity();
+ resultEntity.Result = true;
+ if(!string.IsNullOrWhiteSpace(Title) && NoticeTime.HasValue)
+ {
+ var checkUserSn = _webcontext.ZhengfuProjects.Where(x => x.Title == Title && x.RecStatus == "A" && x.Id != Id && x.NoticeTime >= NoticeTime.Value.AddDays(-1) && x.NoticeTime <= NoticeTime.Value.AddDays(1)).FirstOrDefault();
+ if (checkUserSn != null && (string.IsNullOrWhiteSpace(Id) || (!string.IsNullOrWhiteSpace(Id) && checkUserSn.Id != Id)))
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "璇ラ〉闈㈠凡缁忓瓨鍦�";
+
+ }
+ }
+
+
+
+ return resultEntity;
+ }
+
+
}
}
diff --git a/zhengcaioa/zhengcaioa/Controllers/ProjectController.cs b/zhengcaioa/zhengcaioa/Controllers/ProjectController.cs
index 84e56b2..4711c90 100644
--- a/zhengcaioa/zhengcaioa/Controllers/ProjectController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/ProjectController.cs
@@ -1680,5 +1680,20 @@
return JsonConvert.SerializeObject(quxian);
}
+
+
+ /// <summary>
+ /// 鑾峰彇椤圭洰鏄惁宸茬粡褰曞叆
+ /// </summary>
+ /// <param name="shengid">甯俰d</param>
+ /// <returns></returns>
+ [CheckLogin]
+ public string getTitle(string Title, string Id, DateTime? NoticeTime)
+ {
+ var quxian = _projectService.GetZhengfuProjectDTOByTitle(Title, Id, NoticeTime);
+
+ return JsonConvert.SerializeObject(quxian);
+
+ }
}
}
diff --git a/zhengcaioa/zhengcaioa/Views/Project/ADDZhengfuProject.cshtml b/zhengcaioa/zhengcaioa/Views/Project/ADDZhengfuProject.cshtml
index 1f9b73f..0a71d3e 100644
--- a/zhengcaioa/zhengcaioa/Views/Project/ADDZhengfuProject.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/Project/ADDZhengfuProject.cshtml
@@ -682,7 +682,34 @@
});
});
-
+ $("#Title").change(function () {
+
+ var title = $("#Title").val();
+ var NoticeTime = $("#NoticeTime").val();
+ $.ajax({
+ type: "GET",
+ url: "/Project/getTitle?Title=" + title + "&Id=" + $("#Id").val() + "&NoticeTime=" + NoticeTime,
+ dataType: "json",
+ global: false,
+ data: "",
+ success: function (data) {
+
+ if (!data.Result) {
+ toastr.warning("璇ラ〉闈㈠凡缁忓瓨鍦�");
+ }
+
+
+
+
+
+ },
+ error: function () {
+
+
+ parent.layer.msg('澶辫触', { icon: 5 });
+ }
+ });
+ });
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1