From 67a0042c5f29e4bb0e0b82f6190f2bc51480b45c Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 28 二月 2023 13:25:09 +0800
Subject: [PATCH] 工资绩效改版
---
zhengcaioa/Services/OrderBanciOrderService.cs | 45 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 42 insertions(+), 3 deletions(-)
diff --git a/zhengcaioa/Services/OrderBanciOrderService.cs b/zhengcaioa/Services/OrderBanciOrderService.cs
index 2803819..debcdd8 100644
--- a/zhengcaioa/Services/OrderBanciOrderService.cs
+++ b/zhengcaioa/Services/OrderBanciOrderService.cs
@@ -36,6 +36,10 @@
{
entity.Id = Guid.NewGuid().ToString();
dto.Id = entity.Id;
+ if (string.IsNullOrWhiteSpace(dto.OrderId))
+ {
+ entity.OrderId = dto.Id;
+ }
_context.OrderBanciOrders.Add(entity);
}
else
@@ -59,6 +63,8 @@
updateproject.Modifier = entity.Modifier;
updateproject.Modifytime = entity.Modifytime;
updateproject.Shenfenzheng = entity.Shenfenzheng;
+ updateproject.Jifen = entity.Jifen;
+ updateproject.OrderId = entity.OrderId;
}
_context.SaveChanges();
@@ -147,7 +153,7 @@
&& (string.IsNullOrWhiteSpace(searchEntity.BanciId) || a.BanciId == searchEntity.BanciId.Trim())
-
+ && ((searchEntity.Kechengleixings==null|| searchEntity.Kechengleixings.Length == 0) || searchEntity.Kechengleixings.Split(new char[] { ',' }).Contains(a.KechengleixingId))
@@ -157,7 +163,7 @@
Id = a.Id,
Baomingtime = a.Baomingtime,
- BaomingtimeName = a.Baomingtime.ToString("yyyy-MM-dd"),
+ BaomingtimeName = a.Baomingtime.ToString("yyyy-MM-dd HH:mm"),
BanciId = a.BanciId,
Peixunbanci = a.Peixunbanci,
@@ -172,7 +178,7 @@
Xuefei = a.Xuefei??0,
Baomingrenshu = a.Baomingrenshu??0,
Jine = a.Jine??0,
-
+ Jifen = a.Jifen ?? 0,
Creater = a.Creater,
Createtime = a.Createtime,
@@ -189,7 +195,12 @@
//if (searchEntity.totalrows == 0)
searchEntity.totalrows = query.Count();
+ data.Heji1 = Math.Round(query.Sum(x => x.Xuefei) ?? 0, 2);
+ data.Heji2 = Math.Round(new decimal(query.Sum(x => x.Baomingrenshu) ?? 0), 2);
+
var lianlist = query.Skip((searchEntity.page - 1) * searchEntity.rows).Take(searchEntity.rows).ToList();
+ data.DangyeHeji1 = Math.Round(lianlist.Sum(x => x.Xuefei) ?? 0, 2);
+ data.DangyeHeji2 = Math.Round(new decimal(lianlist.Sum(x => x.Baomingrenshu) ?? 0), 2);
data.LoadData(searchEntity, lianlist);
return data;
}
@@ -246,5 +257,33 @@
return result;
}
+
+ /// <summary>
+ /// 淇敼涓昏〃鐘舵��
+ /// </summary>
+ /// <param name="id">涓籭d</param>
+ /// <param name="userid">鐢ㄦ埛</param>
+ /// <returns></returns>
+ public ResultEntity DeleteStatus(string OrderId)
+ {
+ ResultEntity result = new ResultEntity();
+ result.Result = true;
+
+ if (string.IsNullOrEmpty(OrderId))
+ {
+ result.Result = false;
+ result.Message = "蹇呴』濉啓璁㈠崟id";
+ }
+ var model = _context.OrderBanciOrders.Where(x=>x.OrderId == OrderId).FirstOrDefault();
+ if (model != null)
+ {
+ model.RecStatus = "D";
+ model.Modifier = "1";
+ model.Modifytime = DateTime.Now;
+ _context.SaveChanges();
+ }
+
+ return result;
+ }
}
}
--
Gitblit v1.9.1