From 55fb4752a6aa7d19ffbe2b24204b8b21dae7e868 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 30 八月 2021 09:39:34 +0800
Subject: [PATCH] 工作没有交接完成的，不允许核准工资
---
zhengcaioa/Services/HrSalaryService.cs | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/zhengcaioa/Services/HrSalaryService.cs b/zhengcaioa/Services/HrSalaryService.cs
index 6b5c965..7d5fb4a 100644
--- a/zhengcaioa/Services/HrSalaryService.cs
+++ b/zhengcaioa/Services/HrSalaryService.cs
@@ -106,6 +106,15 @@
var updatepltRole = _context.HrSalaries.Where(c=>c.Id==dto.Id).SingleOrDefault();
if(updatepltRole!=null)
{
+ //濡傛灉鏈夋湭瀹屾垚鐨勫伐浣滀氦鎺ワ紝涓嶈兘鏍稿噯宸ヨ祫
+ var admAskJiaojies = _context.AdmAskJiaojies.Where(x => x.Creater == updatepltRole.Userid && x.RecStatus == "A" && x.ShenpiStatus == "D").ToList();
+ if(admAskJiaojies!=null && admAskJiaojies.Count > 0)
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "鏈夋湭瀹屾垚鐨勫伐浣滀氦鎺ワ紝涓嶈兘鏍稿噯宸ヨ祫";
+ return resultEntity;
+ }
+
//鏇存柊鐢佃瘽璐圭敤鐘舵��
var sim = _context.SimCost.Where(c => c.bill_year == updatepltRole.Year && c.bill_month <= updatepltRole.Month && c.user_id == updatepltRole.Userid && c.status == "0").ToList();
if(sim!=null)
@@ -791,14 +800,15 @@
DateTime st = DateTime.Now.AddDays(1 - DateTime.Now.Day).Date;
DateTime et = DateTime.Now.AddDays(1 - DateTime.Now.Day).Date.AddMonths(1).AddSeconds(-1);
int month = 0;
- if (!string.IsNullOrEmpty(searchEntity.searchDate))
+ if (!string.IsNullOrEmpty(searchEntity.searchDatestart))
{
- var times = searchEntity.searchDate.Split('|');
- if (times.Length == 2)
- {
- st = DateTime.Parse(times[0]);
- et= DateTime.Parse(times[1]);
- }
+ st = DateTime.Parse(searchEntity.searchDatestart + "-01");
+
+ }
+ if (!string.IsNullOrEmpty(searchEntity.searchDateend))
+ {
+ et = DateTime.Parse(searchEntity.searchDateend + "-01");
+
}
var query = (from a in _context.HrSalaries where a.Year >= st.Year && a.Month >= st.Month && a.Year <= et.Year && a.Month <= et.Month select a);
--
Gitblit v1.9.1