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 | 9 +++++++++
zhengcaioa/Services/WfRunProcessService.cs | 12 ++++++++++++
zhengcaioa/Services/AdmPieceCheckService.cs | 2 +-
zhengcaioa/Services/UserService.cs | 2 +-
4 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/zhengcaioa/Services/AdmPieceCheckService.cs b/zhengcaioa/Services/AdmPieceCheckService.cs
index a404d55..3f3b384 100644
--- a/zhengcaioa/Services/AdmPieceCheckService.cs
+++ b/zhengcaioa/Services/AdmPieceCheckService.cs
@@ -130,7 +130,7 @@
- join k in _context.PltUsers.Where(x => x.RecStatus == "A" && x.Zhiwustatus == "A")
+ join k in _context.PltUsers.Where(x => x.RecStatus == "A")
on a.UserId equals k.Id
into ksssss
from kkk in ksssss.DefaultIfEmpty()
diff --git a/zhengcaioa/Services/HrSalaryService.cs b/zhengcaioa/Services/HrSalaryService.cs
index 3be0447..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)
diff --git a/zhengcaioa/Services/UserService.cs b/zhengcaioa/Services/UserService.cs
index 9e13482..e28f32d 100644
--- a/zhengcaioa/Services/UserService.cs
+++ b/zhengcaioa/Services/UserService.cs
@@ -29,7 +29,7 @@
public PltUser login(string user_sn, string password)
{
- var user = _context.PltUsers.Where(x => (x.UserSn == user_sn || x.Phone == user_sn ) && x.Password == password && x.RecStatus == "A").FirstOrDefault();
+ var user = _context.PltUsers.Where(x => (x.UserSn == user_sn || x.Phone == user_sn ) && x.Password == password && x.RecStatus == "A" && x.Zhiwustatus == "A" ).FirstOrDefault();
return user;
}
diff --git a/zhengcaioa/Services/WfRunProcessService.cs b/zhengcaioa/Services/WfRunProcessService.cs
index 5c68855..28d38d1 100644
--- a/zhengcaioa/Services/WfRunProcessService.cs
+++ b/zhengcaioa/Services/WfRunProcessService.cs
@@ -287,6 +287,18 @@
model20.Modifier = userid;
model20.Modifytime = DateTime.Now;
break;
+ case "21":
+ var model21 = _context.AdmAskCiZhis.Find(model.DanjuId);
+ model21.RecStatus = "D";
+ model21.Modifier = userid;
+ model21.Modifytime = DateTime.Now;
+ break;
+ case "22":
+ var model22 = _context.AdmAskJiaojies.Find(model.DanjuId);
+ model22.RecStatus = "D";
+ model22.Modifier = userid;
+ model22.Modifytime = DateTime.Now;
+ break;
default:
break;
}
--
Gitblit v1.9.1