From ddd7b8e07e5d7f76e5ee28eaab91e75a419b3750 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 22 七月 2021 14:57:13 +0800
Subject: [PATCH] 今日开发 我的报表中的 新增注册会员 改为非手工几件登记，自动从系统读取 工作报表中的 新增注册会员 改为非手工几件登记，自动从系统读取 工资计算中的 新增注册会员 改为非手工几件登记，自动从系统读取
---
zhengcaioa/Services/HrSalaryService.cs | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/zhengcaioa/Services/HrSalaryService.cs b/zhengcaioa/Services/HrSalaryService.cs
index b2a8ea3..20af5ad 100644
--- a/zhengcaioa/Services/HrSalaryService.cs
+++ b/zhengcaioa/Services/HrSalaryService.cs
@@ -93,7 +93,7 @@
return resultEntity;
}
- public ResultEntity SaveCheckSalary(HrSalaryDTO dto)
+ public ResultEntity SaveCheckSalary(HrSalaryUpDTO dto)
{
ResultEntity resultEntity = new ResultEntity();
try
@@ -102,7 +102,7 @@
if(updatepltRole!=null)
{
//鏇存柊鐢佃瘽璐圭敤鐘舵��
- var sim = _context.SimCost.Where(c => c.bill_year == dto.Year && c.bill_month <= dto.Month && c.user_id == dto.Userid && c.status == "0").ToList();
+ 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();
foreach(var item in sim)
{
item.status = "1";
@@ -380,7 +380,7 @@
- if (searchEntity.totalrows == 0)
+ //if (searchEntity.totalrows == 0)
searchEntity.totalrows = query.Count();
var rolelist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
@@ -512,7 +512,7 @@
- if (searchEntity.totalrows == 0)
+ //if (searchEntity.totalrows == 0)
searchEntity.totalrows = query.Count();
var rolelist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
@@ -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)
{
@@ -819,7 +830,7 @@
}).OrderByDescending(x => x.Modifytime).ToList();
- if (searchEntity.totalrows == 0)
+ //if (searchEntity.totalrows == 0)
searchEntity.totalrows = list.Count();
var rolelist = list.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
--
Gitblit v1.9.1