From 98cd7063d9b9a1570dcfbac92f5c2b35d904868b Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 05 七月 2021 15:41:29 +0800
Subject: [PATCH] 修改修改
---
zhengcaioa/Services/HrSalaryService.cs | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/zhengcaioa/Services/HrSalaryService.cs b/zhengcaioa/Services/HrSalaryService.cs
index 656f00c..766985b 100644
--- a/zhengcaioa/Services/HrSalaryService.cs
+++ b/zhengcaioa/Services/HrSalaryService.cs
@@ -677,10 +677,13 @@
temp.reason = model.reason;
temp.amount = model.amount;
temp.basis = model.basis;
- temp.sub_time = DateTime.Now;
+ temp.shenpi_status = model.shenpi_status;
+
+
}
else
{
+ model.id = Guid.NewGuid().ToString();
model.sub_time = DateTime.Now;
model.status = "A";
_context.HrSalaryAppeal.Add(model);
@@ -705,12 +708,20 @@
/// <param name="id"></param>
/// <param name="user"></param>
/// <returns></returns>
- public HrSalaryAppeal GetAppeal(string id,string user)
+ public HrSalaryAppeal GetAppeal(string id = "", string user = "", string salaryId = "")
{
HrSalaryAppeal hd = new HrSalaryAppeal();
try
{
- hd = _context.HrSalaryAppeal.Where(e => e.salary_id == id && e.sub_user == user).SingleOrDefault();
+ if (!string.IsNullOrEmpty(salaryId))
+ {
+ hd = _context.HrSalaryAppeal.Where(e => e.salary_id == salaryId && e.sub_user == user && e.status == "A").FirstOrDefault();
+ }
+ else
+ {
+ hd = _context.HrSalaryAppeal.Where(e => e.id == id && e.status == "A").FirstOrDefault();
+ }
+
}
catch (Exception er)
{
--
Gitblit v1.9.1